]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.1.6-201509112213.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-201509112213.patch
CommitLineData
d02e58e0
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/Makefile b/arch/arm/Makefile
1003index 985227c..8acc029 100644
1004--- a/arch/arm/Makefile
1005+++ b/arch/arm/Makefile
1006@@ -304,6 +304,9 @@ INSTALL_TARGETS = zinstall uinstall install
1007
1008 PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)
1009
1010+bootpImage uImage: zImage
1011+zImage: Image
1012+
1013 $(BOOT_TARGETS): vmlinux
1014 $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
1015
1016diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
1017index e22c119..abe7041 100644
1018--- a/arch/arm/include/asm/atomic.h
1019+++ b/arch/arm/include/asm/atomic.h
1020@@ -18,17 +18,41 @@
1021 #include <asm/barrier.h>
1022 #include <asm/cmpxchg.h>
1023
1024+#ifdef CONFIG_GENERIC_ATOMIC64
1025+#include <asm-generic/atomic64.h>
1026+#endif
1027+
1028 #define ATOMIC_INIT(i) { (i) }
1029
1030 #ifdef __KERNEL__
1031
1032+#ifdef CONFIG_THUMB2_KERNEL
1033+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
1034+#else
1035+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
1036+#endif
1037+
1038+#define _ASM_EXTABLE(from, to) \
1039+" .pushsection __ex_table,\"a\"\n"\
1040+" .align 3\n" \
1041+" .long " #from ", " #to"\n" \
1042+" .popsection"
1043+
1044 /*
1045 * On ARM, ordinary assignment (str instruction) doesn't clear the local
1046 * strex/ldrex monitor on some implementations. The reason we can use it for
1047 * atomic_set() is the clrex or dummy strex done on every exception return.
1048 */
1049 #define atomic_read(v) ACCESS_ONCE((v)->counter)
1050+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
1051+{
1052+ return ACCESS_ONCE(v->counter);
1053+}
1054 #define atomic_set(v,i) (((v)->counter) = (i))
1055+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1056+{
1057+ v->counter = i;
1058+}
1059
1060 #if __LINUX_ARM_ARCH__ >= 6
1061
1062@@ -38,26 +62,50 @@
1063 * to ensure that the update happens.
1064 */
1065
1066-#define ATOMIC_OP(op, c_op, asm_op) \
1067-static inline void atomic_##op(int i, atomic_t *v) \
1068+#ifdef CONFIG_PAX_REFCOUNT
1069+#define __OVERFLOW_POST \
1070+ " bvc 3f\n" \
1071+ "2: " REFCOUNT_TRAP_INSN "\n"\
1072+ "3:\n"
1073+#define __OVERFLOW_POST_RETURN \
1074+ " bvc 3f\n" \
1075+" mov %0, %1\n" \
1076+ "2: " REFCOUNT_TRAP_INSN "\n"\
1077+ "3:\n"
1078+#define __OVERFLOW_EXTABLE \
1079+ "4:\n" \
1080+ _ASM_EXTABLE(2b, 4b)
1081+#else
1082+#define __OVERFLOW_POST
1083+#define __OVERFLOW_POST_RETURN
1084+#define __OVERFLOW_EXTABLE
1085+#endif
1086+
1087+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1088+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1089 { \
1090 unsigned long tmp; \
1091 int result; \
1092 \
1093 prefetchw(&v->counter); \
1094- __asm__ __volatile__("@ atomic_" #op "\n" \
1095+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1096 "1: ldrex %0, [%3]\n" \
1097 " " #asm_op " %0, %0, %4\n" \
1098+ post_op \
1099 " strex %1, %0, [%3]\n" \
1100 " teq %1, #0\n" \
1101-" bne 1b" \
1102+" bne 1b\n" \
1103+ extable \
1104 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1105 : "r" (&v->counter), "Ir" (i) \
1106 : "cc"); \
1107 } \
1108
1109-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1110-static inline int atomic_##op##_return(int i, atomic_t *v) \
1111+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, _unchecked, c_op, asm_op, , )\
1112+ __ATOMIC_OP(op, , c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1113+
1114+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1115+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1116 { \
1117 unsigned long tmp; \
1118 int result; \
1119@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1120 smp_mb(); \
1121 prefetchw(&v->counter); \
1122 \
1123- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1124+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1125 "1: ldrex %0, [%3]\n" \
1126 " " #asm_op " %0, %0, %4\n" \
1127+ post_op \
1128 " strex %1, %0, [%3]\n" \
1129 " teq %1, #0\n" \
1130-" bne 1b" \
1131+" bne 1b\n" \
1132+ extable \
1133 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1134 : "r" (&v->counter), "Ir" (i) \
1135 : "cc"); \
1136@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1137 return result; \
1138 }
1139
1140+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op, , )\
1141+ __ATOMIC_OP_RETURN(op, , c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1142+
1143 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1144 {
1145 int oldval;
1146@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1147 __asm__ __volatile__ ("@ atomic_add_unless\n"
1148 "1: ldrex %0, [%4]\n"
1149 " teq %0, %5\n"
1150-" beq 2f\n"
1151-" add %1, %0, %6\n"
1152+" beq 4f\n"
1153+" adds %1, %0, %6\n"
1154+
1155+#ifdef CONFIG_PAX_REFCOUNT
1156+" bvc 3f\n"
1157+"2: " REFCOUNT_TRAP_INSN "\n"
1158+"3:\n"
1159+#endif
1160+
1161 " strex %2, %1, [%4]\n"
1162 " teq %2, #0\n"
1163 " bne 1b\n"
1164-"2:"
1165+"4:"
1166+
1167+#ifdef CONFIG_PAX_REFCOUNT
1168+ _ASM_EXTABLE(2b, 4b)
1169+#endif
1170+
1171 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1172 : "r" (&v->counter), "r" (u), "r" (a)
1173 : "cc");
1174@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1175 return oldval;
1176 }
1177
1178+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1179+{
1180+ unsigned long oldval, res;
1181+
1182+ smp_mb();
1183+
1184+ do {
1185+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1186+ "ldrex %1, [%3]\n"
1187+ "mov %0, #0\n"
1188+ "teq %1, %4\n"
1189+ "strexeq %0, %5, [%3]\n"
1190+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1191+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1192+ : "cc");
1193+ } while (res);
1194+
1195+ smp_mb();
1196+
1197+ return oldval;
1198+}
1199+
1200 #else /* ARM_ARCH_6 */
1201
1202 #ifdef CONFIG_SMP
1203 #error SMP not supported on pre-ARMv6 CPUs
1204 #endif
1205
1206-#define ATOMIC_OP(op, c_op, asm_op) \
1207-static inline void atomic_##op(int i, atomic_t *v) \
1208+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1209+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1210 { \
1211 unsigned long flags; \
1212 \
1213@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1214 raw_local_irq_restore(flags); \
1215 } \
1216
1217-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1218-static inline int atomic_##op##_return(int i, atomic_t *v) \
1219+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1220+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1221+
1222+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1223+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1224 { \
1225 unsigned long flags; \
1226 int val; \
1227@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1228 return val; \
1229 }
1230
1231+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1232+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1233+
1234 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1235 {
1236 int ret;
1237@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1238 return ret;
1239 }
1240
1241+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1242+{
1243+ return atomic_cmpxchg((atomic_t *)v, old, new);
1244+}
1245+
1246 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1247 {
1248 int c, old;
1249@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1250
1251 #undef ATOMIC_OPS
1252 #undef ATOMIC_OP_RETURN
1253+#undef __ATOMIC_OP_RETURN
1254 #undef ATOMIC_OP
1255+#undef __ATOMIC_OP
1256
1257 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1258+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1259+{
1260+ return xchg(&v->counter, new);
1261+}
1262
1263 #define atomic_inc(v) atomic_add(1, v)
1264+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1265+{
1266+ atomic_add_unchecked(1, v);
1267+}
1268 #define atomic_dec(v) atomic_sub(1, v)
1269+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1270+{
1271+ atomic_sub_unchecked(1, v);
1272+}
1273
1274 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1275+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1276+{
1277+ return atomic_add_return_unchecked(1, v) == 0;
1278+}
1279 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1280 #define atomic_inc_return(v) (atomic_add_return(1, v))
1281+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1282+{
1283+ return atomic_add_return_unchecked(1, v);
1284+}
1285 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1286 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1287
1288@@ -216,6 +336,14 @@ typedef struct {
1289 long long counter;
1290 } atomic64_t;
1291
1292+#ifdef CONFIG_PAX_REFCOUNT
1293+typedef struct {
1294+ long long counter;
1295+} atomic64_unchecked_t;
1296+#else
1297+typedef atomic64_t atomic64_unchecked_t;
1298+#endif
1299+
1300 #define ATOMIC64_INIT(i) { (i) }
1301
1302 #ifdef CONFIG_ARM_LPAE
1303@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1304 return result;
1305 }
1306
1307+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1308+{
1309+ long long result;
1310+
1311+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1312+" ldrd %0, %H0, [%1]"
1313+ : "=&r" (result)
1314+ : "r" (&v->counter), "Qo" (v->counter)
1315+ );
1316+
1317+ return result;
1318+}
1319+
1320 static inline void atomic64_set(atomic64_t *v, long long i)
1321 {
1322 __asm__ __volatile__("@ atomic64_set\n"
1323@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1324 : "r" (&v->counter), "r" (i)
1325 );
1326 }
1327+
1328+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1329+{
1330+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1331+" strd %2, %H2, [%1]"
1332+ : "=Qo" (v->counter)
1333+ : "r" (&v->counter), "r" (i)
1334+ );
1335+}
1336 #else
1337 static inline long long atomic64_read(const atomic64_t *v)
1338 {
1339@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1340 return result;
1341 }
1342
1343+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1344+{
1345+ long long result;
1346+
1347+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1348+" ldrexd %0, %H0, [%1]"
1349+ : "=&r" (result)
1350+ : "r" (&v->counter), "Qo" (v->counter)
1351+ );
1352+
1353+ return result;
1354+}
1355+
1356 static inline void atomic64_set(atomic64_t *v, long long i)
1357 {
1358 long long tmp;
1359@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1360 : "r" (&v->counter), "r" (i)
1361 : "cc");
1362 }
1363+
1364+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1365+{
1366+ long long tmp;
1367+
1368+ prefetchw(&v->counter);
1369+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1370+"1: ldrexd %0, %H0, [%2]\n"
1371+" strexd %0, %3, %H3, [%2]\n"
1372+" teq %0, #0\n"
1373+" bne 1b"
1374+ : "=&r" (tmp), "=Qo" (v->counter)
1375+ : "r" (&v->counter), "r" (i)
1376+ : "cc");
1377+}
1378 #endif
1379
1380-#define ATOMIC64_OP(op, op1, op2) \
1381-static inline void atomic64_##op(long long i, atomic64_t *v) \
1382+#undef __OVERFLOW_POST_RETURN
1383+#define __OVERFLOW_POST_RETURN \
1384+ " bvc 3f\n" \
1385+" mov %0, %1\n" \
1386+" mov %H0, %H1\n" \
1387+ "2: " REFCOUNT_TRAP_INSN "\n"\
1388+ "3:\n"
1389+
1390+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1391+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1392 { \
1393 long long result; \
1394 unsigned long tmp; \
1395 \
1396 prefetchw(&v->counter); \
1397- __asm__ __volatile__("@ atomic64_" #op "\n" \
1398+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1399 "1: ldrexd %0, %H0, [%3]\n" \
1400 " " #op1 " %Q0, %Q0, %Q4\n" \
1401 " " #op2 " %R0, %R0, %R4\n" \
1402+ post_op \
1403 " strexd %1, %0, %H0, [%3]\n" \
1404 " teq %1, #0\n" \
1405-" bne 1b" \
1406+" bne 1b\n" \
1407+ extable \
1408 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1409 : "r" (&v->counter), "r" (i) \
1410 : "cc"); \
1411 } \
1412
1413-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1414-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1415+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, _unchecked, op1, op2, , ) \
1416+ __ATOMIC64_OP(op, , op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1417+
1418+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1419+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1420 { \
1421 long long result; \
1422 unsigned long tmp; \
1423@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1424 smp_mb(); \
1425 prefetchw(&v->counter); \
1426 \
1427- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1428+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1429 "1: ldrexd %0, %H0, [%3]\n" \
1430 " " #op1 " %Q0, %Q0, %Q4\n" \
1431 " " #op2 " %R0, %R0, %R4\n" \
1432+ post_op \
1433 " strexd %1, %0, %H0, [%3]\n" \
1434 " teq %1, #0\n" \
1435-" bne 1b" \
1436+" bne 1b\n" \
1437+ extable \
1438 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1439 : "r" (&v->counter), "r" (i) \
1440 : "cc"); \
1441@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1442 return result; \
1443 }
1444
1445+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2, , ) \
1446+ __ATOMIC64_OP_RETURN(op, , op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1447+
1448 #define ATOMIC64_OPS(op, op1, op2) \
1449 ATOMIC64_OP(op, op1, op2) \
1450 ATOMIC64_OP_RETURN(op, op1, op2)
1451@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1452
1453 #undef ATOMIC64_OPS
1454 #undef ATOMIC64_OP_RETURN
1455+#undef __ATOMIC64_OP_RETURN
1456 #undef ATOMIC64_OP
1457+#undef __ATOMIC64_OP
1458+#undef __OVERFLOW_EXTABLE
1459+#undef __OVERFLOW_POST_RETURN
1460+#undef __OVERFLOW_POST
1461
1462 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1463 long long new)
1464@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1465 return oldval;
1466 }
1467
1468+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1469+ long long new)
1470+{
1471+ long long oldval;
1472+ unsigned long res;
1473+
1474+ smp_mb();
1475+
1476+ do {
1477+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1478+ "ldrexd %1, %H1, [%3]\n"
1479+ "mov %0, #0\n"
1480+ "teq %1, %4\n"
1481+ "teqeq %H1, %H4\n"
1482+ "strexdeq %0, %5, %H5, [%3]"
1483+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1484+ : "r" (&ptr->counter), "r" (old), "r" (new)
1485+ : "cc");
1486+ } while (res);
1487+
1488+ smp_mb();
1489+
1490+ return oldval;
1491+}
1492+
1493 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1494 {
1495 long long result;
1496@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1497 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1498 {
1499 long long result;
1500- unsigned long tmp;
1501+ u64 tmp;
1502
1503 smp_mb();
1504 prefetchw(&v->counter);
1505
1506 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1507-"1: ldrexd %0, %H0, [%3]\n"
1508-" subs %Q0, %Q0, #1\n"
1509-" sbc %R0, %R0, #0\n"
1510+"1: ldrexd %1, %H1, [%3]\n"
1511+" subs %Q0, %Q1, #1\n"
1512+" sbcs %R0, %R1, #0\n"
1513+
1514+#ifdef CONFIG_PAX_REFCOUNT
1515+" bvc 3f\n"
1516+" mov %Q0, %Q1\n"
1517+" mov %R0, %R1\n"
1518+"2: " REFCOUNT_TRAP_INSN "\n"
1519+"3:\n"
1520+#endif
1521+
1522 " teq %R0, #0\n"
1523-" bmi 2f\n"
1524+" bmi 4f\n"
1525 " strexd %1, %0, %H0, [%3]\n"
1526 " teq %1, #0\n"
1527 " bne 1b\n"
1528-"2:"
1529+"4:\n"
1530+
1531+#ifdef CONFIG_PAX_REFCOUNT
1532+ _ASM_EXTABLE(2b, 4b)
1533+#endif
1534+
1535 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1536 : "r" (&v->counter)
1537 : "cc");
1538@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1539 " teq %0, %5\n"
1540 " teqeq %H0, %H5\n"
1541 " moveq %1, #0\n"
1542-" beq 2f\n"
1543+" beq 4f\n"
1544 " adds %Q0, %Q0, %Q6\n"
1545-" adc %R0, %R0, %R6\n"
1546+" adcs %R0, %R0, %R6\n"
1547+
1548+#ifdef CONFIG_PAX_REFCOUNT
1549+" bvc 3f\n"
1550+"2: " REFCOUNT_TRAP_INSN "\n"
1551+"3:\n"
1552+#endif
1553+
1554 " strexd %2, %0, %H0, [%4]\n"
1555 " teq %2, #0\n"
1556 " bne 1b\n"
1557-"2:"
1558+"4:\n"
1559+
1560+#ifdef CONFIG_PAX_REFCOUNT
1561+ _ASM_EXTABLE(2b, 4b)
1562+#endif
1563+
1564 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1565 : "r" (&v->counter), "r" (u), "r" (a)
1566 : "cc");
1567@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1568
1569 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1570 #define atomic64_inc(v) atomic64_add(1LL, (v))
1571+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1572 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1573+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1574 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1575 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1576 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1577+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1578 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1579 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1580 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1581diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1582index d2f81e6..3c4dba5 100644
1583--- a/arch/arm/include/asm/barrier.h
1584+++ b/arch/arm/include/asm/barrier.h
1585@@ -67,7 +67,7 @@
1586 do { \
1587 compiletime_assert_atomic_type(*p); \
1588 smp_mb(); \
1589- ACCESS_ONCE(*p) = (v); \
1590+ ACCESS_ONCE_RW(*p) = (v); \
1591 } while (0)
1592
1593 #define smp_load_acquire(p) \
1594diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1595index 75fe66b..ba3dee4 100644
1596--- a/arch/arm/include/asm/cache.h
1597+++ b/arch/arm/include/asm/cache.h
1598@@ -4,8 +4,10 @@
1599 #ifndef __ASMARM_CACHE_H
1600 #define __ASMARM_CACHE_H
1601
1602+#include <linux/const.h>
1603+
1604 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1605-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1606+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1607
1608 /*
1609 * Memory returned by kmalloc() may be used for DMA, so we must make
1610@@ -24,5 +26,6 @@
1611 #endif
1612
1613 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1614+#define __read_only __attribute__ ((__section__(".data..read_only")))
1615
1616 #endif
1617diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1618index 2d46862..a35415b 100644
1619--- a/arch/arm/include/asm/cacheflush.h
1620+++ b/arch/arm/include/asm/cacheflush.h
1621@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1622 void (*dma_unmap_area)(const void *, size_t, int);
1623
1624 void (*dma_flush_range)(const void *, const void *);
1625-};
1626+} __no_const;
1627
1628 /*
1629 * Select the calling method
1630diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1631index 5233151..87a71fa 100644
1632--- a/arch/arm/include/asm/checksum.h
1633+++ b/arch/arm/include/asm/checksum.h
1634@@ -37,7 +37,19 @@ __wsum
1635 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1636
1637 __wsum
1638-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1639+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1640+
1641+static inline __wsum
1642+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1643+{
1644+ __wsum ret;
1645+ pax_open_userland();
1646+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1647+ pax_close_userland();
1648+ return ret;
1649+}
1650+
1651+
1652
1653 /*
1654 * Fold a partial checksum without adding pseudo headers
1655diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1656index abb2c37..96db950 100644
1657--- a/arch/arm/include/asm/cmpxchg.h
1658+++ b/arch/arm/include/asm/cmpxchg.h
1659@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1660
1661 #define xchg(ptr,x) \
1662 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1663+#define xchg_unchecked(ptr,x) \
1664+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1665
1666 #include <asm-generic/cmpxchg-local.h>
1667
1668diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h
1669index 0f84249..8e83c55 100644
1670--- a/arch/arm/include/asm/cpuidle.h
1671+++ b/arch/arm/include/asm/cpuidle.h
1672@@ -32,7 +32,7 @@ struct device_node;
1673 struct cpuidle_ops {
1674 int (*suspend)(int cpu, unsigned long arg);
1675 int (*init)(struct device_node *, int cpu);
1676-};
1677+} __no_const;
1678
1679 struct of_cpuidle_method {
1680 const char *method;
1681diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1682index 6ddbe44..b5e38b1a 100644
1683--- a/arch/arm/include/asm/domain.h
1684+++ b/arch/arm/include/asm/domain.h
1685@@ -48,18 +48,37 @@
1686 * Domain types
1687 */
1688 #define DOMAIN_NOACCESS 0
1689-#define DOMAIN_CLIENT 1
1690 #ifdef CONFIG_CPU_USE_DOMAINS
1691+#define DOMAIN_USERCLIENT 1
1692+#define DOMAIN_KERNELCLIENT 1
1693 #define DOMAIN_MANAGER 3
1694+#define DOMAIN_VECTORS DOMAIN_USER
1695 #else
1696+
1697+#ifdef CONFIG_PAX_KERNEXEC
1698 #define DOMAIN_MANAGER 1
1699+#define DOMAIN_KERNEXEC 3
1700+#else
1701+#define DOMAIN_MANAGER 1
1702+#endif
1703+
1704+#ifdef CONFIG_PAX_MEMORY_UDEREF
1705+#define DOMAIN_USERCLIENT 0
1706+#define DOMAIN_UDEREF 1
1707+#define DOMAIN_VECTORS DOMAIN_KERNEL
1708+#else
1709+#define DOMAIN_USERCLIENT 1
1710+#define DOMAIN_VECTORS DOMAIN_USER
1711+#endif
1712+#define DOMAIN_KERNELCLIENT 1
1713+
1714 #endif
1715
1716 #define domain_val(dom,type) ((type) << (2*(dom)))
1717
1718 #ifndef __ASSEMBLY__
1719
1720-#ifdef CONFIG_CPU_USE_DOMAINS
1721+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1722 static inline void set_domain(unsigned val)
1723 {
1724 asm volatile(
1725@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1726 isb();
1727 }
1728
1729-#define modify_domain(dom,type) \
1730- do { \
1731- struct thread_info *thread = current_thread_info(); \
1732- unsigned int domain = thread->cpu_domain; \
1733- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1734- thread->cpu_domain = domain | domain_val(dom, type); \
1735- set_domain(thread->cpu_domain); \
1736- } while (0)
1737-
1738+extern void modify_domain(unsigned int dom, unsigned int type);
1739 #else
1740 static inline void set_domain(unsigned val) { }
1741 static inline void modify_domain(unsigned dom, unsigned type) { }
1742diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1743index d2315ff..f60b47b 100644
1744--- a/arch/arm/include/asm/elf.h
1745+++ b/arch/arm/include/asm/elf.h
1746@@ -117,7 +117,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1747 the loader. We need to make sure that it is out of the way of the program
1748 that it will "exec", and that there is sufficient room for the brk. */
1749
1750-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1751+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1752+
1753+#ifdef CONFIG_PAX_ASLR
1754+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1755+
1756+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1757+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1758+#endif
1759
1760 /* When the program starts, a1 contains a pointer to a function to be
1761 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1762diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1763index de53547..52b9a28 100644
1764--- a/arch/arm/include/asm/fncpy.h
1765+++ b/arch/arm/include/asm/fncpy.h
1766@@ -81,7 +81,9 @@
1767 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1768 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1769 \
1770+ pax_open_kernel(); \
1771 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1772+ pax_close_kernel(); \
1773 flush_icache_range((unsigned long)(dest_buf), \
1774 (unsigned long)(dest_buf) + (size)); \
1775 \
1776diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1777index 4e78065..f265b48 100644
1778--- a/arch/arm/include/asm/futex.h
1779+++ b/arch/arm/include/asm/futex.h
1780@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1781 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1782 return -EFAULT;
1783
1784+ pax_open_userland();
1785+
1786 smp_mb();
1787 /* Prefetching cannot fault */
1788 prefetchw(uaddr);
1789@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1790 : "cc", "memory");
1791 smp_mb();
1792
1793+ pax_close_userland();
1794+
1795 *uval = val;
1796 return ret;
1797 }
1798@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1799 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1800 return -EFAULT;
1801
1802+ pax_open_userland();
1803+
1804 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1805 "1: " TUSER(ldr) " %1, [%4]\n"
1806 " teq %1, %2\n"
1807@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1808 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1809 : "cc", "memory");
1810
1811+ pax_close_userland();
1812+
1813 *uval = val;
1814 return ret;
1815 }
1816@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1817 return -EFAULT;
1818
1819 pagefault_disable(); /* implies preempt_disable() */
1820+ pax_open_userland();
1821
1822 switch (op) {
1823 case FUTEX_OP_SET:
1824@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1825 ret = -ENOSYS;
1826 }
1827
1828+ pax_close_userland();
1829 pagefault_enable(); /* subsumes preempt_enable() */
1830
1831 if (!ret) {
1832diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1833index 83eb2f7..ed77159 100644
1834--- a/arch/arm/include/asm/kmap_types.h
1835+++ b/arch/arm/include/asm/kmap_types.h
1836@@ -4,6 +4,6 @@
1837 /*
1838 * This is the "bare minimum". AIO seems to require this.
1839 */
1840-#define KM_TYPE_NR 16
1841+#define KM_TYPE_NR 17
1842
1843 #endif
1844diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1845index 9e614a1..3302cca 100644
1846--- a/arch/arm/include/asm/mach/dma.h
1847+++ b/arch/arm/include/asm/mach/dma.h
1848@@ -22,7 +22,7 @@ struct dma_ops {
1849 int (*residue)(unsigned int, dma_t *); /* optional */
1850 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1851 const char *type;
1852-};
1853+} __do_const;
1854
1855 struct dma_struct {
1856 void *addr; /* single DMA address */
1857diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1858index f98c7f3..e5c626d 100644
1859--- a/arch/arm/include/asm/mach/map.h
1860+++ b/arch/arm/include/asm/mach/map.h
1861@@ -23,17 +23,19 @@ struct map_desc {
1862
1863 /* types 0-3 are defined in asm/io.h */
1864 enum {
1865- MT_UNCACHED = 4,
1866- MT_CACHECLEAN,
1867- MT_MINICLEAN,
1868+ MT_UNCACHED_RW = 4,
1869+ MT_CACHECLEAN_RO,
1870+ MT_MINICLEAN_RO,
1871 MT_LOW_VECTORS,
1872 MT_HIGH_VECTORS,
1873- MT_MEMORY_RWX,
1874+ __MT_MEMORY_RWX,
1875 MT_MEMORY_RW,
1876- MT_ROM,
1877- MT_MEMORY_RWX_NONCACHED,
1878+ MT_MEMORY_RX,
1879+ MT_ROM_RX,
1880+ MT_MEMORY_RW_NONCACHED,
1881+ MT_MEMORY_RX_NONCACHED,
1882 MT_MEMORY_RW_DTCM,
1883- MT_MEMORY_RWX_ITCM,
1884+ MT_MEMORY_RX_ITCM,
1885 MT_MEMORY_RW_SO,
1886 MT_MEMORY_DMA_READY,
1887 };
1888diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1889index 563b92f..689d58e 100644
1890--- a/arch/arm/include/asm/outercache.h
1891+++ b/arch/arm/include/asm/outercache.h
1892@@ -39,7 +39,7 @@ struct outer_cache_fns {
1893 /* This is an ARM L2C thing */
1894 void (*write_sec)(unsigned long, unsigned);
1895 void (*configure)(const struct l2x0_regs *);
1896-};
1897+} __no_const;
1898
1899 extern struct outer_cache_fns outer_cache;
1900
1901diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1902index 4355f0e..cd9168e 100644
1903--- a/arch/arm/include/asm/page.h
1904+++ b/arch/arm/include/asm/page.h
1905@@ -23,6 +23,7 @@
1906
1907 #else
1908
1909+#include <linux/compiler.h>
1910 #include <asm/glue.h>
1911
1912 /*
1913@@ -114,7 +115,7 @@ struct cpu_user_fns {
1914 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1915 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1916 unsigned long vaddr, struct vm_area_struct *vma);
1917-};
1918+} __no_const;
1919
1920 #ifdef MULTI_USER
1921 extern struct cpu_user_fns cpu_user;
1922diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1923index 19cfab5..3f5c7e9 100644
1924--- a/arch/arm/include/asm/pgalloc.h
1925+++ b/arch/arm/include/asm/pgalloc.h
1926@@ -17,6 +17,7 @@
1927 #include <asm/processor.h>
1928 #include <asm/cacheflush.h>
1929 #include <asm/tlbflush.h>
1930+#include <asm/system_info.h>
1931
1932 #define check_pgt_cache() do { } while (0)
1933
1934@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1935 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1936 }
1937
1938+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1939+{
1940+ pud_populate(mm, pud, pmd);
1941+}
1942+
1943 #else /* !CONFIG_ARM_LPAE */
1944
1945 /*
1946@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1947 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1948 #define pmd_free(mm, pmd) do { } while (0)
1949 #define pud_populate(mm,pmd,pte) BUG()
1950+#define pud_populate_kernel(mm,pmd,pte) BUG()
1951
1952 #endif /* CONFIG_ARM_LPAE */
1953
1954@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1955 __free_page(pte);
1956 }
1957
1958+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1959+{
1960+#ifdef CONFIG_ARM_LPAE
1961+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1962+#else
1963+ if (addr & SECTION_SIZE)
1964+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1965+ else
1966+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1967+#endif
1968+ flush_pmd_entry(pmdp);
1969+}
1970+
1971 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1972 pmdval_t prot)
1973 {
1974diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1975index 5e68278..1869bae 100644
1976--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1977+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1978@@ -27,7 +27,7 @@
1979 /*
1980 * - section
1981 */
1982-#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1983+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1984 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1985 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1986 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1987@@ -39,6 +39,7 @@
1988 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1989 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1990 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1991+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1992
1993 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1994 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1995@@ -68,6 +69,7 @@
1996 * - extended small page/tiny page
1997 */
1998 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1999+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
2000 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
2001 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
2002 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
2003diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
2004index bfd662e..f6cbb02 100644
2005--- a/arch/arm/include/asm/pgtable-2level.h
2006+++ b/arch/arm/include/asm/pgtable-2level.h
2007@@ -127,6 +127,9 @@
2008 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
2009 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
2010
2011+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
2012+#define L_PTE_PXN (_AT(pteval_t, 0))
2013+
2014 /*
2015 * These are the memory types, defined to be compatible with
2016 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
2017diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
2018index a745a2a..481350a 100644
2019--- a/arch/arm/include/asm/pgtable-3level.h
2020+++ b/arch/arm/include/asm/pgtable-3level.h
2021@@ -80,6 +80,7 @@
2022 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
2023 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
2024 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
2025+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2026 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2027 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
2028 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
2029@@ -91,10 +92,12 @@
2030 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
2031 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
2032 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
2033+#define PMD_SECT_RDONLY PMD_SECT_AP2
2034
2035 /*
2036 * To be used in assembly code with the upper page attributes.
2037 */
2038+#define L_PTE_PXN_HIGH (1 << (53 - 32))
2039 #define L_PTE_XN_HIGH (1 << (54 - 32))
2040 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2041
2042diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2043index f403541..b10df68 100644
2044--- a/arch/arm/include/asm/pgtable.h
2045+++ b/arch/arm/include/asm/pgtable.h
2046@@ -33,6 +33,9 @@
2047 #include <asm/pgtable-2level.h>
2048 #endif
2049
2050+#define ktla_ktva(addr) (addr)
2051+#define ktva_ktla(addr) (addr)
2052+
2053 /*
2054 * Just any arbitrary offset to the start of the vmalloc VM area: the
2055 * current 8MB value just means that there will be a 8MB "hole" after the
2056@@ -48,6 +51,9 @@
2057 #define LIBRARY_TEXT_START 0x0c000000
2058
2059 #ifndef __ASSEMBLY__
2060+extern pteval_t __supported_pte_mask;
2061+extern pmdval_t __supported_pmd_mask;
2062+
2063 extern void __pte_error(const char *file, int line, pte_t);
2064 extern void __pmd_error(const char *file, int line, pmd_t);
2065 extern void __pgd_error(const char *file, int line, pgd_t);
2066@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2067 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2068 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2069
2070+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2071+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2072+
2073+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2074+#include <asm/domain.h>
2075+#include <linux/thread_info.h>
2076+#include <linux/preempt.h>
2077+
2078+static inline int test_domain(int domain, int domaintype)
2079+{
2080+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2081+}
2082+#endif
2083+
2084+#ifdef CONFIG_PAX_KERNEXEC
2085+static inline unsigned long pax_open_kernel(void) {
2086+#ifdef CONFIG_ARM_LPAE
2087+ /* TODO */
2088+#else
2089+ preempt_disable();
2090+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2091+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2092+#endif
2093+ return 0;
2094+}
2095+
2096+static inline unsigned long pax_close_kernel(void) {
2097+#ifdef CONFIG_ARM_LPAE
2098+ /* TODO */
2099+#else
2100+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2101+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2102+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2103+ preempt_enable_no_resched();
2104+#endif
2105+ return 0;
2106+}
2107+#else
2108+static inline unsigned long pax_open_kernel(void) { return 0; }
2109+static inline unsigned long pax_close_kernel(void) { return 0; }
2110+#endif
2111+
2112 /*
2113 * This is the lowest virtual address we can permit any user space
2114 * mapping to be mapped at. This is particularly important for
2115@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2116 /*
2117 * The pgprot_* and protection_map entries will be fixed up in runtime
2118 * to include the cachable and bufferable bits based on memory policy,
2119- * as well as any architecture dependent bits like global/ASID and SMP
2120- * shared mapping bits.
2121+ * as well as any architecture dependent bits like global/ASID, PXN,
2122+ * and SMP shared mapping bits.
2123 */
2124 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2125
2126@@ -307,7 +355,7 @@ static inline pte_t pte_mknexec(pte_t pte)
2127 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2128 {
2129 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2130- L_PTE_NONE | L_PTE_VALID;
2131+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2132 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2133 return pte;
2134 }
2135diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2136index c25ef3e..735f14b 100644
2137--- a/arch/arm/include/asm/psci.h
2138+++ b/arch/arm/include/asm/psci.h
2139@@ -32,7 +32,7 @@ struct psci_operations {
2140 int (*affinity_info)(unsigned long target_affinity,
2141 unsigned long lowest_affinity_level);
2142 int (*migrate_info_type)(void);
2143-};
2144+} __no_const;
2145
2146 extern struct psci_operations psci_ops;
2147 extern struct smp_operations psci_smp_ops;
2148diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2149index 18f5a55..5072a40 100644
2150--- a/arch/arm/include/asm/smp.h
2151+++ b/arch/arm/include/asm/smp.h
2152@@ -107,7 +107,7 @@ struct smp_operations {
2153 int (*cpu_disable)(unsigned int cpu);
2154 #endif
2155 #endif
2156-};
2157+} __no_const;
2158
2159 struct of_cpu_method {
2160 const char *method;
2161diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2162index bd32ede..bd90a0b 100644
2163--- a/arch/arm/include/asm/thread_info.h
2164+++ b/arch/arm/include/asm/thread_info.h
2165@@ -74,9 +74,9 @@ struct thread_info {
2166 .flags = 0, \
2167 .preempt_count = INIT_PREEMPT_COUNT, \
2168 .addr_limit = KERNEL_DS, \
2169- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2170- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2171- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2172+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2173+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2174+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2175 }
2176
2177 #define init_thread_info (init_thread_union.thread_info)
2178@@ -152,7 +152,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2179 #define TIF_SYSCALL_AUDIT 9
2180 #define TIF_SYSCALL_TRACEPOINT 10
2181 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2182-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2183+/* within 8 bits of TIF_SYSCALL_TRACE
2184+ * to meet flexible second operand requirements
2185+ */
2186+#define TIF_GRSEC_SETXID 12
2187+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2188 #define TIF_USING_IWMMXT 17
2189 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2190 #define TIF_RESTORE_SIGMASK 20
2191@@ -166,10 +170,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2192 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2193 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2194 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2195+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2196
2197 /* Checks for any syscall work in entry-common.S */
2198 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2199- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2200+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2201
2202 /*
2203 * Change these and you break ASM code in entry-common.S
2204diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2205index 5f833f7..76e6644 100644
2206--- a/arch/arm/include/asm/tls.h
2207+++ b/arch/arm/include/asm/tls.h
2208@@ -3,6 +3,7 @@
2209
2210 #include <linux/compiler.h>
2211 #include <asm/thread_info.h>
2212+#include <asm/pgtable.h>
2213
2214 #ifdef __ASSEMBLY__
2215 #include <asm/asm-offsets.h>
2216@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2217 * at 0xffff0fe0 must be used instead. (see
2218 * entry-armv.S for details)
2219 */
2220+ pax_open_kernel();
2221 *((unsigned int *)0xffff0ff0) = val;
2222+ pax_close_kernel();
2223 #endif
2224 }
2225
2226diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2227index 74b17d0..57a4bf4 100644
2228--- a/arch/arm/include/asm/uaccess.h
2229+++ b/arch/arm/include/asm/uaccess.h
2230@@ -18,6 +18,7 @@
2231 #include <asm/domain.h>
2232 #include <asm/unified.h>
2233 #include <asm/compiler.h>
2234+#include <asm/pgtable.h>
2235
2236 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2237 #include <asm-generic/uaccess-unaligned.h>
2238@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2239 static inline void set_fs(mm_segment_t fs)
2240 {
2241 current_thread_info()->addr_limit = fs;
2242- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2243+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2244 }
2245
2246 #define segment_eq(a, b) ((a) == (b))
2247
2248+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2249+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2250+
2251+static inline void pax_open_userland(void)
2252+{
2253+
2254+#ifdef CONFIG_PAX_MEMORY_UDEREF
2255+ if (segment_eq(get_fs(), USER_DS)) {
2256+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2257+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2258+ }
2259+#endif
2260+
2261+}
2262+
2263+static inline void pax_close_userland(void)
2264+{
2265+
2266+#ifdef CONFIG_PAX_MEMORY_UDEREF
2267+ if (segment_eq(get_fs(), USER_DS)) {
2268+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2269+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2270+ }
2271+#endif
2272+
2273+}
2274+
2275 #define __addr_ok(addr) ({ \
2276 unsigned long flag; \
2277 __asm__("cmp %2, %0; movlo %0, #0" \
2278@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2279
2280 #define get_user(x, p) \
2281 ({ \
2282+ int __e; \
2283 might_fault(); \
2284- __get_user_check(x, p); \
2285+ pax_open_userland(); \
2286+ __e = __get_user_check((x), (p)); \
2287+ pax_close_userland(); \
2288+ __e; \
2289 })
2290
2291 extern int __put_user_1(void *, unsigned int);
2292@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2293
2294 #define put_user(x, p) \
2295 ({ \
2296+ int __e; \
2297 might_fault(); \
2298- __put_user_check(x, p); \
2299+ pax_open_userland(); \
2300+ __e = __put_user_check((x), (p)); \
2301+ pax_close_userland(); \
2302+ __e; \
2303 })
2304
2305 #else /* CONFIG_MMU */
2306@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2307
2308 #endif /* CONFIG_MMU */
2309
2310+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
2311 #define access_ok(type, addr, size) (__range_ok(addr, size) == 0)
2312
2313 #define user_addr_max() \
2314@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2315 #define __get_user(x, ptr) \
2316 ({ \
2317 long __gu_err = 0; \
2318+ pax_open_userland(); \
2319 __get_user_err((x), (ptr), __gu_err); \
2320+ pax_close_userland(); \
2321 __gu_err; \
2322 })
2323
2324 #define __get_user_error(x, ptr, err) \
2325 ({ \
2326+ pax_open_userland(); \
2327 __get_user_err((x), (ptr), err); \
2328+ pax_close_userland(); \
2329 (void) 0; \
2330 })
2331
2332@@ -368,13 +409,17 @@ do { \
2333 #define __put_user(x, ptr) \
2334 ({ \
2335 long __pu_err = 0; \
2336+ pax_open_userland(); \
2337 __put_user_err((x), (ptr), __pu_err); \
2338+ pax_close_userland(); \
2339 __pu_err; \
2340 })
2341
2342 #define __put_user_error(x, ptr, err) \
2343 ({ \
2344+ pax_open_userland(); \
2345 __put_user_err((x), (ptr), err); \
2346+ pax_close_userland(); \
2347 (void) 0; \
2348 })
2349
2350@@ -474,11 +519,44 @@ do { \
2351
2352
2353 #ifdef CONFIG_MMU
2354-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2355-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2356+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2357+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2358+
2359+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2360+{
2361+ unsigned long ret;
2362+
2363+ check_object_size(to, n, false);
2364+ pax_open_userland();
2365+ ret = ___copy_from_user(to, from, n);
2366+ pax_close_userland();
2367+ return ret;
2368+}
2369+
2370+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2371+{
2372+ unsigned long ret;
2373+
2374+ check_object_size(from, n, true);
2375+ pax_open_userland();
2376+ ret = ___copy_to_user(to, from, n);
2377+ pax_close_userland();
2378+ return ret;
2379+}
2380+
2381 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2382-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2383+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2384 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2385+
2386+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2387+{
2388+ unsigned long ret;
2389+ pax_open_userland();
2390+ ret = ___clear_user(addr, n);
2391+ pax_close_userland();
2392+ return ret;
2393+}
2394+
2395 #else
2396 #define __copy_from_user(to, from, n) (memcpy(to, (void __force *)from, n), 0)
2397 #define __copy_to_user(to, from, n) (memcpy((void __force *)to, from, n), 0)
2398@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2399
2400 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2401 {
2402+ if ((long)n < 0)
2403+ return n;
2404+
2405 if (access_ok(VERIFY_READ, from, n))
2406 n = __copy_from_user(to, from, n);
2407 else /* security hole - plug it */
2408@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2409
2410 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2411 {
2412+ if ((long)n < 0)
2413+ return n;
2414+
2415 if (access_ok(VERIFY_WRITE, to, n))
2416 n = __copy_to_user(to, from, n);
2417 return n;
2418diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2419index 5af0ed1..cea83883 100644
2420--- a/arch/arm/include/uapi/asm/ptrace.h
2421+++ b/arch/arm/include/uapi/asm/ptrace.h
2422@@ -92,7 +92,7 @@
2423 * ARMv7 groups of PSR bits
2424 */
2425 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2426-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2427+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2428 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2429 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2430
2431diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2432index a88671c..1cc895e 100644
2433--- a/arch/arm/kernel/armksyms.c
2434+++ b/arch/arm/kernel/armksyms.c
2435@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2436
2437 /* networking */
2438 EXPORT_SYMBOL(csum_partial);
2439-EXPORT_SYMBOL(csum_partial_copy_from_user);
2440+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2441 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2442 EXPORT_SYMBOL(__csum_ipv6_magic);
2443
2444@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2445 #ifdef CONFIG_MMU
2446 EXPORT_SYMBOL(copy_page);
2447
2448-EXPORT_SYMBOL(__copy_from_user);
2449-EXPORT_SYMBOL(__copy_to_user);
2450-EXPORT_SYMBOL(__clear_user);
2451+EXPORT_SYMBOL(___copy_from_user);
2452+EXPORT_SYMBOL(___copy_to_user);
2453+EXPORT_SYMBOL(___clear_user);
2454
2455 EXPORT_SYMBOL(__get_user_1);
2456 EXPORT_SYMBOL(__get_user_2);
2457diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
2458index 318da33..373689f 100644
2459--- a/arch/arm/kernel/cpuidle.c
2460+++ b/arch/arm/kernel/cpuidle.c
2461@@ -19,7 +19,7 @@ extern struct of_cpuidle_method __cpuidle_method_of_table[];
2462 static const struct of_cpuidle_method __cpuidle_method_of_table_sentinel
2463 __used __section(__cpuidle_method_of_table_end);
2464
2465-static struct cpuidle_ops cpuidle_ops[NR_CPUS];
2466+static struct cpuidle_ops cpuidle_ops[NR_CPUS] __read_only;
2467
2468 /**
2469 * arm_cpuidle_simple_enter() - a wrapper to cpu_do_idle()
2470diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2471index 570306c..c87f193 100644
2472--- a/arch/arm/kernel/entry-armv.S
2473+++ b/arch/arm/kernel/entry-armv.S
2474@@ -48,6 +48,87 @@
2475 9997:
2476 .endm
2477
2478+ .macro pax_enter_kernel
2479+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2480+ @ make aligned space for saved DACR
2481+ sub sp, sp, #8
2482+ @ save regs
2483+ stmdb sp!, {r1, r2}
2484+ @ read DACR from cpu_domain into r1
2485+ mov r2, sp
2486+ @ assume 8K pages, since we have to split the immediate in two
2487+ bic r2, r2, #(0x1fc0)
2488+ bic r2, r2, #(0x3f)
2489+ ldr r1, [r2, #TI_CPU_DOMAIN]
2490+ @ store old DACR on stack
2491+ str r1, [sp, #8]
2492+#ifdef CONFIG_PAX_KERNEXEC
2493+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2494+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2495+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2496+#endif
2497+#ifdef CONFIG_PAX_MEMORY_UDEREF
2498+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2499+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2500+#endif
2501+ @ write r1 to current_thread_info()->cpu_domain
2502+ str r1, [r2, #TI_CPU_DOMAIN]
2503+ @ write r1 to DACR
2504+ mcr p15, 0, r1, c3, c0, 0
2505+ @ instruction sync
2506+ instr_sync
2507+ @ restore regs
2508+ ldmia sp!, {r1, r2}
2509+#endif
2510+ .endm
2511+
2512+ .macro pax_open_userland
2513+#ifdef CONFIG_PAX_MEMORY_UDEREF
2514+ @ save regs
2515+ stmdb sp!, {r0, r1}
2516+ @ read DACR from cpu_domain into r1
2517+ mov r0, sp
2518+ @ assume 8K pages, since we have to split the immediate in two
2519+ bic r0, r0, #(0x1fc0)
2520+ bic r0, r0, #(0x3f)
2521+ ldr r1, [r0, #TI_CPU_DOMAIN]
2522+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2523+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2524+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2525+ @ write r1 to current_thread_info()->cpu_domain
2526+ str r1, [r0, #TI_CPU_DOMAIN]
2527+ @ write r1 to DACR
2528+ mcr p15, 0, r1, c3, c0, 0
2529+ @ instruction sync
2530+ instr_sync
2531+ @ restore regs
2532+ ldmia sp!, {r0, r1}
2533+#endif
2534+ .endm
2535+
2536+ .macro pax_close_userland
2537+#ifdef CONFIG_PAX_MEMORY_UDEREF
2538+ @ save regs
2539+ stmdb sp!, {r0, r1}
2540+ @ read DACR from cpu_domain into r1
2541+ mov r0, sp
2542+ @ assume 8K pages, since we have to split the immediate in two
2543+ bic r0, r0, #(0x1fc0)
2544+ bic r0, r0, #(0x3f)
2545+ ldr r1, [r0, #TI_CPU_DOMAIN]
2546+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2547+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2548+ @ write r1 to current_thread_info()->cpu_domain
2549+ str r1, [r0, #TI_CPU_DOMAIN]
2550+ @ write r1 to DACR
2551+ mcr p15, 0, r1, c3, c0, 0
2552+ @ instruction sync
2553+ instr_sync
2554+ @ restore regs
2555+ ldmia sp!, {r0, r1}
2556+#endif
2557+ .endm
2558+
2559 .macro pabt_helper
2560 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2561 #ifdef MULTI_PABORT
2562@@ -90,11 +171,15 @@
2563 * Invalid mode handlers
2564 */
2565 .macro inv_entry, reason
2566+
2567+ pax_enter_kernel
2568+
2569 sub sp, sp, #S_FRAME_SIZE
2570 ARM( stmib sp, {r1 - lr} )
2571 THUMB( stmia sp, {r0 - r12} )
2572 THUMB( str sp, [sp, #S_SP] )
2573 THUMB( str lr, [sp, #S_LR] )
2574+
2575 mov r1, #\reason
2576 .endm
2577
2578@@ -150,7 +235,11 @@ ENDPROC(__und_invalid)
2579 .macro svc_entry, stack_hole=0, trace=1
2580 UNWIND(.fnstart )
2581 UNWIND(.save {r0 - pc} )
2582+
2583+ pax_enter_kernel
2584+
2585 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2586+
2587 #ifdef CONFIG_THUMB2_KERNEL
2588 SPFIX( str r0, [sp] ) @ temporarily saved
2589 SPFIX( mov r0, sp )
2590@@ -165,7 +254,12 @@ ENDPROC(__und_invalid)
2591 ldmia r0, {r3 - r5}
2592 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2593 mov r6, #-1 @ "" "" "" ""
2594+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2595+ @ offset sp by 8 as done in pax_enter_kernel
2596+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2597+#else
2598 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2599+#endif
2600 SPFIX( addeq r2, r2, #4 )
2601 str r3, [sp, #-4]! @ save the "real" r0 copied
2602 @ from the exception stack
2603@@ -369,6 +463,9 @@ ENDPROC(__fiq_abt)
2604 .macro usr_entry, trace=1
2605 UNWIND(.fnstart )
2606 UNWIND(.cantunwind ) @ don't unwind the user space
2607+
2608+ pax_enter_kernel_user
2609+
2610 sub sp, sp, #S_FRAME_SIZE
2611 ARM( stmib sp, {r1 - r12} )
2612 THUMB( stmia sp, {r0 - r12} )
2613@@ -479,7 +576,9 @@ __und_usr:
2614 tst r3, #PSR_T_BIT @ Thumb mode?
2615 bne __und_usr_thumb
2616 sub r4, r2, #4 @ ARM instr at LR - 4
2617+ pax_open_userland
2618 1: ldrt r0, [r4]
2619+ pax_close_userland
2620 ARM_BE8(rev r0, r0) @ little endian instruction
2621
2622 @ r0 = 32-bit ARM instruction which caused the exception
2623@@ -513,11 +612,15 @@ __und_usr_thumb:
2624 */
2625 .arch armv6t2
2626 #endif
2627+ pax_open_userland
2628 2: ldrht r5, [r4]
2629+ pax_close_userland
2630 ARM_BE8(rev16 r5, r5) @ little endian instruction
2631 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2632 blo __und_usr_fault_16 @ 16bit undefined instruction
2633+ pax_open_userland
2634 3: ldrht r0, [r2]
2635+ pax_close_userland
2636 ARM_BE8(rev16 r0, r0) @ little endian instruction
2637 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2638 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2639@@ -547,7 +650,8 @@ ENDPROC(__und_usr)
2640 */
2641 .pushsection .text.fixup, "ax"
2642 .align 2
2643-4: str r4, [sp, #S_PC] @ retry current instruction
2644+4: pax_close_userland
2645+ str r4, [sp, #S_PC] @ retry current instruction
2646 ret r9
2647 .popsection
2648 .pushsection __ex_table,"a"
2649@@ -767,7 +871,7 @@ ENTRY(__switch_to)
2650 THUMB( str lr, [ip], #4 )
2651 ldr r4, [r2, #TI_TP_VALUE]
2652 ldr r5, [r2, #TI_TP_VALUE + 4]
2653-#ifdef CONFIG_CPU_USE_DOMAINS
2654+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2655 ldr r6, [r2, #TI_CPU_DOMAIN]
2656 #endif
2657 switch_tls r1, r4, r5, r3, r7
2658@@ -776,7 +880,7 @@ ENTRY(__switch_to)
2659 ldr r8, =__stack_chk_guard
2660 ldr r7, [r7, #TSK_STACK_CANARY]
2661 #endif
2662-#ifdef CONFIG_CPU_USE_DOMAINS
2663+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2664 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2665 #endif
2666 mov r5, r0
2667diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2668index 4e7f40c..0f9ee2c 100644
2669--- a/arch/arm/kernel/entry-common.S
2670+++ b/arch/arm/kernel/entry-common.S
2671@@ -11,18 +11,46 @@
2672 #include <asm/assembler.h>
2673 #include <asm/unistd.h>
2674 #include <asm/ftrace.h>
2675+#include <asm/domain.h>
2676 #include <asm/unwind.h>
2677
2678+#include "entry-header.S"
2679+
2680 #ifdef CONFIG_NEED_RET_TO_USER
2681 #include <mach/entry-macro.S>
2682 #else
2683 .macro arch_ret_to_user, tmp1, tmp2
2684+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2685+ @ save regs
2686+ stmdb sp!, {r1, r2}
2687+ @ read DACR from cpu_domain into r1
2688+ mov r2, sp
2689+ @ assume 8K pages, since we have to split the immediate in two
2690+ bic r2, r2, #(0x1fc0)
2691+ bic r2, r2, #(0x3f)
2692+ ldr r1, [r2, #TI_CPU_DOMAIN]
2693+#ifdef CONFIG_PAX_KERNEXEC
2694+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2695+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2696+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2697+#endif
2698+#ifdef CONFIG_PAX_MEMORY_UDEREF
2699+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2700+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2701+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2702+#endif
2703+ @ write r1 to current_thread_info()->cpu_domain
2704+ str r1, [r2, #TI_CPU_DOMAIN]
2705+ @ write r1 to DACR
2706+ mcr p15, 0, r1, c3, c0, 0
2707+ @ instruction sync
2708+ instr_sync
2709+ @ restore regs
2710+ ldmia sp!, {r1, r2}
2711+#endif
2712 .endm
2713 #endif
2714
2715-#include "entry-header.S"
2716-
2717-
2718 .align 5
2719 /*
2720 * This is the fast syscall return path. We do as little as
2721@@ -173,6 +201,12 @@ ENTRY(vector_swi)
2722 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2723 #endif
2724
2725+ /*
2726+ * do this here to avoid a performance hit of wrapping the code above
2727+ * that directly dereferences userland to parse the SWI instruction
2728+ */
2729+ pax_enter_kernel_user
2730+
2731 adr tbl, sys_call_table @ load syscall table pointer
2732
2733 #if defined(CONFIG_OABI_COMPAT)
2734diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2735index 1a0045a..9b4f34d 100644
2736--- a/arch/arm/kernel/entry-header.S
2737+++ b/arch/arm/kernel/entry-header.S
2738@@ -196,6 +196,60 @@
2739 msr cpsr_c, \rtemp @ switch back to the SVC mode
2740 .endm
2741
2742+ .macro pax_enter_kernel_user
2743+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2744+ @ save regs
2745+ stmdb sp!, {r0, r1}
2746+ @ read DACR from cpu_domain into r1
2747+ mov r0, sp
2748+ @ assume 8K pages, since we have to split the immediate in two
2749+ bic r0, r0, #(0x1fc0)
2750+ bic r0, r0, #(0x3f)
2751+ ldr r1, [r0, #TI_CPU_DOMAIN]
2752+#ifdef CONFIG_PAX_MEMORY_UDEREF
2753+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2754+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2755+#endif
2756+#ifdef CONFIG_PAX_KERNEXEC
2757+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2758+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2759+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2760+#endif
2761+ @ write r1 to current_thread_info()->cpu_domain
2762+ str r1, [r0, #TI_CPU_DOMAIN]
2763+ @ write r1 to DACR
2764+ mcr p15, 0, r1, c3, c0, 0
2765+ @ instruction sync
2766+ instr_sync
2767+ @ restore regs
2768+ ldmia sp!, {r0, r1}
2769+#endif
2770+ .endm
2771+
2772+ .macro pax_exit_kernel
2773+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2774+ @ save regs
2775+ stmdb sp!, {r0, r1}
2776+ @ read old DACR from stack into r1
2777+ ldr r1, [sp, #(8 + S_SP)]
2778+ sub r1, r1, #8
2779+ ldr r1, [r1]
2780+
2781+ @ write r1 to current_thread_info()->cpu_domain
2782+ mov r0, sp
2783+ @ assume 8K pages, since we have to split the immediate in two
2784+ bic r0, r0, #(0x1fc0)
2785+ bic r0, r0, #(0x3f)
2786+ str r1, [r0, #TI_CPU_DOMAIN]
2787+ @ write r1 to DACR
2788+ mcr p15, 0, r1, c3, c0, 0
2789+ @ instruction sync
2790+ instr_sync
2791+ @ restore regs
2792+ ldmia sp!, {r0, r1}
2793+#endif
2794+ .endm
2795+
2796 #ifndef CONFIG_THUMB2_KERNEL
2797 .macro svc_exit, rpsr, irq = 0
2798 .if \irq != 0
2799@@ -215,6 +269,9 @@
2800 blne trace_hardirqs_off
2801 #endif
2802 .endif
2803+
2804+ pax_exit_kernel
2805+
2806 msr spsr_cxsf, \rpsr
2807 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2808 @ We must avoid clrex due to Cortex-A15 erratum #830321
2809@@ -291,6 +348,9 @@
2810 blne trace_hardirqs_off
2811 #endif
2812 .endif
2813+
2814+ pax_exit_kernel
2815+
2816 ldr lr, [sp, #S_SP] @ top of the stack
2817 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2818
2819diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2820index 059c3da..8e45cfc 100644
2821--- a/arch/arm/kernel/fiq.c
2822+++ b/arch/arm/kernel/fiq.c
2823@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2824 void *base = vectors_page;
2825 unsigned offset = FIQ_OFFSET;
2826
2827+ pax_open_kernel();
2828 memcpy(base + offset, start, length);
2829+ pax_close_kernel();
2830+
2831 if (!cache_is_vipt_nonaliasing())
2832 flush_icache_range((unsigned long)base + offset, offset +
2833 length);
2834diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2835index 3637973..cb29657 100644
2836--- a/arch/arm/kernel/head.S
2837+++ b/arch/arm/kernel/head.S
2838@@ -444,7 +444,7 @@ __enable_mmu:
2839 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2840 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2841 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2842- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2843+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2844 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2845 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2846 #endif
2847diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2848index af791f4..3ff9821 100644
2849--- a/arch/arm/kernel/module.c
2850+++ b/arch/arm/kernel/module.c
2851@@ -38,12 +38,39 @@
2852 #endif
2853
2854 #ifdef CONFIG_MMU
2855-void *module_alloc(unsigned long size)
2856+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2857 {
2858+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2859+ return NULL;
2860 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2861- GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
2862+ GFP_KERNEL, prot, 0, NUMA_NO_NODE,
2863 __builtin_return_address(0));
2864 }
2865+
2866+void *module_alloc(unsigned long size)
2867+{
2868+
2869+#ifdef CONFIG_PAX_KERNEXEC
2870+ return __module_alloc(size, PAGE_KERNEL);
2871+#else
2872+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2873+#endif
2874+
2875+}
2876+
2877+#ifdef CONFIG_PAX_KERNEXEC
2878+void module_memfree_exec(void *module_region)
2879+{
2880+ module_memfree(module_region);
2881+}
2882+EXPORT_SYMBOL(module_memfree_exec);
2883+
2884+void *module_alloc_exec(unsigned long size)
2885+{
2886+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2887+}
2888+EXPORT_SYMBOL(module_alloc_exec);
2889+#endif
2890 #endif
2891
2892 int
2893diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2894index 69bda1a..755113a 100644
2895--- a/arch/arm/kernel/patch.c
2896+++ b/arch/arm/kernel/patch.c
2897@@ -66,6 +66,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2898 else
2899 __acquire(&patch_lock);
2900
2901+ pax_open_kernel();
2902 if (thumb2 && __opcode_is_thumb16(insn)) {
2903 *(u16 *)waddr = __opcode_to_mem_thumb16(insn);
2904 size = sizeof(u16);
2905@@ -97,6 +98,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2906 *(u32 *)waddr = insn;
2907 size = sizeof(u32);
2908 }
2909+ pax_close_kernel();
2910
2911 if (waddr != addr) {
2912 flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
2913diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2914index f192a2a..1a40523 100644
2915--- a/arch/arm/kernel/process.c
2916+++ b/arch/arm/kernel/process.c
2917@@ -105,8 +105,8 @@ void __show_regs(struct pt_regs *regs)
2918
2919 show_regs_print_info(KERN_DEFAULT);
2920
2921- print_symbol("PC is at %s\n", instruction_pointer(regs));
2922- print_symbol("LR is at %s\n", regs->ARM_lr);
2923+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2924+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2925 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2926 "sp : %08lx ip : %08lx fp : %08lx\n",
2927 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2928@@ -283,12 +283,6 @@ unsigned long get_wchan(struct task_struct *p)
2929 return 0;
2930 }
2931
2932-unsigned long arch_randomize_brk(struct mm_struct *mm)
2933-{
2934- unsigned long range_end = mm->brk + 0x02000000;
2935- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2936-}
2937-
2938 #ifdef CONFIG_MMU
2939 #ifdef CONFIG_KUSER_HELPERS
2940 /*
2941@@ -304,7 +298,7 @@ static struct vm_area_struct gate_vma = {
2942
2943 static int __init gate_vma_init(void)
2944 {
2945- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2946+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2947 return 0;
2948 }
2949 arch_initcall(gate_vma_init);
2950@@ -333,91 +327,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2951 return is_gate_vma(vma) ? "[vectors]" : NULL;
2952 }
2953
2954-/* If possible, provide a placement hint at a random offset from the
2955- * stack for the sigpage and vdso pages.
2956- */
2957-static unsigned long sigpage_addr(const struct mm_struct *mm,
2958- unsigned int npages)
2959-{
2960- unsigned long offset;
2961- unsigned long first;
2962- unsigned long last;
2963- unsigned long addr;
2964- unsigned int slots;
2965-
2966- first = PAGE_ALIGN(mm->start_stack);
2967-
2968- last = TASK_SIZE - (npages << PAGE_SHIFT);
2969-
2970- /* No room after stack? */
2971- if (first > last)
2972- return 0;
2973-
2974- /* Just enough room? */
2975- if (first == last)
2976- return first;
2977-
2978- slots = ((last - first) >> PAGE_SHIFT) + 1;
2979-
2980- offset = get_random_int() % slots;
2981-
2982- addr = first + (offset << PAGE_SHIFT);
2983-
2984- return addr;
2985-}
2986-
2987-static struct page *signal_page;
2988-extern struct page *get_signal_page(void);
2989-
2990-static const struct vm_special_mapping sigpage_mapping = {
2991- .name = "[sigpage]",
2992- .pages = &signal_page,
2993-};
2994-
2995 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2996 {
2997 struct mm_struct *mm = current->mm;
2998- struct vm_area_struct *vma;
2999- unsigned long npages;
3000- unsigned long addr;
3001- unsigned long hint;
3002- int ret = 0;
3003-
3004- if (!signal_page)
3005- signal_page = get_signal_page();
3006- if (!signal_page)
3007- return -ENOMEM;
3008-
3009- npages = 1; /* for sigpage */
3010- npages += vdso_total_pages;
3011
3012 down_write(&mm->mmap_sem);
3013- hint = sigpage_addr(mm, npages);
3014- addr = get_unmapped_area(NULL, hint, npages << PAGE_SHIFT, 0, 0);
3015- if (IS_ERR_VALUE(addr)) {
3016- ret = addr;
3017- goto up_fail;
3018- }
3019-
3020- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
3021- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
3022- &sigpage_mapping);
3023-
3024- if (IS_ERR(vma)) {
3025- ret = PTR_ERR(vma);
3026- goto up_fail;
3027- }
3028-
3029- mm->context.sigpage = addr;
3030-
3031- /* Unlike the sigpage, failure to install the vdso is unlikely
3032- * to be fatal to the process, so no error check needed
3033- * here.
3034- */
3035- arm_install_vdso(mm, addr + PAGE_SIZE);
3036-
3037- up_fail:
3038+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
3039 up_write(&mm->mmap_sem);
3040- return ret;
3041+ return 0;
3042 }
3043 #endif
3044diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
3045index f90fdf4..24e8c84 100644
3046--- a/arch/arm/kernel/psci.c
3047+++ b/arch/arm/kernel/psci.c
3048@@ -26,7 +26,7 @@
3049 #include <asm/psci.h>
3050 #include <asm/system_misc.h>
3051
3052-struct psci_operations psci_ops;
3053+struct psci_operations psci_ops __read_only;
3054
3055 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3056 typedef int (*psci_initcall_t)(const struct device_node *);
3057diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3058index ef9119f..31995a3 100644
3059--- a/arch/arm/kernel/ptrace.c
3060+++ b/arch/arm/kernel/ptrace.c
3061@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3062 regs->ARM_ip = ip;
3063 }
3064
3065+#ifdef CONFIG_GRKERNSEC_SETXID
3066+extern void gr_delayed_cred_worker(void);
3067+#endif
3068+
3069 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3070 {
3071 current_thread_info()->syscall = scno;
3072
3073+#ifdef CONFIG_GRKERNSEC_SETXID
3074+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3075+ gr_delayed_cred_worker();
3076+#endif
3077+
3078 /* Do the secure computing check first; failures should be fast. */
3079 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3080 if (secure_computing() == -1)
3081diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
3082index 1a4d232..2677169 100644
3083--- a/arch/arm/kernel/reboot.c
3084+++ b/arch/arm/kernel/reboot.c
3085@@ -122,6 +122,7 @@ void machine_power_off(void)
3086
3087 if (pm_power_off)
3088 pm_power_off();
3089+ while (1);
3090 }
3091
3092 /*
3093diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3094index 6c777e9..3d2d0ca 100644
3095--- a/arch/arm/kernel/setup.c
3096+++ b/arch/arm/kernel/setup.c
3097@@ -105,21 +105,23 @@ EXPORT_SYMBOL(elf_hwcap);
3098 unsigned int elf_hwcap2 __read_mostly;
3099 EXPORT_SYMBOL(elf_hwcap2);
3100
3101+pteval_t __supported_pte_mask __read_only;
3102+pmdval_t __supported_pmd_mask __read_only;
3103
3104 #ifdef MULTI_CPU
3105-struct processor processor __read_mostly;
3106+struct processor processor __read_only;
3107 #endif
3108 #ifdef MULTI_TLB
3109-struct cpu_tlb_fns cpu_tlb __read_mostly;
3110+struct cpu_tlb_fns cpu_tlb __read_only;
3111 #endif
3112 #ifdef MULTI_USER
3113-struct cpu_user_fns cpu_user __read_mostly;
3114+struct cpu_user_fns cpu_user __read_only;
3115 #endif
3116 #ifdef MULTI_CACHE
3117-struct cpu_cache_fns cpu_cache __read_mostly;
3118+struct cpu_cache_fns cpu_cache __read_only;
3119 #endif
3120 #ifdef CONFIG_OUTER_CACHE
3121-struct outer_cache_fns outer_cache __read_mostly;
3122+struct outer_cache_fns outer_cache __read_only;
3123 EXPORT_SYMBOL(outer_cache);
3124 #endif
3125
3126@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3127 * Register 0 and check for VMSAv7 or PMSAv7 */
3128 unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);
3129 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3130- (mmfr0 & 0x000000f0) >= 0x00000030)
3131+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3132 cpu_arch = CPU_ARCH_ARMv7;
3133- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3134+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3135+ __supported_pte_mask |= L_PTE_PXN;
3136+ __supported_pmd_mask |= PMD_PXNTABLE;
3137+ }
3138+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3139 (mmfr0 & 0x000000f0) == 0x00000020)
3140 cpu_arch = CPU_ARCH_ARMv6;
3141 else
3142diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3143index 423663e..bfeb0ff 100644
3144--- a/arch/arm/kernel/signal.c
3145+++ b/arch/arm/kernel/signal.c
3146@@ -24,8 +24,6 @@
3147
3148 extern const unsigned long sigreturn_codes[7];
3149
3150-static unsigned long signal_return_offset;
3151-
3152 #ifdef CONFIG_CRUNCH
3153 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3154 {
3155@@ -385,8 +383,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3156 * except when the MPU has protected the vectors
3157 * page from PL0
3158 */
3159- retcode = mm->context.sigpage + signal_return_offset +
3160- (idx << 2) + thumb;
3161+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3162 } else
3163 #endif
3164 {
3165@@ -592,33 +589,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3166 } while (thread_flags & _TIF_WORK_MASK);
3167 return 0;
3168 }
3169-
3170-struct page *get_signal_page(void)
3171-{
3172- unsigned long ptr;
3173- unsigned offset;
3174- struct page *page;
3175- void *addr;
3176-
3177- page = alloc_pages(GFP_KERNEL, 0);
3178-
3179- if (!page)
3180- return NULL;
3181-
3182- addr = page_address(page);
3183-
3184- /* Give the signal return code some randomness */
3185- offset = 0x200 + (get_random_int() & 0x7fc);
3186- signal_return_offset = offset;
3187-
3188- /*
3189- * Copy signal return handlers into the vector page, and
3190- * set sigreturn to be a pointer to these.
3191- */
3192- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3193-
3194- ptr = (unsigned long)addr + offset;
3195- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3196-
3197- return page;
3198-}
3199diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3200index f11d825..bbe686f 100644
3201--- a/arch/arm/kernel/smp.c
3202+++ b/arch/arm/kernel/smp.c
3203@@ -76,7 +76,7 @@ enum ipi_msg_type {
3204
3205 static DECLARE_COMPLETION(cpu_running);
3206
3207-static struct smp_operations smp_ops;
3208+static struct smp_operations smp_ops __read_only;
3209
3210 void __init smp_set_ops(struct smp_operations *ops)
3211 {
3212diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3213index 7a3be1d..b00c7de 100644
3214--- a/arch/arm/kernel/tcm.c
3215+++ b/arch/arm/kernel/tcm.c
3216@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3217 .virtual = ITCM_OFFSET,
3218 .pfn = __phys_to_pfn(ITCM_OFFSET),
3219 .length = 0,
3220- .type = MT_MEMORY_RWX_ITCM,
3221+ .type = MT_MEMORY_RX_ITCM,
3222 }
3223 };
3224
3225@@ -267,7 +267,9 @@ no_dtcm:
3226 start = &__sitcm_text;
3227 end = &__eitcm_text;
3228 ram = &__itcm_start;
3229+ pax_open_kernel();
3230 memcpy(start, ram, itcm_code_sz);
3231+ pax_close_kernel();
3232 pr_debug("CPU ITCM: copied code from %p - %p\n",
3233 start, end);
3234 itcm_present = true;
3235diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3236index 3dce1a3..60e857f 100644
3237--- a/arch/arm/kernel/traps.c
3238+++ b/arch/arm/kernel/traps.c
3239@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3240 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3241 {
3242 #ifdef CONFIG_KALLSYMS
3243- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3244+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3245 #else
3246 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3247 #endif
3248@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3249 static int die_owner = -1;
3250 static unsigned int die_nest_count;
3251
3252+extern void gr_handle_kernel_exploit(void);
3253+
3254 static unsigned long oops_begin(void)
3255 {
3256 int cpu;
3257@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3258 panic("Fatal exception in interrupt");
3259 if (panic_on_oops)
3260 panic("Fatal exception");
3261+
3262+ gr_handle_kernel_exploit();
3263+
3264 if (signr)
3265 do_exit(signr);
3266 }
3267@@ -878,7 +883,11 @@ void __init early_trap_init(void *vectors_base)
3268 kuser_init(vectors_base);
3269
3270 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3271- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3272+
3273+#ifndef CONFIG_PAX_MEMORY_UDEREF
3274+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3275+#endif
3276+
3277 #else /* ifndef CONFIG_CPU_V7M */
3278 /*
3279 * on V7-M there is no need to copy the vector table to a dedicated
3280diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3281index 8b60fde..8d986dd 100644
3282--- a/arch/arm/kernel/vmlinux.lds.S
3283+++ b/arch/arm/kernel/vmlinux.lds.S
3284@@ -37,7 +37,7 @@
3285 #endif
3286
3287 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3288- defined(CONFIG_GENERIC_BUG)
3289+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3290 #define ARM_EXIT_KEEP(x) x
3291 #define ARM_EXIT_DISCARD(x)
3292 #else
3293@@ -120,6 +120,8 @@ SECTIONS
3294 #ifdef CONFIG_DEBUG_RODATA
3295 . = ALIGN(1<<SECTION_SHIFT);
3296 #endif
3297+ _etext = .; /* End of text section */
3298+
3299 RO_DATA(PAGE_SIZE)
3300
3301 . = ALIGN(4);
3302@@ -150,8 +152,6 @@ SECTIONS
3303
3304 NOTES
3305
3306- _etext = .; /* End of text and rodata section */
3307-
3308 #ifndef CONFIG_XIP_KERNEL
3309 # ifdef CONFIG_ARM_KERNMEM_PERMS
3310 . = ALIGN(1<<SECTION_SHIFT);
3311diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3312index d9631ec..b0c966c 100644
3313--- a/arch/arm/kvm/arm.c
3314+++ b/arch/arm/kvm/arm.c
3315@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3316 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3317
3318 /* The VMID used in the VTTBR */
3319-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3320+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3321 static u8 kvm_next_vmid;
3322 static DEFINE_SPINLOCK(kvm_vmid_lock);
3323
3324@@ -373,7 +373,7 @@ void force_vm_exit(const cpumask_t *mask)
3325 */
3326 static bool need_new_vmid_gen(struct kvm *kvm)
3327 {
3328- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3329+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3330 }
3331
3332 /**
3333@@ -406,7 +406,7 @@ static void update_vttbr(struct kvm *kvm)
3334
3335 /* First user of a new VMID generation? */
3336 if (unlikely(kvm_next_vmid == 0)) {
3337- atomic64_inc(&kvm_vmid_gen);
3338+ atomic64_inc_unchecked(&kvm_vmid_gen);
3339 kvm_next_vmid = 1;
3340
3341 /*
3342@@ -423,7 +423,7 @@ static void update_vttbr(struct kvm *kvm)
3343 kvm_call_hyp(__kvm_flush_vm_context);
3344 }
3345
3346- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3347+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3348 kvm->arch.vmid = kvm_next_vmid;
3349 kvm_next_vmid++;
3350
3351@@ -1098,7 +1098,7 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
3352 /**
3353 * Initialize Hyp-mode and memory mappings on all CPUs.
3354 */
3355-int kvm_arch_init(void *opaque)
3356+int kvm_arch_init(const void *opaque)
3357 {
3358 int err;
3359 int ret, cpu;
3360diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3361index 1710fd7..ec3e014 100644
3362--- a/arch/arm/lib/clear_user.S
3363+++ b/arch/arm/lib/clear_user.S
3364@@ -12,14 +12,14 @@
3365
3366 .text
3367
3368-/* Prototype: int __clear_user(void *addr, size_t sz)
3369+/* Prototype: int ___clear_user(void *addr, size_t sz)
3370 * Purpose : clear some user memory
3371 * Params : addr - user memory address to clear
3372 * : sz - number of bytes to clear
3373 * Returns : number of bytes NOT cleared
3374 */
3375 ENTRY(__clear_user_std)
3376-WEAK(__clear_user)
3377+WEAK(___clear_user)
3378 stmfd sp!, {r1, lr}
3379 mov r2, #0
3380 cmp r1, #4
3381@@ -44,7 +44,7 @@ WEAK(__clear_user)
3382 USER( strnebt r2, [r0])
3383 mov r0, #0
3384 ldmfd sp!, {r1, pc}
3385-ENDPROC(__clear_user)
3386+ENDPROC(___clear_user)
3387 ENDPROC(__clear_user_std)
3388
3389 .pushsection .text.fixup,"ax"
3390diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3391index 7a235b9..73a0556 100644
3392--- a/arch/arm/lib/copy_from_user.S
3393+++ b/arch/arm/lib/copy_from_user.S
3394@@ -17,7 +17,7 @@
3395 /*
3396 * Prototype:
3397 *
3398- * size_t __copy_from_user(void *to, const void *from, size_t n)
3399+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3400 *
3401 * Purpose:
3402 *
3403@@ -89,11 +89,11 @@
3404
3405 .text
3406
3407-ENTRY(__copy_from_user)
3408+ENTRY(___copy_from_user)
3409
3410 #include "copy_template.S"
3411
3412-ENDPROC(__copy_from_user)
3413+ENDPROC(___copy_from_user)
3414
3415 .pushsection .fixup,"ax"
3416 .align 0
3417diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3418index 6ee2f67..d1cce76 100644
3419--- a/arch/arm/lib/copy_page.S
3420+++ b/arch/arm/lib/copy_page.S
3421@@ -10,6 +10,7 @@
3422 * ASM optimised string functions
3423 */
3424 #include <linux/linkage.h>
3425+#include <linux/const.h>
3426 #include <asm/assembler.h>
3427 #include <asm/asm-offsets.h>
3428 #include <asm/cache.h>
3429diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3430index 9648b06..19c333c 100644
3431--- a/arch/arm/lib/copy_to_user.S
3432+++ b/arch/arm/lib/copy_to_user.S
3433@@ -17,7 +17,7 @@
3434 /*
3435 * Prototype:
3436 *
3437- * size_t __copy_to_user(void *to, const void *from, size_t n)
3438+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3439 *
3440 * Purpose:
3441 *
3442@@ -93,11 +93,11 @@
3443 .text
3444
3445 ENTRY(__copy_to_user_std)
3446-WEAK(__copy_to_user)
3447+WEAK(___copy_to_user)
3448
3449 #include "copy_template.S"
3450
3451-ENDPROC(__copy_to_user)
3452+ENDPROC(___copy_to_user)
3453 ENDPROC(__copy_to_user_std)
3454
3455 .pushsection .text.fixup,"ax"
3456diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3457index 1d0957e..f708846 100644
3458--- a/arch/arm/lib/csumpartialcopyuser.S
3459+++ b/arch/arm/lib/csumpartialcopyuser.S
3460@@ -57,8 +57,8 @@
3461 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3462 */
3463
3464-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3465-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3466+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3467+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3468
3469 #include "csumpartialcopygeneric.S"
3470
3471diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3472index 8044591..c9b2609 100644
3473--- a/arch/arm/lib/delay.c
3474+++ b/arch/arm/lib/delay.c
3475@@ -29,7 +29,7 @@
3476 /*
3477 * Default to the loop-based delay implementation.
3478 */
3479-struct arm_delay_ops arm_delay_ops = {
3480+struct arm_delay_ops arm_delay_ops __read_only = {
3481 .delay = __loop_delay,
3482 .const_udelay = __loop_const_udelay,
3483 .udelay = __loop_udelay,
3484diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3485index 3e58d71..029817c 100644
3486--- a/arch/arm/lib/uaccess_with_memcpy.c
3487+++ b/arch/arm/lib/uaccess_with_memcpy.c
3488@@ -136,7 +136,7 @@ out:
3489 }
3490
3491 unsigned long
3492-__copy_to_user(void __user *to, const void *from, unsigned long n)
3493+___copy_to_user(void __user *to, const void *from, unsigned long n)
3494 {
3495 /*
3496 * This test is stubbed out of the main function above to keep
3497@@ -190,7 +190,7 @@ out:
3498 return n;
3499 }
3500
3501-unsigned long __clear_user(void __user *addr, unsigned long n)
3502+unsigned long ___clear_user(void __user *addr, unsigned long n)
3503 {
3504 /* See rational for this in __copy_to_user() above. */
3505 if (n < 64)
3506diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
3507index 7d23ce0..5ef383a 100644
3508--- a/arch/arm/mach-exynos/suspend.c
3509+++ b/arch/arm/mach-exynos/suspend.c
3510@@ -738,8 +738,10 @@ void __init exynos_pm_init(void)
3511 tmp |= pm_data->wake_disable_mask;
3512 pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
3513
3514- exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3515- exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3516+ pax_open_kernel();
3517+ *(void **)&exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3518+ *(void **)&exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3519+ pax_close_kernel();
3520
3521 register_syscore_ops(&exynos_pm_syscore_ops);
3522 suspend_set_ops(&exynos_suspend_ops);
3523diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3524index 0662087..004d163 100644
3525--- a/arch/arm/mach-keystone/keystone.c
3526+++ b/arch/arm/mach-keystone/keystone.c
3527@@ -27,7 +27,7 @@
3528
3529 #include "keystone.h"
3530
3531-static struct notifier_block platform_nb;
3532+static notifier_block_no_const platform_nb;
3533 static unsigned long keystone_dma_pfn_offset __read_mostly;
3534
3535 static int keystone_platform_notifier(struct notifier_block *nb,
3536diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3537index e46e9ea..9141c83 100644
3538--- a/arch/arm/mach-mvebu/coherency.c
3539+++ b/arch/arm/mach-mvebu/coherency.c
3540@@ -117,7 +117,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3541
3542 /*
3543 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3544- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3545+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3546 * is needed as a workaround for a deadlock issue between the PCIe
3547 * interface and the cache controller.
3548 */
3549@@ -130,7 +130,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3550 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3551
3552 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3553- mtype = MT_UNCACHED;
3554+ mtype = MT_UNCACHED_RW;
3555
3556 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3557 }
3558diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3559index b6443a4..20a0b74 100644
3560--- a/arch/arm/mach-omap2/board-n8x0.c
3561+++ b/arch/arm/mach-omap2/board-n8x0.c
3562@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3563 }
3564 #endif
3565
3566-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3567+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3568 .late_init = n8x0_menelaus_late_init,
3569 };
3570
3571diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3572index 79f49d9..70bf184 100644
3573--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3574+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3575@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3576 void (*resume)(void);
3577 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3578 void (*hotplug_restart)(void);
3579-};
3580+} __no_const;
3581
3582 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3583 static struct powerdomain *mpuss_pd;
3584@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3585 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3586 {}
3587
3588-struct cpu_pm_ops omap_pm_ops = {
3589+static struct cpu_pm_ops omap_pm_ops __read_only = {
3590 .finish_suspend = default_finish_suspend,
3591 .resume = dummy_cpu_resume,
3592 .scu_prepare = dummy_scu_prepare,
3593diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
3594index 5305ec7..6d74045 100644
3595--- a/arch/arm/mach-omap2/omap-smp.c
3596+++ b/arch/arm/mach-omap2/omap-smp.c
3597@@ -19,6 +19,7 @@
3598 #include <linux/device.h>
3599 #include <linux/smp.h>
3600 #include <linux/io.h>
3601+#include <linux/irq.h>
3602 #include <linux/irqchip/arm-gic.h>
3603
3604 #include <asm/smp_scu.h>
3605diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3606index 3b56722..33ac281 100644
3607--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3608+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3609@@ -330,7 +330,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3610 return NOTIFY_OK;
3611 }
3612
3613-static struct notifier_block __refdata irq_hotplug_notifier = {
3614+static struct notifier_block irq_hotplug_notifier = {
3615 .notifier_call = irq_cpu_hotplug_notify,
3616 };
3617
3618diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3619index 166b18f..f985f04 100644
3620--- a/arch/arm/mach-omap2/omap_device.c
3621+++ b/arch/arm/mach-omap2/omap_device.c
3622@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3623 struct platform_device __init *omap_device_build(const char *pdev_name,
3624 int pdev_id,
3625 struct omap_hwmod *oh,
3626- void *pdata, int pdata_len)
3627+ const void *pdata, int pdata_len)
3628 {
3629 struct omap_hwmod *ohs[] = { oh };
3630
3631@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3632 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3633 int pdev_id,
3634 struct omap_hwmod **ohs,
3635- int oh_cnt, void *pdata,
3636+ int oh_cnt, const void *pdata,
3637 int pdata_len)
3638 {
3639 int ret = -ENOMEM;
3640diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3641index 78c02b3..c94109a 100644
3642--- a/arch/arm/mach-omap2/omap_device.h
3643+++ b/arch/arm/mach-omap2/omap_device.h
3644@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3645 /* Core code interface */
3646
3647 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3648- struct omap_hwmod *oh, void *pdata,
3649+ struct omap_hwmod *oh, const void *pdata,
3650 int pdata_len);
3651
3652 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3653 struct omap_hwmod **oh, int oh_cnt,
3654- void *pdata, int pdata_len);
3655+ const void *pdata, int pdata_len);
3656
3657 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3658 struct omap_hwmod **ohs, int oh_cnt);
3659diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3660index 5286e77..fdd234c 100644
3661--- a/arch/arm/mach-omap2/omap_hwmod.c
3662+++ b/arch/arm/mach-omap2/omap_hwmod.c
3663@@ -199,10 +199,10 @@ struct omap_hwmod_soc_ops {
3664 int (*init_clkdm)(struct omap_hwmod *oh);
3665 void (*update_context_lost)(struct omap_hwmod *oh);
3666 int (*get_context_lost)(struct omap_hwmod *oh);
3667-};
3668+} __no_const;
3669
3670 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3671-static struct omap_hwmod_soc_ops soc_ops;
3672+static struct omap_hwmod_soc_ops soc_ops __read_only;
3673
3674 /* omap_hwmod_list contains all registered struct omap_hwmods */
3675 static LIST_HEAD(omap_hwmod_list);
3676diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3677index 95fee54..cfa9cf1 100644
3678--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3679+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3680@@ -10,6 +10,7 @@
3681
3682 #include <linux/kernel.h>
3683 #include <linux/init.h>
3684+#include <asm/pgtable.h>
3685
3686 #include "powerdomain.h"
3687
3688@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3689
3690 void __init am43xx_powerdomains_init(void)
3691 {
3692- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3693+ pax_open_kernel();
3694+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3695+ pax_close_kernel();
3696 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3697 pwrdm_register_pwrdms(powerdomains_am43xx);
3698 pwrdm_complete_init();
3699diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3700index ff0a68c..b312aa0 100644
3701--- a/arch/arm/mach-omap2/wd_timer.c
3702+++ b/arch/arm/mach-omap2/wd_timer.c
3703@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3704 struct omap_hwmod *oh;
3705 char *oh_name = "wd_timer2";
3706 char *dev_name = "omap_wdt";
3707- struct omap_wd_timer_platform_data pdata;
3708+ static struct omap_wd_timer_platform_data pdata = {
3709+ .read_reset_sources = prm_read_reset_sources
3710+ };
3711
3712 if (!cpu_class_is_omap2() || of_have_populated_dt())
3713 return 0;
3714@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3715 return -EINVAL;
3716 }
3717
3718- pdata.read_reset_sources = prm_read_reset_sources;
3719-
3720 pdev = omap_device_build(dev_name, id, oh, &pdata,
3721 sizeof(struct omap_wd_timer_platform_data));
3722 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3723diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3724index 7469347..1ecc350 100644
3725--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3726+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3727@@ -177,7 +177,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3728 bool entered_lp2 = false;
3729
3730 if (tegra_pending_sgi())
3731- ACCESS_ONCE(abort_flag) = true;
3732+ ACCESS_ONCE_RW(abort_flag) = true;
3733
3734 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3735
3736diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
3737index 3b9098d..15b390f 100644
3738--- a/arch/arm/mach-tegra/irq.c
3739+++ b/arch/arm/mach-tegra/irq.c
3740@@ -20,6 +20,7 @@
3741 #include <linux/cpu_pm.h>
3742 #include <linux/interrupt.h>
3743 #include <linux/io.h>
3744+#include <linux/irq.h>
3745 #include <linux/irqchip/arm-gic.h>
3746 #include <linux/irq.h>
3747 #include <linux/kernel.h>
3748diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
3749index 2cb587b..6ddfebf 100644
3750--- a/arch/arm/mach-ux500/pm.c
3751+++ b/arch/arm/mach-ux500/pm.c
3752@@ -10,6 +10,7 @@
3753 */
3754
3755 #include <linux/kernel.h>
3756+#include <linux/irq.h>
3757 #include <linux/irqchip/arm-gic.h>
3758 #include <linux/delay.h>
3759 #include <linux/io.h>
3760diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3761index 2dea8b5..6499da2 100644
3762--- a/arch/arm/mach-ux500/setup.h
3763+++ b/arch/arm/mach-ux500/setup.h
3764@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3765 .type = MT_DEVICE, \
3766 }
3767
3768-#define __MEM_DEV_DESC(x, sz) { \
3769- .virtual = IO_ADDRESS(x), \
3770- .pfn = __phys_to_pfn(x), \
3771- .length = sz, \
3772- .type = MT_MEMORY_RWX, \
3773-}
3774-
3775 extern struct smp_operations ux500_smp_ops;
3776 extern void ux500_cpu_die(unsigned int cpu);
3777
3778diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
3779index 52d768f..5f93180 100644
3780--- a/arch/arm/mach-zynq/platsmp.c
3781+++ b/arch/arm/mach-zynq/platsmp.c
3782@@ -24,6 +24,7 @@
3783 #include <linux/io.h>
3784 #include <asm/cacheflush.h>
3785 #include <asm/smp_scu.h>
3786+#include <linux/irq.h>
3787 #include <linux/irqchip/arm-gic.h>
3788 #include "common.h"
3789
3790diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3791index b4f92b9..ffefea9 100644
3792--- a/arch/arm/mm/Kconfig
3793+++ b/arch/arm/mm/Kconfig
3794@@ -446,6 +446,7 @@ config CPU_32v5
3795
3796 config CPU_32v6
3797 bool
3798+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3799 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3800
3801 config CPU_32v6K
3802@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3803
3804 config CPU_USE_DOMAINS
3805 bool
3806+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3807 help
3808 This option enables or disables the use of domain switching
3809 via the set_fs() function.
3810@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3811
3812 config KUSER_HELPERS
3813 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3814- depends on MMU
3815+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3816 default y
3817 help
3818 Warning: disabling this option may break user programs.
3819@@ -812,7 +814,7 @@ config KUSER_HELPERS
3820 See Documentation/arm/kernel_user_helpers.txt for details.
3821
3822 However, the fixed address nature of these helpers can be used
3823- by ROP (return orientated programming) authors when creating
3824+ by ROP (Return Oriented Programming) authors when creating
3825 exploits.
3826
3827 If all of the binaries and libraries which run on your platform
3828diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3829index 9769f1e..16aaa55 100644
3830--- a/arch/arm/mm/alignment.c
3831+++ b/arch/arm/mm/alignment.c
3832@@ -216,10 +216,12 @@ union offset_union {
3833 #define __get16_unaligned_check(ins,val,addr) \
3834 do { \
3835 unsigned int err = 0, v, a = addr; \
3836+ pax_open_userland(); \
3837 __get8_unaligned_check(ins,v,a,err); \
3838 val = v << ((BE) ? 8 : 0); \
3839 __get8_unaligned_check(ins,v,a,err); \
3840 val |= v << ((BE) ? 0 : 8); \
3841+ pax_close_userland(); \
3842 if (err) \
3843 goto fault; \
3844 } while (0)
3845@@ -233,6 +235,7 @@ union offset_union {
3846 #define __get32_unaligned_check(ins,val,addr) \
3847 do { \
3848 unsigned int err = 0, v, a = addr; \
3849+ pax_open_userland(); \
3850 __get8_unaligned_check(ins,v,a,err); \
3851 val = v << ((BE) ? 24 : 0); \
3852 __get8_unaligned_check(ins,v,a,err); \
3853@@ -241,6 +244,7 @@ union offset_union {
3854 val |= v << ((BE) ? 8 : 16); \
3855 __get8_unaligned_check(ins,v,a,err); \
3856 val |= v << ((BE) ? 0 : 24); \
3857+ pax_close_userland(); \
3858 if (err) \
3859 goto fault; \
3860 } while (0)
3861@@ -254,6 +258,7 @@ union offset_union {
3862 #define __put16_unaligned_check(ins,val,addr) \
3863 do { \
3864 unsigned int err = 0, v = val, a = addr; \
3865+ pax_open_userland(); \
3866 __asm__( FIRST_BYTE_16 \
3867 ARM( "1: "ins" %1, [%2], #1\n" ) \
3868 THUMB( "1: "ins" %1, [%2]\n" ) \
3869@@ -273,6 +278,7 @@ union offset_union {
3870 " .popsection\n" \
3871 : "=r" (err), "=&r" (v), "=&r" (a) \
3872 : "0" (err), "1" (v), "2" (a)); \
3873+ pax_close_userland(); \
3874 if (err) \
3875 goto fault; \
3876 } while (0)
3877@@ -286,6 +292,7 @@ union offset_union {
3878 #define __put32_unaligned_check(ins,val,addr) \
3879 do { \
3880 unsigned int err = 0, v = val, a = addr; \
3881+ pax_open_userland(); \
3882 __asm__( FIRST_BYTE_32 \
3883 ARM( "1: "ins" %1, [%2], #1\n" ) \
3884 THUMB( "1: "ins" %1, [%2]\n" ) \
3885@@ -315,6 +322,7 @@ union offset_union {
3886 " .popsection\n" \
3887 : "=r" (err), "=&r" (v), "=&r" (a) \
3888 : "0" (err), "1" (v), "2" (a)); \
3889+ pax_close_userland(); \
3890 if (err) \
3891 goto fault; \
3892 } while (0)
3893diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3894index e309c8f..f8965e8 100644
3895--- a/arch/arm/mm/cache-l2x0.c
3896+++ b/arch/arm/mm/cache-l2x0.c
3897@@ -43,7 +43,7 @@ struct l2c_init_data {
3898 void (*save)(void __iomem *);
3899 void (*configure)(void __iomem *);
3900 struct outer_cache_fns outer_cache;
3901-};
3902+} __do_const;
3903
3904 #define CACHE_LINE_SIZE 32
3905
3906diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3907index 845769e..4278fd7 100644
3908--- a/arch/arm/mm/context.c
3909+++ b/arch/arm/mm/context.c
3910@@ -43,7 +43,7 @@
3911 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3912
3913 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3914-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3915+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3916 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3917
3918 static DEFINE_PER_CPU(atomic64_t, active_asids);
3919@@ -178,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3920 {
3921 static u32 cur_idx = 1;
3922 u64 asid = atomic64_read(&mm->context.id);
3923- u64 generation = atomic64_read(&asid_generation);
3924+ u64 generation = atomic64_read_unchecked(&asid_generation);
3925
3926 if (asid != 0) {
3927 /*
3928@@ -208,7 +208,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3929 */
3930 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3931 if (asid == NUM_USER_ASIDS) {
3932- generation = atomic64_add_return(ASID_FIRST_VERSION,
3933+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3934 &asid_generation);
3935 flush_context(cpu);
3936 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3937@@ -240,14 +240,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3938 cpu_set_reserved_ttbr0();
3939
3940 asid = atomic64_read(&mm->context.id);
3941- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3942+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3943 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3944 goto switch_mm_fastpath;
3945
3946 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3947 /* Check that our ASID belongs to the current generation. */
3948 asid = atomic64_read(&mm->context.id);
3949- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3950+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3951 asid = new_context(mm, cpu);
3952 atomic64_set(&mm->context.id, asid);
3953 }
3954diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3955index 6333d9c..3bb19f2 100644
3956--- a/arch/arm/mm/fault.c
3957+++ b/arch/arm/mm/fault.c
3958@@ -25,6 +25,7 @@
3959 #include <asm/system_misc.h>
3960 #include <asm/system_info.h>
3961 #include <asm/tlbflush.h>
3962+#include <asm/sections.h>
3963
3964 #include "fault.h"
3965
3966@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3967 if (fixup_exception(regs))
3968 return;
3969
3970+#ifdef CONFIG_PAX_MEMORY_UDEREF
3971+ if (addr < TASK_SIZE) {
3972+ if (current->signal->curr_ip)
3973+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3974+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3975+ else
3976+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3977+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3978+ }
3979+#endif
3980+
3981+#ifdef CONFIG_PAX_KERNEXEC
3982+ if ((fsr & FSR_WRITE) &&
3983+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3984+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3985+ {
3986+ if (current->signal->curr_ip)
3987+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3988+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3989+ else
3990+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3991+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3992+ }
3993+#endif
3994+
3995 /*
3996 * No handler, we'll have to terminate things with extreme prejudice.
3997 */
3998@@ -173,6 +199,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3999 }
4000 #endif
4001
4002+#ifdef CONFIG_PAX_PAGEEXEC
4003+ if (fsr & FSR_LNX_PF) {
4004+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
4005+ do_group_exit(SIGKILL);
4006+ }
4007+#endif
4008+
4009 tsk->thread.address = addr;
4010 tsk->thread.error_code = fsr;
4011 tsk->thread.trap_no = 14;
4012@@ -400,6 +433,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4013 }
4014 #endif /* CONFIG_MMU */
4015
4016+#ifdef CONFIG_PAX_PAGEEXEC
4017+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4018+{
4019+ long i;
4020+
4021+ printk(KERN_ERR "PAX: bytes at PC: ");
4022+ for (i = 0; i < 20; i++) {
4023+ unsigned char c;
4024+ if (get_user(c, (__force unsigned char __user *)pc+i))
4025+ printk(KERN_CONT "?? ");
4026+ else
4027+ printk(KERN_CONT "%02x ", c);
4028+ }
4029+ printk("\n");
4030+
4031+ printk(KERN_ERR "PAX: bytes at SP-4: ");
4032+ for (i = -1; i < 20; i++) {
4033+ unsigned long c;
4034+ if (get_user(c, (__force unsigned long __user *)sp+i))
4035+ printk(KERN_CONT "???????? ");
4036+ else
4037+ printk(KERN_CONT "%08lx ", c);
4038+ }
4039+ printk("\n");
4040+}
4041+#endif
4042+
4043 /*
4044 * First Level Translation Fault Handler
4045 *
4046@@ -547,9 +607,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4047 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4048 struct siginfo info;
4049
4050+#ifdef CONFIG_PAX_MEMORY_UDEREF
4051+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4052+ if (current->signal->curr_ip)
4053+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
4054+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4055+ else
4056+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4057+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4058+ goto die;
4059+ }
4060+#endif
4061+
4062 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4063 return;
4064
4065+die:
4066 pr_alert("Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4067 inf->name, fsr, addr);
4068 show_pte(current->mm, addr);
4069@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4070 ifsr_info[nr].name = name;
4071 }
4072
4073+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4074+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4075+
4076 asmlinkage void __exception
4077 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4078 {
4079 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4080 struct siginfo info;
4081+ unsigned long pc = instruction_pointer(regs);
4082+
4083+ if (user_mode(regs)) {
4084+ unsigned long sigpage = current->mm->context.sigpage;
4085+
4086+ if (sigpage <= pc && pc < sigpage + 7*4) {
4087+ if (pc < sigpage + 3*4)
4088+ sys_sigreturn(regs);
4089+ else
4090+ sys_rt_sigreturn(regs);
4091+ return;
4092+ }
4093+ if (pc == 0xffff0f60UL) {
4094+ /*
4095+ * PaX: __kuser_cmpxchg64 emulation
4096+ */
4097+ // TODO
4098+ //regs->ARM_pc = regs->ARM_lr;
4099+ //return;
4100+ }
4101+ if (pc == 0xffff0fa0UL) {
4102+ /*
4103+ * PaX: __kuser_memory_barrier emulation
4104+ */
4105+ // dmb(); implied by the exception
4106+ regs->ARM_pc = regs->ARM_lr;
4107+ return;
4108+ }
4109+ if (pc == 0xffff0fc0UL) {
4110+ /*
4111+ * PaX: __kuser_cmpxchg emulation
4112+ */
4113+ // TODO
4114+ //long new;
4115+ //int op;
4116+
4117+ //op = FUTEX_OP_SET << 28;
4118+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4119+ //regs->ARM_r0 = old != new;
4120+ //regs->ARM_pc = regs->ARM_lr;
4121+ //return;
4122+ }
4123+ if (pc == 0xffff0fe0UL) {
4124+ /*
4125+ * PaX: __kuser_get_tls emulation
4126+ */
4127+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4128+ regs->ARM_pc = regs->ARM_lr;
4129+ return;
4130+ }
4131+ }
4132+
4133+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4134+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4135+ if (current->signal->curr_ip)
4136+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
4137+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4138+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4139+ else
4140+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4141+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4142+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4143+ goto die;
4144+ }
4145+#endif
4146+
4147+#ifdef CONFIG_PAX_REFCOUNT
4148+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4149+#ifdef CONFIG_THUMB2_KERNEL
4150+ unsigned short bkpt;
4151+
4152+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4153+#else
4154+ unsigned int bkpt;
4155+
4156+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4157+#endif
4158+ current->thread.error_code = ifsr;
4159+ current->thread.trap_no = 0;
4160+ pax_report_refcount_overflow(regs);
4161+ fixup_exception(regs);
4162+ return;
4163+ }
4164+ }
4165+#endif
4166
4167 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4168 return;
4169
4170+die:
4171 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4172 inf->name, ifsr, addr);
4173
4174diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4175index cf08bdf..772656c 100644
4176--- a/arch/arm/mm/fault.h
4177+++ b/arch/arm/mm/fault.h
4178@@ -3,6 +3,7 @@
4179
4180 /*
4181 * Fault status register encodings. We steal bit 31 for our own purposes.
4182+ * Set when the FSR value is from an instruction fault.
4183 */
4184 #define FSR_LNX_PF (1 << 31)
4185 #define FSR_WRITE (1 << 11)
4186@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4187 }
4188 #endif
4189
4190+/* valid for LPAE and !LPAE */
4191+static inline int is_xn_fault(unsigned int fsr)
4192+{
4193+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4194+}
4195+
4196+static inline int is_domain_fault(unsigned int fsr)
4197+{
4198+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4199+}
4200+
4201 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4202 unsigned long search_exception_table(unsigned long addr);
4203
4204diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4205index be92fa0..5252d7e 100644
4206--- a/arch/arm/mm/init.c
4207+++ b/arch/arm/mm/init.c
4208@@ -709,7 +709,46 @@ void free_tcmmem(void)
4209 {
4210 #ifdef CONFIG_HAVE_TCM
4211 extern char __tcm_start, __tcm_end;
4212+#endif
4213
4214+#ifdef CONFIG_PAX_KERNEXEC
4215+ unsigned long addr;
4216+ pgd_t *pgd;
4217+ pud_t *pud;
4218+ pmd_t *pmd;
4219+ int cpu_arch = cpu_architecture();
4220+ unsigned int cr = get_cr();
4221+
4222+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4223+ /* make pages tables, etc before .text NX */
4224+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4225+ pgd = pgd_offset_k(addr);
4226+ pud = pud_offset(pgd, addr);
4227+ pmd = pmd_offset(pud, addr);
4228+ __section_update(pmd, addr, PMD_SECT_XN);
4229+ }
4230+ /* make init NX */
4231+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4232+ pgd = pgd_offset_k(addr);
4233+ pud = pud_offset(pgd, addr);
4234+ pmd = pmd_offset(pud, addr);
4235+ __section_update(pmd, addr, PMD_SECT_XN);
4236+ }
4237+ /* make kernel code/rodata RX */
4238+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4239+ pgd = pgd_offset_k(addr);
4240+ pud = pud_offset(pgd, addr);
4241+ pmd = pmd_offset(pud, addr);
4242+#ifdef CONFIG_ARM_LPAE
4243+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4244+#else
4245+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4246+#endif
4247+ }
4248+ }
4249+#endif
4250+
4251+#ifdef CONFIG_HAVE_TCM
4252 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4253 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4254 #endif
4255diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4256index d1e5ad7..84dcbf2 100644
4257--- a/arch/arm/mm/ioremap.c
4258+++ b/arch/arm/mm/ioremap.c
4259@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4260 unsigned int mtype;
4261
4262 if (cached)
4263- mtype = MT_MEMORY_RWX;
4264+ mtype = MT_MEMORY_RX;
4265 else
4266- mtype = MT_MEMORY_RWX_NONCACHED;
4267+ mtype = MT_MEMORY_RX_NONCACHED;
4268
4269 return __arm_ioremap_caller(phys_addr, size, mtype,
4270 __builtin_return_address(0));
4271diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4272index 407dc78..047ce9d 100644
4273--- a/arch/arm/mm/mmap.c
4274+++ b/arch/arm/mm/mmap.c
4275@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4276 struct vm_area_struct *vma;
4277 int do_align = 0;
4278 int aliasing = cache_is_vipt_aliasing();
4279+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4280 struct vm_unmapped_area_info info;
4281
4282 /*
4283@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4284 if (len > TASK_SIZE)
4285 return -ENOMEM;
4286
4287+#ifdef CONFIG_PAX_RANDMMAP
4288+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4289+#endif
4290+
4291 if (addr) {
4292 if (do_align)
4293 addr = COLOUR_ALIGN(addr, pgoff);
4294@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4295 addr = PAGE_ALIGN(addr);
4296
4297 vma = find_vma(mm, addr);
4298- if (TASK_SIZE - len >= addr &&
4299- (!vma || addr + len <= vma->vm_start))
4300+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4301 return addr;
4302 }
4303
4304@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4305 info.high_limit = TASK_SIZE;
4306 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4307 info.align_offset = pgoff << PAGE_SHIFT;
4308+ info.threadstack_offset = offset;
4309 return vm_unmapped_area(&info);
4310 }
4311
4312@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4313 unsigned long addr = addr0;
4314 int do_align = 0;
4315 int aliasing = cache_is_vipt_aliasing();
4316+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4317 struct vm_unmapped_area_info info;
4318
4319 /*
4320@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4321 return addr;
4322 }
4323
4324+#ifdef CONFIG_PAX_RANDMMAP
4325+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4326+#endif
4327+
4328 /* requesting a specific address */
4329 if (addr) {
4330 if (do_align)
4331@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4332 else
4333 addr = PAGE_ALIGN(addr);
4334 vma = find_vma(mm, addr);
4335- if (TASK_SIZE - len >= addr &&
4336- (!vma || addr + len <= vma->vm_start))
4337+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4338 return addr;
4339 }
4340
4341@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4342 info.high_limit = mm->mmap_base;
4343 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4344 info.align_offset = pgoff << PAGE_SHIFT;
4345+ info.threadstack_offset = offset;
4346 addr = vm_unmapped_area(&info);
4347
4348 /*
4349@@ -183,14 +193,30 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4350 {
4351 unsigned long random_factor = 0UL;
4352
4353+#ifdef CONFIG_PAX_RANDMMAP
4354+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4355+#endif
4356+
4357 if (current->flags & PF_RANDOMIZE)
4358 random_factor = arch_mmap_rnd();
4359
4360 if (mmap_is_legacy()) {
4361 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4362+
4363+#ifdef CONFIG_PAX_RANDMMAP
4364+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4365+ mm->mmap_base += mm->delta_mmap;
4366+#endif
4367+
4368 mm->get_unmapped_area = arch_get_unmapped_area;
4369 } else {
4370 mm->mmap_base = mmap_base(random_factor);
4371+
4372+#ifdef CONFIG_PAX_RANDMMAP
4373+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4374+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4375+#endif
4376+
4377 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4378 }
4379 }
4380diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4381index 7186382..0c145cf 100644
4382--- a/arch/arm/mm/mmu.c
4383+++ b/arch/arm/mm/mmu.c
4384@@ -41,6 +41,22 @@
4385 #include "mm.h"
4386 #include "tcm.h"
4387
4388+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4389+void modify_domain(unsigned int dom, unsigned int type)
4390+{
4391+ struct thread_info *thread = current_thread_info();
4392+ unsigned int domain = thread->cpu_domain;
4393+ /*
4394+ * DOMAIN_MANAGER might be defined to some other value,
4395+ * use the arch-defined constant
4396+ */
4397+ domain &= ~domain_val(dom, 3);
4398+ thread->cpu_domain = domain | domain_val(dom, type);
4399+ set_domain(thread->cpu_domain);
4400+}
4401+EXPORT_SYMBOL(modify_domain);
4402+#endif
4403+
4404 /*
4405 * empty_zero_page is a special page that is used for
4406 * zero-initialized data and COW.
4407@@ -242,7 +258,15 @@ __setup("noalign", noalign_setup);
4408 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4409 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4410
4411-static struct mem_type mem_types[] = {
4412+#ifdef CONFIG_PAX_KERNEXEC
4413+#define L_PTE_KERNEXEC L_PTE_RDONLY
4414+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4415+#else
4416+#define L_PTE_KERNEXEC L_PTE_DIRTY
4417+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4418+#endif
4419+
4420+static struct mem_type mem_types[] __read_only = {
4421 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4422 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4423 L_PTE_SHARED,
4424@@ -271,19 +295,19 @@ static struct mem_type mem_types[] = {
4425 .prot_sect = PROT_SECT_DEVICE,
4426 .domain = DOMAIN_IO,
4427 },
4428- [MT_UNCACHED] = {
4429+ [MT_UNCACHED_RW] = {
4430 .prot_pte = PROT_PTE_DEVICE,
4431 .prot_l1 = PMD_TYPE_TABLE,
4432 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4433 .domain = DOMAIN_IO,
4434 },
4435- [MT_CACHECLEAN] = {
4436- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4437+ [MT_CACHECLEAN_RO] = {
4438+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4439 .domain = DOMAIN_KERNEL,
4440 },
4441 #ifndef CONFIG_ARM_LPAE
4442- [MT_MINICLEAN] = {
4443- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4444+ [MT_MINICLEAN_RO] = {
4445+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4446 .domain = DOMAIN_KERNEL,
4447 },
4448 #endif
4449@@ -291,15 +315,15 @@ static struct mem_type mem_types[] = {
4450 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4451 L_PTE_RDONLY,
4452 .prot_l1 = PMD_TYPE_TABLE,
4453- .domain = DOMAIN_USER,
4454+ .domain = DOMAIN_VECTORS,
4455 },
4456 [MT_HIGH_VECTORS] = {
4457 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4458 L_PTE_USER | L_PTE_RDONLY,
4459 .prot_l1 = PMD_TYPE_TABLE,
4460- .domain = DOMAIN_USER,
4461+ .domain = DOMAIN_VECTORS,
4462 },
4463- [MT_MEMORY_RWX] = {
4464+ [__MT_MEMORY_RWX] = {
4465 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4466 .prot_l1 = PMD_TYPE_TABLE,
4467 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4468@@ -312,17 +336,30 @@ static struct mem_type mem_types[] = {
4469 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4470 .domain = DOMAIN_KERNEL,
4471 },
4472- [MT_ROM] = {
4473- .prot_sect = PMD_TYPE_SECT,
4474+ [MT_MEMORY_RX] = {
4475+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4476+ .prot_l1 = PMD_TYPE_TABLE,
4477+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4478+ .domain = DOMAIN_KERNEL,
4479+ },
4480+ [MT_ROM_RX] = {
4481+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4482 .domain = DOMAIN_KERNEL,
4483 },
4484- [MT_MEMORY_RWX_NONCACHED] = {
4485+ [MT_MEMORY_RW_NONCACHED] = {
4486 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4487 L_PTE_MT_BUFFERABLE,
4488 .prot_l1 = PMD_TYPE_TABLE,
4489 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4490 .domain = DOMAIN_KERNEL,
4491 },
4492+ [MT_MEMORY_RX_NONCACHED] = {
4493+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4494+ L_PTE_MT_BUFFERABLE,
4495+ .prot_l1 = PMD_TYPE_TABLE,
4496+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4497+ .domain = DOMAIN_KERNEL,
4498+ },
4499 [MT_MEMORY_RW_DTCM] = {
4500 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4501 L_PTE_XN,
4502@@ -330,9 +367,10 @@ static struct mem_type mem_types[] = {
4503 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4504 .domain = DOMAIN_KERNEL,
4505 },
4506- [MT_MEMORY_RWX_ITCM] = {
4507- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4508+ [MT_MEMORY_RX_ITCM] = {
4509+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4510 .prot_l1 = PMD_TYPE_TABLE,
4511+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4512 .domain = DOMAIN_KERNEL,
4513 },
4514 [MT_MEMORY_RW_SO] = {
4515@@ -544,9 +582,14 @@ static void __init build_mem_type_table(void)
4516 * Mark cache clean areas and XIP ROM read only
4517 * from SVC mode and no access from userspace.
4518 */
4519- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4520- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4521- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4522+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4523+#ifdef CONFIG_PAX_KERNEXEC
4524+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4525+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4526+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4527+#endif
4528+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4529+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4530 #endif
4531
4532 /*
4533@@ -563,13 +606,17 @@ static void __init build_mem_type_table(void)
4534 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4535 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4536 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4537- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4538- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4539+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4540+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4541 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4542 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4543+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4544+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4545 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4546- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4547- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4548+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4549+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4550+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4551+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4552 }
4553 }
4554
4555@@ -580,15 +627,20 @@ static void __init build_mem_type_table(void)
4556 if (cpu_arch >= CPU_ARCH_ARMv6) {
4557 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4558 /* Non-cacheable Normal is XCB = 001 */
4559- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4560+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4561+ PMD_SECT_BUFFERED;
4562+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4563 PMD_SECT_BUFFERED;
4564 } else {
4565 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4566- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4567+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4568+ PMD_SECT_TEX(1);
4569+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4570 PMD_SECT_TEX(1);
4571 }
4572 } else {
4573- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4574+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4575+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4576 }
4577
4578 #ifdef CONFIG_ARM_LPAE
4579@@ -609,6 +661,8 @@ static void __init build_mem_type_table(void)
4580 user_pgprot |= PTE_EXT_PXN;
4581 #endif
4582
4583+ user_pgprot |= __supported_pte_mask;
4584+
4585 for (i = 0; i < 16; i++) {
4586 pteval_t v = pgprot_val(protection_map[i]);
4587 protection_map[i] = __pgprot(v | user_pgprot);
4588@@ -626,21 +680,24 @@ static void __init build_mem_type_table(void)
4589
4590 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4591 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4592- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4593- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4594+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4595+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4596 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4597 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4598+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4599+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4600 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4601- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4602- mem_types[MT_ROM].prot_sect |= cp->pmd;
4603+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4604+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4605+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4606
4607 switch (cp->pmd) {
4608 case PMD_SECT_WT:
4609- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4610+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4611 break;
4612 case PMD_SECT_WB:
4613 case PMD_SECT_WBWA:
4614- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4615+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4616 break;
4617 }
4618 pr_info("Memory policy: %sData cache %s\n",
4619@@ -854,7 +911,7 @@ static void __init create_mapping(struct map_desc *md)
4620 return;
4621 }
4622
4623- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4624+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4625 md->virtual >= PAGE_OFFSET &&
4626 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4627 pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
4628@@ -1218,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4629 * called function. This means you can't use any function or debugging
4630 * method which may touch any device, otherwise the kernel _will_ crash.
4631 */
4632+
4633+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4634+
4635 static void __init devicemaps_init(const struct machine_desc *mdesc)
4636 {
4637 struct map_desc map;
4638 unsigned long addr;
4639- void *vectors;
4640
4641- /*
4642- * Allocate the vector page early.
4643- */
4644- vectors = early_alloc(PAGE_SIZE * 2);
4645-
4646- early_trap_init(vectors);
4647+ early_trap_init(&vectors);
4648
4649 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4650 pmd_clear(pmd_off_k(addr));
4651@@ -1242,7 +1296,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4652 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4653 map.virtual = MODULES_VADDR;
4654 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4655- map.type = MT_ROM;
4656+ map.type = MT_ROM_RX;
4657 create_mapping(&map);
4658 #endif
4659
4660@@ -1253,14 +1307,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4661 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4662 map.virtual = FLUSH_BASE;
4663 map.length = SZ_1M;
4664- map.type = MT_CACHECLEAN;
4665+ map.type = MT_CACHECLEAN_RO;
4666 create_mapping(&map);
4667 #endif
4668 #ifdef FLUSH_BASE_MINICACHE
4669 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4670 map.virtual = FLUSH_BASE_MINICACHE;
4671 map.length = SZ_1M;
4672- map.type = MT_MINICLEAN;
4673+ map.type = MT_MINICLEAN_RO;
4674 create_mapping(&map);
4675 #endif
4676
4677@@ -1269,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4678 * location (0xffff0000). If we aren't using high-vectors, also
4679 * create a mapping at the low-vectors virtual address.
4680 */
4681- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4682+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4683 map.virtual = 0xffff0000;
4684 map.length = PAGE_SIZE;
4685 #ifdef CONFIG_KUSER_HELPERS
4686@@ -1329,8 +1383,10 @@ static void __init kmap_init(void)
4687 static void __init map_lowmem(void)
4688 {
4689 struct memblock_region *reg;
4690+#ifndef CONFIG_PAX_KERNEXEC
4691 phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4692 phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4693+#endif
4694
4695 /* Map all the lowmem memory banks. */
4696 for_each_memblock(memory, reg) {
4697@@ -1343,11 +1399,48 @@ static void __init map_lowmem(void)
4698 if (start >= end)
4699 break;
4700
4701+#ifdef CONFIG_PAX_KERNEXEC
4702+ map.pfn = __phys_to_pfn(start);
4703+ map.virtual = __phys_to_virt(start);
4704+ map.length = end - start;
4705+
4706+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4707+ struct map_desc kernel;
4708+ struct map_desc initmap;
4709+
4710+ /* when freeing initmem we will make this RW */
4711+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4712+ initmap.virtual = (unsigned long)__init_begin;
4713+ initmap.length = _sdata - __init_begin;
4714+ initmap.type = __MT_MEMORY_RWX;
4715+ create_mapping(&initmap);
4716+
4717+ /* when freeing initmem we will make this RX */
4718+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4719+ kernel.virtual = (unsigned long)_stext;
4720+ kernel.length = __init_begin - _stext;
4721+ kernel.type = __MT_MEMORY_RWX;
4722+ create_mapping(&kernel);
4723+
4724+ if (map.virtual < (unsigned long)_stext) {
4725+ map.length = (unsigned long)_stext - map.virtual;
4726+ map.type = __MT_MEMORY_RWX;
4727+ create_mapping(&map);
4728+ }
4729+
4730+ map.pfn = __phys_to_pfn(__pa(_sdata));
4731+ map.virtual = (unsigned long)_sdata;
4732+ map.length = end - __pa(_sdata);
4733+ }
4734+
4735+ map.type = MT_MEMORY_RW;
4736+ create_mapping(&map);
4737+#else
4738 if (end < kernel_x_start) {
4739 map.pfn = __phys_to_pfn(start);
4740 map.virtual = __phys_to_virt(start);
4741 map.length = end - start;
4742- map.type = MT_MEMORY_RWX;
4743+ map.type = __MT_MEMORY_RWX;
4744
4745 create_mapping(&map);
4746 } else if (start >= kernel_x_end) {
4747@@ -1371,7 +1464,7 @@ static void __init map_lowmem(void)
4748 map.pfn = __phys_to_pfn(kernel_x_start);
4749 map.virtual = __phys_to_virt(kernel_x_start);
4750 map.length = kernel_x_end - kernel_x_start;
4751- map.type = MT_MEMORY_RWX;
4752+ map.type = __MT_MEMORY_RWX;
4753
4754 create_mapping(&map);
4755
4756@@ -1384,6 +1477,7 @@ static void __init map_lowmem(void)
4757 create_mapping(&map);
4758 }
4759 }
4760+#endif
4761 }
4762 }
4763
4764diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4765index e0e2358..96c6791 100644
4766--- a/arch/arm/net/bpf_jit_32.c
4767+++ b/arch/arm/net/bpf_jit_32.c
4768@@ -20,6 +20,7 @@
4769 #include <asm/cacheflush.h>
4770 #include <asm/hwcap.h>
4771 #include <asm/opcodes.h>
4772+#include <asm/pgtable.h>
4773
4774 #include "bpf_jit_32.h"
4775
4776@@ -72,7 +73,11 @@ struct jit_ctx {
4777 #endif
4778 };
4779
4780+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4781+int bpf_jit_enable __read_only;
4782+#else
4783 int bpf_jit_enable __read_mostly;
4784+#endif
4785
4786 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4787 {
4788@@ -179,8 +184,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4789 {
4790 u32 *ptr;
4791 /* We are guaranteed to have aligned memory. */
4792+ pax_open_kernel();
4793 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4794 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4795+ pax_close_kernel();
4796 }
4797
4798 static void build_prologue(struct jit_ctx *ctx)
4799@@ -547,7 +554,7 @@ load_common:
4800 emit(ARM_SUB_I(r_scratch, r_skb_hl,
4801 1 << load_order), ctx);
4802 emit(ARM_CMP_R(r_scratch, r_off), ctx);
4803- condt = ARM_COND_HS;
4804+ condt = ARM_COND_GE;
4805 } else {
4806 emit(ARM_CMP_R(r_skb_hl, r_off), ctx);
4807 condt = ARM_COND_HI;
4808@@ -860,9 +867,11 @@ b_epilogue:
4809 off = offsetof(struct sk_buff, vlan_tci);
4810 emit(ARM_LDRH_I(r_A, r_skb, off), ctx);
4811 if (code == (BPF_ANC | SKF_AD_VLAN_TAG))
4812- OP_IMM3(ARM_AND, r_A, r_A, VLAN_VID_MASK, ctx);
4813- else
4814- OP_IMM3(ARM_AND, r_A, r_A, VLAN_TAG_PRESENT, ctx);
4815+ OP_IMM3(ARM_AND, r_A, r_A, ~VLAN_TAG_PRESENT, ctx);
4816+ else {
4817+ OP_IMM3(ARM_LSR, r_A, r_A, 12, ctx);
4818+ OP_IMM3(ARM_AND, r_A, r_A, 0x1, ctx);
4819+ }
4820 break;
4821 case BPF_ANC | SKF_AD_QUEUE:
4822 ctx->seen |= SEEN_SKB;
4823diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4824index 5b217f4..c23f40e 100644
4825--- a/arch/arm/plat-iop/setup.c
4826+++ b/arch/arm/plat-iop/setup.c
4827@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4828 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4829 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4830 .length = IOP3XX_PERIPHERAL_SIZE,
4831- .type = MT_UNCACHED,
4832+ .type = MT_UNCACHED_RW,
4833 },
4834 };
4835
4836diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4837index a5bc92d..0bb4730 100644
4838--- a/arch/arm/plat-omap/sram.c
4839+++ b/arch/arm/plat-omap/sram.c
4840@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4841 * Looks like we need to preserve some bootloader code at the
4842 * beginning of SRAM for jumping to flash for reboot to work...
4843 */
4844+ pax_open_kernel();
4845 memset_io(omap_sram_base + omap_sram_skip, 0,
4846 omap_sram_size - omap_sram_skip);
4847+ pax_close_kernel();
4848 }
4849diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
4850index 7047051..44e8675 100644
4851--- a/arch/arm64/include/asm/atomic.h
4852+++ b/arch/arm64/include/asm/atomic.h
4853@@ -252,5 +252,15 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
4854 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
4855 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
4856
4857+#define atomic64_read_unchecked(v) atomic64_read(v)
4858+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4859+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4860+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4861+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4862+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4863+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4864+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4865+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4866+
4867 #endif
4868 #endif
4869diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4870index 71f19c4..2b13cfe 100644
4871--- a/arch/arm64/include/asm/barrier.h
4872+++ b/arch/arm64/include/asm/barrier.h
4873@@ -44,7 +44,7 @@
4874 do { \
4875 compiletime_assert_atomic_type(*p); \
4876 barrier(); \
4877- ACCESS_ONCE(*p) = (v); \
4878+ ACCESS_ONCE_RW(*p) = (v); \
4879 } while (0)
4880
4881 #define smp_load_acquire(p) \
4882diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
4883index 4fde8c1..441f84f 100644
4884--- a/arch/arm64/include/asm/percpu.h
4885+++ b/arch/arm64/include/asm/percpu.h
4886@@ -135,16 +135,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
4887 {
4888 switch (size) {
4889 case 1:
4890- ACCESS_ONCE(*(u8 *)ptr) = (u8)val;
4891+ ACCESS_ONCE_RW(*(u8 *)ptr) = (u8)val;
4892 break;
4893 case 2:
4894- ACCESS_ONCE(*(u16 *)ptr) = (u16)val;
4895+ ACCESS_ONCE_RW(*(u16 *)ptr) = (u16)val;
4896 break;
4897 case 4:
4898- ACCESS_ONCE(*(u32 *)ptr) = (u32)val;
4899+ ACCESS_ONCE_RW(*(u32 *)ptr) = (u32)val;
4900 break;
4901 case 8:
4902- ACCESS_ONCE(*(u64 *)ptr) = (u64)val;
4903+ ACCESS_ONCE_RW(*(u64 *)ptr) = (u64)val;
4904 break;
4905 default:
4906 BUILD_BUG();
4907diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
4908index 7642056..bffc904 100644
4909--- a/arch/arm64/include/asm/pgalloc.h
4910+++ b/arch/arm64/include/asm/pgalloc.h
4911@@ -46,6 +46,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4912 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
4913 }
4914
4915+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4916+{
4917+ pud_populate(mm, pud, pmd);
4918+}
4919+
4920 #endif /* CONFIG_PGTABLE_LEVELS > 2 */
4921
4922 #if CONFIG_PGTABLE_LEVELS > 3
4923diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4924index 07e1ba44..ec8cbbb 100644
4925--- a/arch/arm64/include/asm/uaccess.h
4926+++ b/arch/arm64/include/asm/uaccess.h
4927@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4928 flag; \
4929 })
4930
4931+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4932 #define access_ok(type, addr, size) __range_ok(addr, size)
4933 #define user_addr_max get_fs
4934
4935diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
4936index b0bd4e5..54e82f6 100644
4937--- a/arch/arm64/mm/dma-mapping.c
4938+++ b/arch/arm64/mm/dma-mapping.c
4939@@ -134,7 +134,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
4940 phys_to_page(paddr),
4941 size >> PAGE_SHIFT);
4942 if (!freed)
4943- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
4944+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
4945 }
4946
4947 static void *__dma_alloc(struct device *dev, size_t size,
4948diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4949index c3a58a1..78fbf54 100644
4950--- a/arch/avr32/include/asm/cache.h
4951+++ b/arch/avr32/include/asm/cache.h
4952@@ -1,8 +1,10 @@
4953 #ifndef __ASM_AVR32_CACHE_H
4954 #define __ASM_AVR32_CACHE_H
4955
4956+#include <linux/const.h>
4957+
4958 #define L1_CACHE_SHIFT 5
4959-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4960+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4961
4962 /*
4963 * Memory returned by kmalloc() may be used for DMA, so we must make
4964diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4965index 0388ece..87c8df1 100644
4966--- a/arch/avr32/include/asm/elf.h
4967+++ b/arch/avr32/include/asm/elf.h
4968@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4969 the loader. We need to make sure that it is out of the way of the program
4970 that it will "exec", and that there is sufficient room for the brk. */
4971
4972-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4973+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4974
4975+#ifdef CONFIG_PAX_ASLR
4976+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4977+
4978+#define PAX_DELTA_MMAP_LEN 15
4979+#define PAX_DELTA_STACK_LEN 15
4980+#endif
4981
4982 /* This yields a mask that user programs can use to figure out what
4983 instruction set this CPU supports. This could be done in user space,
4984diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4985index 479330b..53717a8 100644
4986--- a/arch/avr32/include/asm/kmap_types.h
4987+++ b/arch/avr32/include/asm/kmap_types.h
4988@@ -2,9 +2,9 @@
4989 #define __ASM_AVR32_KMAP_TYPES_H
4990
4991 #ifdef CONFIG_DEBUG_HIGHMEM
4992-# define KM_TYPE_NR 29
4993+# define KM_TYPE_NR 30
4994 #else
4995-# define KM_TYPE_NR 14
4996+# define KM_TYPE_NR 15
4997 #endif
4998
4999 #endif /* __ASM_AVR32_KMAP_TYPES_H */
5000diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
5001index d223a8b..69c5210 100644
5002--- a/arch/avr32/mm/fault.c
5003+++ b/arch/avr32/mm/fault.c
5004@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
5005
5006 int exception_trace = 1;
5007
5008+#ifdef CONFIG_PAX_PAGEEXEC
5009+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5010+{
5011+ unsigned long i;
5012+
5013+ printk(KERN_ERR "PAX: bytes at PC: ");
5014+ for (i = 0; i < 20; i++) {
5015+ unsigned char c;
5016+ if (get_user(c, (unsigned char *)pc+i))
5017+ printk(KERN_CONT "???????? ");
5018+ else
5019+ printk(KERN_CONT "%02x ", c);
5020+ }
5021+ printk("\n");
5022+}
5023+#endif
5024+
5025 /*
5026 * This routine handles page faults. It determines the address and the
5027 * problem, and then passes it off to one of the appropriate routines.
5028@@ -178,6 +195,16 @@ bad_area:
5029 up_read(&mm->mmap_sem);
5030
5031 if (user_mode(regs)) {
5032+
5033+#ifdef CONFIG_PAX_PAGEEXEC
5034+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
5035+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
5036+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
5037+ do_group_exit(SIGKILL);
5038+ }
5039+ }
5040+#endif
5041+
5042 if (exception_trace && printk_ratelimit())
5043 printk("%s%s[%d]: segfault at %08lx pc %08lx "
5044 "sp %08lx ecr %lu\n",
5045diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
5046index 568885a..f8008df 100644
5047--- a/arch/blackfin/include/asm/cache.h
5048+++ b/arch/blackfin/include/asm/cache.h
5049@@ -7,6 +7,7 @@
5050 #ifndef __ARCH_BLACKFIN_CACHE_H
5051 #define __ARCH_BLACKFIN_CACHE_H
5052
5053+#include <linux/const.h>
5054 #include <linux/linkage.h> /* for asmlinkage */
5055
5056 /*
5057@@ -14,7 +15,7 @@
5058 * Blackfin loads 32 bytes for cache
5059 */
5060 #define L1_CACHE_SHIFT 5
5061-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5062+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5063 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5064
5065 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5066diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
5067index aea2718..3639a60 100644
5068--- a/arch/cris/include/arch-v10/arch/cache.h
5069+++ b/arch/cris/include/arch-v10/arch/cache.h
5070@@ -1,8 +1,9 @@
5071 #ifndef _ASM_ARCH_CACHE_H
5072 #define _ASM_ARCH_CACHE_H
5073
5074+#include <linux/const.h>
5075 /* Etrax 100LX have 32-byte cache-lines. */
5076-#define L1_CACHE_BYTES 32
5077 #define L1_CACHE_SHIFT 5
5078+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5079
5080 #endif /* _ASM_ARCH_CACHE_H */
5081diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
5082index 7caf25d..ee65ac5 100644
5083--- a/arch/cris/include/arch-v32/arch/cache.h
5084+++ b/arch/cris/include/arch-v32/arch/cache.h
5085@@ -1,11 +1,12 @@
5086 #ifndef _ASM_CRIS_ARCH_CACHE_H
5087 #define _ASM_CRIS_ARCH_CACHE_H
5088
5089+#include <linux/const.h>
5090 #include <arch/hwregs/dma.h>
5091
5092 /* A cache-line is 32 bytes. */
5093-#define L1_CACHE_BYTES 32
5094 #define L1_CACHE_SHIFT 5
5095+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5096
5097 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5098
5099diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5100index 102190a..5334cea 100644
5101--- a/arch/frv/include/asm/atomic.h
5102+++ b/arch/frv/include/asm/atomic.h
5103@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5104 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5105 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5106
5107+#define atomic64_read_unchecked(v) atomic64_read(v)
5108+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5109+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5110+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5111+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5112+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5113+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5114+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5115+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5116+
5117 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5118 {
5119 int c, old;
5120diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5121index 2797163..c2a401df9 100644
5122--- a/arch/frv/include/asm/cache.h
5123+++ b/arch/frv/include/asm/cache.h
5124@@ -12,10 +12,11 @@
5125 #ifndef __ASM_CACHE_H
5126 #define __ASM_CACHE_H
5127
5128+#include <linux/const.h>
5129
5130 /* bytes per L1 cache line */
5131 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5132-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5133+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5134
5135 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5136 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5137diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5138index 43901f2..0d8b865 100644
5139--- a/arch/frv/include/asm/kmap_types.h
5140+++ b/arch/frv/include/asm/kmap_types.h
5141@@ -2,6 +2,6 @@
5142 #ifndef _ASM_KMAP_TYPES_H
5143 #define _ASM_KMAP_TYPES_H
5144
5145-#define KM_TYPE_NR 17
5146+#define KM_TYPE_NR 18
5147
5148 #endif
5149diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5150index 836f147..4cf23f5 100644
5151--- a/arch/frv/mm/elf-fdpic.c
5152+++ b/arch/frv/mm/elf-fdpic.c
5153@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5154 {
5155 struct vm_area_struct *vma;
5156 struct vm_unmapped_area_info info;
5157+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5158
5159 if (len > TASK_SIZE)
5160 return -ENOMEM;
5161@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5162 if (addr) {
5163 addr = PAGE_ALIGN(addr);
5164 vma = find_vma(current->mm, addr);
5165- if (TASK_SIZE - len >= addr &&
5166- (!vma || addr + len <= vma->vm_start))
5167+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5168 goto success;
5169 }
5170
5171@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5172 info.high_limit = (current->mm->start_stack - 0x00200000);
5173 info.align_mask = 0;
5174 info.align_offset = 0;
5175+ info.threadstack_offset = offset;
5176 addr = vm_unmapped_area(&info);
5177 if (!(addr & ~PAGE_MASK))
5178 goto success;
5179diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5180index 69952c18..4fa2908 100644
5181--- a/arch/hexagon/include/asm/cache.h
5182+++ b/arch/hexagon/include/asm/cache.h
5183@@ -21,9 +21,11 @@
5184 #ifndef __ASM_CACHE_H
5185 #define __ASM_CACHE_H
5186
5187+#include <linux/const.h>
5188+
5189 /* Bytes per L1 cache line */
5190-#define L1_CACHE_SHIFT (5)
5191-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5192+#define L1_CACHE_SHIFT 5
5193+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5194
5195 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5196
5197diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5198index 76d25b2..d3793a0f 100644
5199--- a/arch/ia64/Kconfig
5200+++ b/arch/ia64/Kconfig
5201@@ -541,6 +541,7 @@ source "drivers/sn/Kconfig"
5202 config KEXEC
5203 bool "kexec system call"
5204 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5205+ depends on !GRKERNSEC_KMEM
5206 help
5207 kexec is a system call that implements the ability to shutdown your
5208 current kernel, and to start another kernel. It is like a reboot
5209diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5210index 970d0bd..e750b9b 100644
5211--- a/arch/ia64/Makefile
5212+++ b/arch/ia64/Makefile
5213@@ -98,5 +98,6 @@ endef
5214 archprepare: make_nr_irqs_h FORCE
5215 PHONY += make_nr_irqs_h FORCE
5216
5217+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5218 make_nr_irqs_h: FORCE
5219 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5220diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5221index 0bf0350..2ad1957 100644
5222--- a/arch/ia64/include/asm/atomic.h
5223+++ b/arch/ia64/include/asm/atomic.h
5224@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5225 #define atomic64_inc(v) atomic64_add(1, (v))
5226 #define atomic64_dec(v) atomic64_sub(1, (v))
5227
5228+#define atomic64_read_unchecked(v) atomic64_read(v)
5229+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5230+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5231+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5232+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5233+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5234+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5235+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5236+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5237+
5238 #endif /* _ASM_IA64_ATOMIC_H */
5239diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5240index f6769eb..1cdb590 100644
5241--- a/arch/ia64/include/asm/barrier.h
5242+++ b/arch/ia64/include/asm/barrier.h
5243@@ -66,7 +66,7 @@
5244 do { \
5245 compiletime_assert_atomic_type(*p); \
5246 barrier(); \
5247- ACCESS_ONCE(*p) = (v); \
5248+ ACCESS_ONCE_RW(*p) = (v); \
5249 } while (0)
5250
5251 #define smp_load_acquire(p) \
5252diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5253index 988254a..e1ee885 100644
5254--- a/arch/ia64/include/asm/cache.h
5255+++ b/arch/ia64/include/asm/cache.h
5256@@ -1,6 +1,7 @@
5257 #ifndef _ASM_IA64_CACHE_H
5258 #define _ASM_IA64_CACHE_H
5259
5260+#include <linux/const.h>
5261
5262 /*
5263 * Copyright (C) 1998-2000 Hewlett-Packard Co
5264@@ -9,7 +10,7 @@
5265
5266 /* Bytes per L1 (data) cache line. */
5267 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5268-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5269+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5270
5271 #ifdef CONFIG_SMP
5272 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5273diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5274index 5a83c5c..4d7f553 100644
5275--- a/arch/ia64/include/asm/elf.h
5276+++ b/arch/ia64/include/asm/elf.h
5277@@ -42,6 +42,13 @@
5278 */
5279 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5280
5281+#ifdef CONFIG_PAX_ASLR
5282+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5283+
5284+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5285+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5286+#endif
5287+
5288 #define PT_IA_64_UNWIND 0x70000001
5289
5290 /* IA-64 relocations: */
5291diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5292index f5e70e9..624fad5 100644
5293--- a/arch/ia64/include/asm/pgalloc.h
5294+++ b/arch/ia64/include/asm/pgalloc.h
5295@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5296 pgd_val(*pgd_entry) = __pa(pud);
5297 }
5298
5299+static inline void
5300+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5301+{
5302+ pgd_populate(mm, pgd_entry, pud);
5303+}
5304+
5305 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5306 {
5307 return quicklist_alloc(0, GFP_KERNEL, NULL);
5308@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5309 pud_val(*pud_entry) = __pa(pmd);
5310 }
5311
5312+static inline void
5313+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5314+{
5315+ pud_populate(mm, pud_entry, pmd);
5316+}
5317+
5318 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5319 {
5320 return quicklist_alloc(0, GFP_KERNEL, NULL);
5321diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5322index 9f3ed9e..c99b418 100644
5323--- a/arch/ia64/include/asm/pgtable.h
5324+++ b/arch/ia64/include/asm/pgtable.h
5325@@ -12,7 +12,7 @@
5326 * David Mosberger-Tang <davidm@hpl.hp.com>
5327 */
5328
5329-
5330+#include <linux/const.h>
5331 #include <asm/mman.h>
5332 #include <asm/page.h>
5333 #include <asm/processor.h>
5334@@ -139,6 +139,17 @@
5335 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5336 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5337 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5338+
5339+#ifdef CONFIG_PAX_PAGEEXEC
5340+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5341+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5342+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5343+#else
5344+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5345+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5346+# define PAGE_COPY_NOEXEC PAGE_COPY
5347+#endif
5348+
5349 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5350 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5351 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5352diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5353index 45698cd..e8e2dbc 100644
5354--- a/arch/ia64/include/asm/spinlock.h
5355+++ b/arch/ia64/include/asm/spinlock.h
5356@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5357 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5358
5359 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5360- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5361+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5362 }
5363
5364 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5365diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5366index 4f3fb6cc..254055e 100644
5367--- a/arch/ia64/include/asm/uaccess.h
5368+++ b/arch/ia64/include/asm/uaccess.h
5369@@ -70,6 +70,7 @@
5370 && ((segment).seg == KERNEL_DS.seg \
5371 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5372 })
5373+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5374 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5375
5376 /*
5377@@ -241,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5378 static inline unsigned long
5379 __copy_to_user (void __user *to, const void *from, unsigned long count)
5380 {
5381+ if (count > INT_MAX)
5382+ return count;
5383+
5384+ if (!__builtin_constant_p(count))
5385+ check_object_size(from, count, true);
5386+
5387 return __copy_user(to, (__force void __user *) from, count);
5388 }
5389
5390 static inline unsigned long
5391 __copy_from_user (void *to, const void __user *from, unsigned long count)
5392 {
5393+ if (count > INT_MAX)
5394+ return count;
5395+
5396+ if (!__builtin_constant_p(count))
5397+ check_object_size(to, count, false);
5398+
5399 return __copy_user((__force void __user *) to, from, count);
5400 }
5401
5402@@ -256,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5403 ({ \
5404 void __user *__cu_to = (to); \
5405 const void *__cu_from = (from); \
5406- long __cu_len = (n); \
5407+ unsigned long __cu_len = (n); \
5408 \
5409- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5410+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5411+ if (!__builtin_constant_p(n)) \
5412+ check_object_size(__cu_from, __cu_len, true); \
5413 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5414+ } \
5415 __cu_len; \
5416 })
5417
5418@@ -267,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5419 ({ \
5420 void *__cu_to = (to); \
5421 const void __user *__cu_from = (from); \
5422- long __cu_len = (n); \
5423+ unsigned long __cu_len = (n); \
5424 \
5425 __chk_user_ptr(__cu_from); \
5426- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5427+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5428+ if (!__builtin_constant_p(n)) \
5429+ check_object_size(__cu_to, __cu_len, false); \
5430 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5431+ } \
5432 __cu_len; \
5433 })
5434
5435diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5436index 29754aa..06d2838 100644
5437--- a/arch/ia64/kernel/module.c
5438+++ b/arch/ia64/kernel/module.c
5439@@ -492,15 +492,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5440 }
5441
5442 static inline int
5443+in_init_rx (const struct module *mod, uint64_t addr)
5444+{
5445+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5446+}
5447+
5448+static inline int
5449+in_init_rw (const struct module *mod, uint64_t addr)
5450+{
5451+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5452+}
5453+
5454+static inline int
5455 in_init (const struct module *mod, uint64_t addr)
5456 {
5457- return addr - (uint64_t) mod->module_init < mod->init_size;
5458+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5459+}
5460+
5461+static inline int
5462+in_core_rx (const struct module *mod, uint64_t addr)
5463+{
5464+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5465+}
5466+
5467+static inline int
5468+in_core_rw (const struct module *mod, uint64_t addr)
5469+{
5470+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5471 }
5472
5473 static inline int
5474 in_core (const struct module *mod, uint64_t addr)
5475 {
5476- return addr - (uint64_t) mod->module_core < mod->core_size;
5477+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5478 }
5479
5480 static inline int
5481@@ -683,7 +707,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5482 break;
5483
5484 case RV_BDREL:
5485- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5486+ if (in_init_rx(mod, val))
5487+ val -= (uint64_t) mod->module_init_rx;
5488+ else if (in_init_rw(mod, val))
5489+ val -= (uint64_t) mod->module_init_rw;
5490+ else if (in_core_rx(mod, val))
5491+ val -= (uint64_t) mod->module_core_rx;
5492+ else if (in_core_rw(mod, val))
5493+ val -= (uint64_t) mod->module_core_rw;
5494 break;
5495
5496 case RV_LTV:
5497@@ -818,15 +849,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5498 * addresses have been selected...
5499 */
5500 uint64_t gp;
5501- if (mod->core_size > MAX_LTOFF)
5502+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5503 /*
5504 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5505 * at the end of the module.
5506 */
5507- gp = mod->core_size - MAX_LTOFF / 2;
5508+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5509 else
5510- gp = mod->core_size / 2;
5511- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5512+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5513+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5514 mod->arch.gp = gp;
5515 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5516 }
5517diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5518index c39c3cd..3c77738 100644
5519--- a/arch/ia64/kernel/palinfo.c
5520+++ b/arch/ia64/kernel/palinfo.c
5521@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5522 return NOTIFY_OK;
5523 }
5524
5525-static struct notifier_block __refdata palinfo_cpu_notifier =
5526+static struct notifier_block palinfo_cpu_notifier =
5527 {
5528 .notifier_call = palinfo_cpu_callback,
5529 .priority = 0,
5530diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5531index 41e33f8..65180b2a 100644
5532--- a/arch/ia64/kernel/sys_ia64.c
5533+++ b/arch/ia64/kernel/sys_ia64.c
5534@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5535 unsigned long align_mask = 0;
5536 struct mm_struct *mm = current->mm;
5537 struct vm_unmapped_area_info info;
5538+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5539
5540 if (len > RGN_MAP_LIMIT)
5541 return -ENOMEM;
5542@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5543 if (REGION_NUMBER(addr) == RGN_HPAGE)
5544 addr = 0;
5545 #endif
5546+
5547+#ifdef CONFIG_PAX_RANDMMAP
5548+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5549+ addr = mm->free_area_cache;
5550+ else
5551+#endif
5552+
5553 if (!addr)
5554 addr = TASK_UNMAPPED_BASE;
5555
5556@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5557 info.high_limit = TASK_SIZE;
5558 info.align_mask = align_mask;
5559 info.align_offset = 0;
5560+ info.threadstack_offset = offset;
5561 return vm_unmapped_area(&info);
5562 }
5563
5564diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5565index 84f8a52..7c76178 100644
5566--- a/arch/ia64/kernel/vmlinux.lds.S
5567+++ b/arch/ia64/kernel/vmlinux.lds.S
5568@@ -192,7 +192,7 @@ SECTIONS {
5569 /* Per-cpu data: */
5570 . = ALIGN(PERCPU_PAGE_SIZE);
5571 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5572- __phys_per_cpu_start = __per_cpu_load;
5573+ __phys_per_cpu_start = per_cpu_load;
5574 /*
5575 * ensure percpu data fits
5576 * into percpu page size
5577diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5578index ba5ba7a..36e9d3a 100644
5579--- a/arch/ia64/mm/fault.c
5580+++ b/arch/ia64/mm/fault.c
5581@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5582 return pte_present(pte);
5583 }
5584
5585+#ifdef CONFIG_PAX_PAGEEXEC
5586+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5587+{
5588+ unsigned long i;
5589+
5590+ printk(KERN_ERR "PAX: bytes at PC: ");
5591+ for (i = 0; i < 8; i++) {
5592+ unsigned int c;
5593+ if (get_user(c, (unsigned int *)pc+i))
5594+ printk(KERN_CONT "???????? ");
5595+ else
5596+ printk(KERN_CONT "%08x ", c);
5597+ }
5598+ printk("\n");
5599+}
5600+#endif
5601+
5602 # define VM_READ_BIT 0
5603 # define VM_WRITE_BIT 1
5604 # define VM_EXEC_BIT 2
5605@@ -151,8 +168,21 @@ retry:
5606 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5607 goto bad_area;
5608
5609- if ((vma->vm_flags & mask) != mask)
5610+ if ((vma->vm_flags & mask) != mask) {
5611+
5612+#ifdef CONFIG_PAX_PAGEEXEC
5613+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5614+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5615+ goto bad_area;
5616+
5617+ up_read(&mm->mmap_sem);
5618+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5619+ do_group_exit(SIGKILL);
5620+ }
5621+#endif
5622+
5623 goto bad_area;
5624+ }
5625
5626 /*
5627 * If for any reason at all we couldn't handle the fault, make
5628diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5629index 52b7604b..455cb85 100644
5630--- a/arch/ia64/mm/hugetlbpage.c
5631+++ b/arch/ia64/mm/hugetlbpage.c
5632@@ -143,6 +143,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5633 unsigned long pgoff, unsigned long flags)
5634 {
5635 struct vm_unmapped_area_info info;
5636+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5637
5638 if (len > RGN_MAP_LIMIT)
5639 return -ENOMEM;
5640@@ -166,6 +167,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5641 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5642 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5643 info.align_offset = 0;
5644+ info.threadstack_offset = offset;
5645 return vm_unmapped_area(&info);
5646 }
5647
5648diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5649index a9b65cf..49ae1cf 100644
5650--- a/arch/ia64/mm/init.c
5651+++ b/arch/ia64/mm/init.c
5652@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5653 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5654 vma->vm_end = vma->vm_start + PAGE_SIZE;
5655 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5656+
5657+#ifdef CONFIG_PAX_PAGEEXEC
5658+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5659+ vma->vm_flags &= ~VM_EXEC;
5660+
5661+#ifdef CONFIG_PAX_MPROTECT
5662+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5663+ vma->vm_flags &= ~VM_MAYEXEC;
5664+#endif
5665+
5666+ }
5667+#endif
5668+
5669 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5670 down_write(&current->mm->mmap_sem);
5671 if (insert_vm_struct(current->mm, vma)) {
5672@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5673 gate_vma.vm_start = FIXADDR_USER_START;
5674 gate_vma.vm_end = FIXADDR_USER_END;
5675 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5676- gate_vma.vm_page_prot = __P101;
5677+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5678
5679 return 0;
5680 }
5681diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5682index 40b3ee98..8c2c112 100644
5683--- a/arch/m32r/include/asm/cache.h
5684+++ b/arch/m32r/include/asm/cache.h
5685@@ -1,8 +1,10 @@
5686 #ifndef _ASM_M32R_CACHE_H
5687 #define _ASM_M32R_CACHE_H
5688
5689+#include <linux/const.h>
5690+
5691 /* L1 cache line size */
5692 #define L1_CACHE_SHIFT 4
5693-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5694+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5695
5696 #endif /* _ASM_M32R_CACHE_H */
5697diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5698index 82abd15..d95ae5d 100644
5699--- a/arch/m32r/lib/usercopy.c
5700+++ b/arch/m32r/lib/usercopy.c
5701@@ -14,6 +14,9 @@
5702 unsigned long
5703 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5704 {
5705+ if ((long)n < 0)
5706+ return n;
5707+
5708 prefetch(from);
5709 if (access_ok(VERIFY_WRITE, to, n))
5710 __copy_user(to,from,n);
5711@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5712 unsigned long
5713 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5714 {
5715+ if ((long)n < 0)
5716+ return n;
5717+
5718 prefetchw(to);
5719 if (access_ok(VERIFY_READ, from, n))
5720 __copy_user_zeroing(to,from,n);
5721diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5722index 0395c51..5f26031 100644
5723--- a/arch/m68k/include/asm/cache.h
5724+++ b/arch/m68k/include/asm/cache.h
5725@@ -4,9 +4,11 @@
5726 #ifndef __ARCH_M68K_CACHE_H
5727 #define __ARCH_M68K_CACHE_H
5728
5729+#include <linux/const.h>
5730+
5731 /* bytes per L1 cache line */
5732 #define L1_CACHE_SHIFT 4
5733-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5734+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5735
5736 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5737
5738diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5739index d703d8e..a8e2d70 100644
5740--- a/arch/metag/include/asm/barrier.h
5741+++ b/arch/metag/include/asm/barrier.h
5742@@ -90,7 +90,7 @@ static inline void fence(void)
5743 do { \
5744 compiletime_assert_atomic_type(*p); \
5745 smp_mb(); \
5746- ACCESS_ONCE(*p) = (v); \
5747+ ACCESS_ONCE_RW(*p) = (v); \
5748 } while (0)
5749
5750 #define smp_load_acquire(p) \
5751diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5752index 7ca80ac..794ba72 100644
5753--- a/arch/metag/mm/hugetlbpage.c
5754+++ b/arch/metag/mm/hugetlbpage.c
5755@@ -194,6 +194,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5756 info.high_limit = TASK_SIZE;
5757 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5758 info.align_offset = 0;
5759+ info.threadstack_offset = 0;
5760 return vm_unmapped_area(&info);
5761 }
5762
5763diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5764index 4efe96a..60e8699 100644
5765--- a/arch/microblaze/include/asm/cache.h
5766+++ b/arch/microblaze/include/asm/cache.h
5767@@ -13,11 +13,12 @@
5768 #ifndef _ASM_MICROBLAZE_CACHE_H
5769 #define _ASM_MICROBLAZE_CACHE_H
5770
5771+#include <linux/const.h>
5772 #include <asm/registers.h>
5773
5774 #define L1_CACHE_SHIFT 5
5775 /* word-granular cache in microblaze */
5776-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5777+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5778
5779 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5780
5781diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5782index a3b1ffe..7d61ca6 100644
5783--- a/arch/mips/Kconfig
5784+++ b/arch/mips/Kconfig
5785@@ -2586,6 +2586,7 @@ source "kernel/Kconfig.preempt"
5786
5787 config KEXEC
5788 bool "Kexec system call"
5789+ depends on !GRKERNSEC_KMEM
5790 help
5791 kexec is a system call that implements the ability to shutdown your
5792 current kernel, and to start another kernel. It is like a reboot
5793diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5794index d8960d4..77dbd31 100644
5795--- a/arch/mips/cavium-octeon/dma-octeon.c
5796+++ b/arch/mips/cavium-octeon/dma-octeon.c
5797@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5798 if (dma_release_from_coherent(dev, order, vaddr))
5799 return;
5800
5801- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5802+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5803 }
5804
5805 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5806diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5807index 26d4363..3c9a82e 100644
5808--- a/arch/mips/include/asm/atomic.h
5809+++ b/arch/mips/include/asm/atomic.h
5810@@ -22,15 +22,39 @@
5811 #include <asm/cmpxchg.h>
5812 #include <asm/war.h>
5813
5814+#ifdef CONFIG_GENERIC_ATOMIC64
5815+#include <asm-generic/atomic64.h>
5816+#endif
5817+
5818 #define ATOMIC_INIT(i) { (i) }
5819
5820+#ifdef CONFIG_64BIT
5821+#define _ASM_EXTABLE(from, to) \
5822+" .section __ex_table,\"a\"\n" \
5823+" .dword " #from ", " #to"\n" \
5824+" .previous\n"
5825+#else
5826+#define _ASM_EXTABLE(from, to) \
5827+" .section __ex_table,\"a\"\n" \
5828+" .word " #from ", " #to"\n" \
5829+" .previous\n"
5830+#endif
5831+
5832 /*
5833 * atomic_read - read atomic variable
5834 * @v: pointer of type atomic_t
5835 *
5836 * Atomically reads the value of @v.
5837 */
5838-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5839+static inline int atomic_read(const atomic_t *v)
5840+{
5841+ return ACCESS_ONCE(v->counter);
5842+}
5843+
5844+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5845+{
5846+ return ACCESS_ONCE(v->counter);
5847+}
5848
5849 /*
5850 * atomic_set - set atomic variable
5851@@ -39,47 +63,77 @@
5852 *
5853 * Atomically sets the value of @v to @i.
5854 */
5855-#define atomic_set(v, i) ((v)->counter = (i))
5856+static inline void atomic_set(atomic_t *v, int i)
5857+{
5858+ v->counter = i;
5859+}
5860
5861-#define ATOMIC_OP(op, c_op, asm_op) \
5862-static __inline__ void atomic_##op(int i, atomic_t * v) \
5863+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5864+{
5865+ v->counter = i;
5866+}
5867+
5868+#ifdef CONFIG_PAX_REFCOUNT
5869+#define __OVERFLOW_POST \
5870+ " b 4f \n" \
5871+ " .set noreorder \n" \
5872+ "3: b 5f \n" \
5873+ " move %0, %1 \n" \
5874+ " .set reorder \n"
5875+#define __OVERFLOW_EXTABLE \
5876+ "3:\n" \
5877+ _ASM_EXTABLE(2b, 3b)
5878+#else
5879+#define __OVERFLOW_POST
5880+#define __OVERFLOW_EXTABLE
5881+#endif
5882+
5883+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5884+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5885 { \
5886 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5887 int temp; \
5888 \
5889 __asm__ __volatile__( \
5890- " .set arch=r4000 \n" \
5891- "1: ll %0, %1 # atomic_" #op " \n" \
5892- " " #asm_op " %0, %2 \n" \
5893+ " .set mips3 \n" \
5894+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5895+ "2: " #asm_op " %0, %2 \n" \
5896 " sc %0, %1 \n" \
5897 " beqzl %0, 1b \n" \
5898+ extable \
5899 " .set mips0 \n" \
5900 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5901 : "Ir" (i)); \
5902 } else if (kernel_uses_llsc) { \
5903 int temp; \
5904 \
5905- do { \
5906- __asm__ __volatile__( \
5907- " .set "MIPS_ISA_LEVEL" \n" \
5908- " ll %0, %1 # atomic_" #op "\n" \
5909- " " #asm_op " %0, %2 \n" \
5910- " sc %0, %1 \n" \
5911- " .set mips0 \n" \
5912- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5913- : "Ir" (i)); \
5914- } while (unlikely(!temp)); \
5915+ __asm__ __volatile__( \
5916+ " .set "MIPS_ISA_LEVEL" \n" \
5917+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5918+ "2: " #asm_op " %0, %2 \n" \
5919+ " sc %0, %1 \n" \
5920+ " beqz %0, 1b \n" \
5921+ extable \
5922+ " .set mips0 \n" \
5923+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5924+ : "Ir" (i)); \
5925 } else { \
5926 unsigned long flags; \
5927 \
5928 raw_local_irq_save(flags); \
5929- v->counter c_op i; \
5930+ __asm__ __volatile__( \
5931+ "2: " #asm_op " %0, %1 \n" \
5932+ extable \
5933+ : "+r" (v->counter) : "Ir" (i)); \
5934 raw_local_irq_restore(flags); \
5935 } \
5936 }
5937
5938-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5939-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5940+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, _unchecked, asm_op##u, ) \
5941+ __ATOMIC_OP(op, , asm_op, __OVERFLOW_EXTABLE)
5942+
5943+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5944+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5945 { \
5946 int result; \
5947 \
5948@@ -89,12 +143,15 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5949 int temp; \
5950 \
5951 __asm__ __volatile__( \
5952- " .set arch=r4000 \n" \
5953- "1: ll %1, %2 # atomic_" #op "_return \n" \
5954- " " #asm_op " %0, %1, %3 \n" \
5955+ " .set mips3 \n" \
5956+ "1: ll %1, %2 # atomic_" #op "_return" #suffix"\n" \
5957+ "2: " #asm_op " %0, %1, %3 \n" \
5958 " sc %0, %2 \n" \
5959 " beqzl %0, 1b \n" \
5960- " " #asm_op " %0, %1, %3 \n" \
5961+ post_op \
5962+ extable \
5963+ "4: " #asm_op " %0, %1, %3 \n" \
5964+ "5: \n" \
5965 " .set mips0 \n" \
5966 : "=&r" (result), "=&r" (temp), \
5967 "+" GCC_OFF_SMALL_ASM() (v->counter) \
5968@@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5969 } else if (kernel_uses_llsc) { \
5970 int temp; \
5971 \
5972- do { \
5973- __asm__ __volatile__( \
5974- " .set "MIPS_ISA_LEVEL" \n" \
5975- " ll %1, %2 # atomic_" #op "_return \n" \
5976- " " #asm_op " %0, %1, %3 \n" \
5977- " sc %0, %2 \n" \
5978- " .set mips0 \n" \
5979- : "=&r" (result), "=&r" (temp), \
5980- "+" GCC_OFF_SMALL_ASM() (v->counter) \
5981- : "Ir" (i)); \
5982- } while (unlikely(!result)); \
5983+ __asm__ __volatile__( \
5984+ " .set "MIPS_ISA_LEVEL" \n" \
5985+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5986+ "2: " #asm_op " %0, %1, %3 \n" \
5987+ " sc %0, %2 \n" \
5988+ post_op \
5989+ extable \
5990+ "4: " #asm_op " %0, %1, %3 \n" \
5991+ "5: \n" \
5992+ " .set mips0 \n" \
5993+ : "=&r" (result), "=&r" (temp), \
5994+ "+" GCC_OFF_SMALL_ASM() (v->counter) \
5995+ : "Ir" (i)); \
5996 \
5997 result = temp; result c_op i; \
5998 } else { \
5999 unsigned long flags; \
6000 \
6001 raw_local_irq_save(flags); \
6002- result = v->counter; \
6003- result c_op i; \
6004- v->counter = result; \
6005+ __asm__ __volatile__( \
6006+ " lw %0, %1 \n" \
6007+ "2: " #asm_op " %0, %1, %2 \n" \
6008+ " sw %0, %1 \n" \
6009+ "3: \n" \
6010+ extable \
6011+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6012+ : "Ir" (i)); \
6013 raw_local_irq_restore(flags); \
6014 } \
6015 \
6016@@ -130,16 +194,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
6017 return result; \
6018 }
6019
6020-#define ATOMIC_OPS(op, c_op, asm_op) \
6021- ATOMIC_OP(op, c_op, asm_op) \
6022- ATOMIC_OP_RETURN(op, c_op, asm_op)
6023+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6024+ __ATOMIC_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6025
6026-ATOMIC_OPS(add, +=, addu)
6027-ATOMIC_OPS(sub, -=, subu)
6028+#define ATOMIC_OPS(op, asm_op) \
6029+ ATOMIC_OP(op, asm_op) \
6030+ ATOMIC_OP_RETURN(op, asm_op)
6031+
6032+ATOMIC_OPS(add, add)
6033+ATOMIC_OPS(sub, sub)
6034
6035 #undef ATOMIC_OPS
6036 #undef ATOMIC_OP_RETURN
6037+#undef __ATOMIC_OP_RETURN
6038 #undef ATOMIC_OP
6039+#undef __ATOMIC_OP
6040
6041 /*
6042 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
6043@@ -149,7 +218,7 @@ ATOMIC_OPS(sub, -=, subu)
6044 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6045 * The function returns the old value of @v minus @i.
6046 */
6047-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6048+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
6049 {
6050 int result;
6051
6052@@ -159,7 +228,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6053 int temp;
6054
6055 __asm__ __volatile__(
6056- " .set arch=r4000 \n"
6057+ " .set "MIPS_ISA_LEVEL" \n"
6058 "1: ll %1, %2 # atomic_sub_if_positive\n"
6059 " subu %0, %1, %3 \n"
6060 " bltz %0, 1f \n"
6061@@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
6062 return result;
6063 }
6064
6065-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
6066-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
6067+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
6068+{
6069+ return cmpxchg(&v->counter, old, new);
6070+}
6071+
6072+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
6073+ int new)
6074+{
6075+ return cmpxchg(&(v->counter), old, new);
6076+}
6077+
6078+static inline int atomic_xchg(atomic_t *v, int new)
6079+{
6080+ return xchg(&v->counter, new);
6081+}
6082+
6083+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6084+{
6085+ return xchg(&(v->counter), new);
6086+}
6087
6088 /**
6089 * __atomic_add_unless - add unless the number is a given value
6090@@ -237,6 +324,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6091
6092 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6093 #define atomic_inc_return(v) atomic_add_return(1, (v))
6094+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6095+{
6096+ return atomic_add_return_unchecked(1, v);
6097+}
6098
6099 /*
6100 * atomic_sub_and_test - subtract value from variable and test result
6101@@ -258,6 +349,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6102 * other cases.
6103 */
6104 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6105+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6106+{
6107+ return atomic_add_return_unchecked(1, v) == 0;
6108+}
6109
6110 /*
6111 * atomic_dec_and_test - decrement by 1 and test
6112@@ -282,6 +377,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6113 * Atomically increments @v by 1.
6114 */
6115 #define atomic_inc(v) atomic_add(1, (v))
6116+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6117+{
6118+ atomic_add_unchecked(1, v);
6119+}
6120
6121 /*
6122 * atomic_dec - decrement and test
6123@@ -290,6 +389,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6124 * Atomically decrements @v by 1.
6125 */
6126 #define atomic_dec(v) atomic_sub(1, (v))
6127+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6128+{
6129+ atomic_sub_unchecked(1, v);
6130+}
6131
6132 /*
6133 * atomic_add_negative - add and test if negative
6134@@ -311,54 +414,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6135 * @v: pointer of type atomic64_t
6136 *
6137 */
6138-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6139+static inline long atomic64_read(const atomic64_t *v)
6140+{
6141+ return ACCESS_ONCE(v->counter);
6142+}
6143+
6144+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6145+{
6146+ return ACCESS_ONCE(v->counter);
6147+}
6148
6149 /*
6150 * atomic64_set - set atomic variable
6151 * @v: pointer of type atomic64_t
6152 * @i: required value
6153 */
6154-#define atomic64_set(v, i) ((v)->counter = (i))
6155+static inline void atomic64_set(atomic64_t *v, long i)
6156+{
6157+ v->counter = i;
6158+}
6159
6160-#define ATOMIC64_OP(op, c_op, asm_op) \
6161-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6162+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6163+{
6164+ v->counter = i;
6165+}
6166+
6167+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6168+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6169 { \
6170 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6171 long temp; \
6172 \
6173 __asm__ __volatile__( \
6174- " .set arch=r4000 \n" \
6175- "1: lld %0, %1 # atomic64_" #op " \n" \
6176- " " #asm_op " %0, %2 \n" \
6177+ " .set "MIPS_ISA_LEVEL" \n" \
6178+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6179+ "2: " #asm_op " %0, %2 \n" \
6180 " scd %0, %1 \n" \
6181 " beqzl %0, 1b \n" \
6182+ extable \
6183 " .set mips0 \n" \
6184 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6185 : "Ir" (i)); \
6186 } else if (kernel_uses_llsc) { \
6187 long temp; \
6188 \
6189- do { \
6190- __asm__ __volatile__( \
6191- " .set "MIPS_ISA_LEVEL" \n" \
6192- " lld %0, %1 # atomic64_" #op "\n" \
6193- " " #asm_op " %0, %2 \n" \
6194- " scd %0, %1 \n" \
6195- " .set mips0 \n" \
6196- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6197- : "Ir" (i)); \
6198- } while (unlikely(!temp)); \
6199+ __asm__ __volatile__( \
6200+ " .set "MIPS_ISA_LEVEL" \n" \
6201+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6202+ "2: " #asm_op " %0, %2 \n" \
6203+ " scd %0, %1 \n" \
6204+ " beqz %0, 1b \n" \
6205+ extable \
6206+ " .set mips0 \n" \
6207+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6208+ : "Ir" (i)); \
6209 } else { \
6210 unsigned long flags; \
6211 \
6212 raw_local_irq_save(flags); \
6213- v->counter c_op i; \
6214+ __asm__ __volatile__( \
6215+ "2: " #asm_op " %0, %1 \n" \
6216+ extable \
6217+ : "+" GCC_OFF_SMALL_ASM() (v->counter) : "Ir" (i)); \
6218 raw_local_irq_restore(flags); \
6219 } \
6220 }
6221
6222-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6223-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6224+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, _unchecked, asm_op##u, ) \
6225+ __ATOMIC64_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6226+
6227+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6228+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6229 { \
6230 long result; \
6231 \
6232@@ -368,12 +494,15 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6233 long temp; \
6234 \
6235 __asm__ __volatile__( \
6236- " .set arch=r4000 \n" \
6237+ " .set mips3 \n" \
6238 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6239- " " #asm_op " %0, %1, %3 \n" \
6240+ "2: " #asm_op " %0, %1, %3 \n" \
6241 " scd %0, %2 \n" \
6242 " beqzl %0, 1b \n" \
6243- " " #asm_op " %0, %1, %3 \n" \
6244+ post_op \
6245+ extable \
6246+ "4: " #asm_op " %0, %1, %3 \n" \
6247+ "5: \n" \
6248 " .set mips0 \n" \
6249 : "=&r" (result), "=&r" (temp), \
6250 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6251@@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6252 } else if (kernel_uses_llsc) { \
6253 long temp; \
6254 \
6255- do { \
6256- __asm__ __volatile__( \
6257- " .set "MIPS_ISA_LEVEL" \n" \
6258- " lld %1, %2 # atomic64_" #op "_return\n" \
6259- " " #asm_op " %0, %1, %3 \n" \
6260- " scd %0, %2 \n" \
6261- " .set mips0 \n" \
6262- : "=&r" (result), "=&r" (temp), \
6263- "=" GCC_OFF_SMALL_ASM() (v->counter) \
6264- : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6265- : "memory"); \
6266- } while (unlikely(!result)); \
6267+ __asm__ __volatile__( \
6268+ " .set "MIPS_ISA_LEVEL" \n" \
6269+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n"\
6270+ "2: " #asm_op " %0, %1, %3 \n" \
6271+ " scd %0, %2 \n" \
6272+ " beqz %0, 1b \n" \
6273+ post_op \
6274+ extable \
6275+ "4: " #asm_op " %0, %1, %3 \n" \
6276+ "5: \n" \
6277+ " .set mips0 \n" \
6278+ : "=&r" (result), "=&r" (temp), \
6279+ "=" GCC_OFF_SMALL_ASM() (v->counter) \
6280+ : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6281+ : "memory"); \
6282 \
6283 result = temp; result c_op i; \
6284 } else { \
6285 unsigned long flags; \
6286 \
6287 raw_local_irq_save(flags); \
6288- result = v->counter; \
6289- result c_op i; \
6290- v->counter = result; \
6291+ __asm__ __volatile__( \
6292+ " ld %0, %1 \n" \
6293+ "2: " #asm_op " %0, %1, %2 \n" \
6294+ " sd %0, %1 \n" \
6295+ "3: \n" \
6296+ extable \
6297+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6298+ : "Ir" (i)); \
6299 raw_local_irq_restore(flags); \
6300 } \
6301 \
6302@@ -410,16 +547,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6303 return result; \
6304 }
6305
6306-#define ATOMIC64_OPS(op, c_op, asm_op) \
6307- ATOMIC64_OP(op, c_op, asm_op) \
6308- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6309+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6310+ __ATOMIC64_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6311
6312-ATOMIC64_OPS(add, +=, daddu)
6313-ATOMIC64_OPS(sub, -=, dsubu)
6314+#define ATOMIC64_OPS(op, asm_op) \
6315+ ATOMIC64_OP(op, asm_op) \
6316+ ATOMIC64_OP_RETURN(op, asm_op)
6317+
6318+ATOMIC64_OPS(add, dadd)
6319+ATOMIC64_OPS(sub, dsub)
6320
6321 #undef ATOMIC64_OPS
6322 #undef ATOMIC64_OP_RETURN
6323+#undef __ATOMIC64_OP_RETURN
6324 #undef ATOMIC64_OP
6325+#undef __ATOMIC64_OP
6326+#undef __OVERFLOW_EXTABLE
6327+#undef __OVERFLOW_POST
6328
6329 /*
6330 * atomic64_sub_if_positive - conditionally subtract integer from atomic
6331@@ -430,7 +574,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6332 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6333 * The function returns the old value of @v minus @i.
6334 */
6335-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6336+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6337 {
6338 long result;
6339
6340@@ -440,7 +584,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6341 long temp;
6342
6343 __asm__ __volatile__(
6344- " .set arch=r4000 \n"
6345+ " .set "MIPS_ISA_LEVEL" \n"
6346 "1: lld %1, %2 # atomic64_sub_if_positive\n"
6347 " dsubu %0, %1, %3 \n"
6348 " bltz %0, 1f \n"
6349@@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6350 return result;
6351 }
6352
6353-#define atomic64_cmpxchg(v, o, n) \
6354- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6355-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6356+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6357+{
6358+ return cmpxchg(&v->counter, old, new);
6359+}
6360+
6361+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6362+ long new)
6363+{
6364+ return cmpxchg(&(v->counter), old, new);
6365+}
6366+
6367+static inline long atomic64_xchg(atomic64_t *v, long new)
6368+{
6369+ return xchg(&v->counter, new);
6370+}
6371+
6372+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6373+{
6374+ return xchg(&(v->counter), new);
6375+}
6376
6377 /**
6378 * atomic64_add_unless - add unless the number is a given value
6379@@ -521,6 +682,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6380
6381 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6382 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6383+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6384
6385 /*
6386 * atomic64_sub_and_test - subtract value from variable and test result
6387@@ -542,6 +704,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6388 * other cases.
6389 */
6390 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6391+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6392
6393 /*
6394 * atomic64_dec_and_test - decrement by 1 and test
6395@@ -566,6 +729,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6396 * Atomically increments @v by 1.
6397 */
6398 #define atomic64_inc(v) atomic64_add(1, (v))
6399+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6400
6401 /*
6402 * atomic64_dec - decrement and test
6403@@ -574,6 +738,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6404 * Atomically decrements @v by 1.
6405 */
6406 #define atomic64_dec(v) atomic64_sub(1, (v))
6407+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6408
6409 /*
6410 * atomic64_add_negative - add and test if negative
6411diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6412index 2b8bbbc..4556df6 100644
6413--- a/arch/mips/include/asm/barrier.h
6414+++ b/arch/mips/include/asm/barrier.h
6415@@ -133,7 +133,7 @@
6416 do { \
6417 compiletime_assert_atomic_type(*p); \
6418 smp_mb(); \
6419- ACCESS_ONCE(*p) = (v); \
6420+ ACCESS_ONCE_RW(*p) = (v); \
6421 } while (0)
6422
6423 #define smp_load_acquire(p) \
6424diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6425index b4db69f..8f3b093 100644
6426--- a/arch/mips/include/asm/cache.h
6427+++ b/arch/mips/include/asm/cache.h
6428@@ -9,10 +9,11 @@
6429 #ifndef _ASM_CACHE_H
6430 #define _ASM_CACHE_H
6431
6432+#include <linux/const.h>
6433 #include <kmalloc.h>
6434
6435 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6436-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6437+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6438
6439 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6440 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6441diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6442index f19e890..a4f8177 100644
6443--- a/arch/mips/include/asm/elf.h
6444+++ b/arch/mips/include/asm/elf.h
6445@@ -417,6 +417,13 @@ extern const char *__elf_platform;
6446 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6447 #endif
6448
6449+#ifdef CONFIG_PAX_ASLR
6450+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6451+
6452+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6453+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6454+#endif
6455+
6456 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6457 struct linux_binprm;
6458 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6459diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6460index c1f6afa..38cc6e9 100644
6461--- a/arch/mips/include/asm/exec.h
6462+++ b/arch/mips/include/asm/exec.h
6463@@ -12,6 +12,6 @@
6464 #ifndef _ASM_EXEC_H
6465 #define _ASM_EXEC_H
6466
6467-extern unsigned long arch_align_stack(unsigned long sp);
6468+#define arch_align_stack(x) ((x) & ~0xfUL)
6469
6470 #endif /* _ASM_EXEC_H */
6471diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6472index 9e8ef59..1139d6b 100644
6473--- a/arch/mips/include/asm/hw_irq.h
6474+++ b/arch/mips/include/asm/hw_irq.h
6475@@ -10,7 +10,7 @@
6476
6477 #include <linux/atomic.h>
6478
6479-extern atomic_t irq_err_count;
6480+extern atomic_unchecked_t irq_err_count;
6481
6482 /*
6483 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6484diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6485index 8feaed6..1bd8a64 100644
6486--- a/arch/mips/include/asm/local.h
6487+++ b/arch/mips/include/asm/local.h
6488@@ -13,15 +13,25 @@ typedef struct
6489 atomic_long_t a;
6490 } local_t;
6491
6492+typedef struct {
6493+ atomic_long_unchecked_t a;
6494+} local_unchecked_t;
6495+
6496 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6497
6498 #define local_read(l) atomic_long_read(&(l)->a)
6499+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6500 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6501+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6502
6503 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6504+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6505 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6506+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6507 #define local_inc(l) atomic_long_inc(&(l)->a)
6508+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6509 #define local_dec(l) atomic_long_dec(&(l)->a)
6510+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6511
6512 /*
6513 * Same as above, but return the result value
6514@@ -71,6 +81,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6515 return result;
6516 }
6517
6518+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6519+{
6520+ unsigned long result;
6521+
6522+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6523+ unsigned long temp;
6524+
6525+ __asm__ __volatile__(
6526+ " .set mips3 \n"
6527+ "1:" __LL "%1, %2 # local_add_return \n"
6528+ " addu %0, %1, %3 \n"
6529+ __SC "%0, %2 \n"
6530+ " beqzl %0, 1b \n"
6531+ " addu %0, %1, %3 \n"
6532+ " .set mips0 \n"
6533+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6534+ : "Ir" (i), "m" (l->a.counter)
6535+ : "memory");
6536+ } else if (kernel_uses_llsc) {
6537+ unsigned long temp;
6538+
6539+ __asm__ __volatile__(
6540+ " .set mips3 \n"
6541+ "1:" __LL "%1, %2 # local_add_return \n"
6542+ " addu %0, %1, %3 \n"
6543+ __SC "%0, %2 \n"
6544+ " beqz %0, 1b \n"
6545+ " addu %0, %1, %3 \n"
6546+ " .set mips0 \n"
6547+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6548+ : "Ir" (i), "m" (l->a.counter)
6549+ : "memory");
6550+ } else {
6551+ unsigned long flags;
6552+
6553+ local_irq_save(flags);
6554+ result = l->a.counter;
6555+ result += i;
6556+ l->a.counter = result;
6557+ local_irq_restore(flags);
6558+ }
6559+
6560+ return result;
6561+}
6562+
6563 static __inline__ long local_sub_return(long i, local_t * l)
6564 {
6565 unsigned long result;
6566@@ -118,6 +173,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6567
6568 #define local_cmpxchg(l, o, n) \
6569 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6570+#define local_cmpxchg_unchecked(l, o, n) \
6571+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6572 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6573
6574 /**
6575diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6576index 89dd7fe..a123c97 100644
6577--- a/arch/mips/include/asm/page.h
6578+++ b/arch/mips/include/asm/page.h
6579@@ -118,7 +118,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6580 #ifdef CONFIG_CPU_MIPS32
6581 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6582 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6583- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6584+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6585 #else
6586 typedef struct { unsigned long long pte; } pte_t;
6587 #define pte_val(x) ((x).pte)
6588diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6589index b336037..5b874cc 100644
6590--- a/arch/mips/include/asm/pgalloc.h
6591+++ b/arch/mips/include/asm/pgalloc.h
6592@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6593 {
6594 set_pud(pud, __pud((unsigned long)pmd));
6595 }
6596+
6597+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6598+{
6599+ pud_populate(mm, pud, pmd);
6600+}
6601 #endif
6602
6603 /*
6604diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6605index 70f6e7f..11f4ada 100644
6606--- a/arch/mips/include/asm/pgtable.h
6607+++ b/arch/mips/include/asm/pgtable.h
6608@@ -20,6 +20,9 @@
6609 #include <asm/io.h>
6610 #include <asm/pgtable-bits.h>
6611
6612+#define ktla_ktva(addr) (addr)
6613+#define ktva_ktla(addr) (addr)
6614+
6615 struct mm_struct;
6616 struct vm_area_struct;
6617
6618diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6619index 9c0014e..5101ef5 100644
6620--- a/arch/mips/include/asm/thread_info.h
6621+++ b/arch/mips/include/asm/thread_info.h
6622@@ -100,6 +100,9 @@ static inline struct thread_info *current_thread_info(void)
6623 #define TIF_SECCOMP 4 /* secure computing */
6624 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6625 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6626+/* li takes a 32bit immediate */
6627+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6628+
6629 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6630 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6631 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6632@@ -135,14 +138,16 @@ static inline struct thread_info *current_thread_info(void)
6633 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6634 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6635 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6636+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6637
6638 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6639 _TIF_SYSCALL_AUDIT | \
6640- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6641+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6642+ _TIF_GRSEC_SETXID)
6643
6644 /* work to do in syscall_trace_leave() */
6645 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6646- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6647+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6648
6649 /* work to do on interrupt/exception return */
6650 #define _TIF_WORK_MASK \
6651@@ -150,7 +155,7 @@ static inline struct thread_info *current_thread_info(void)
6652 /* work to do on any return to u-space */
6653 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6654 _TIF_WORK_SYSCALL_EXIT | \
6655- _TIF_SYSCALL_TRACEPOINT)
6656+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6657
6658 /*
6659 * We stash processor id into a COP0 register to retrieve it fast
6660diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6661index bf8b324..cec5705 100644
6662--- a/arch/mips/include/asm/uaccess.h
6663+++ b/arch/mips/include/asm/uaccess.h
6664@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6665 __ok == 0; \
6666 })
6667
6668+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6669 #define access_ok(type, addr, size) \
6670 likely(__access_ok((addr), (size), __access_mask))
6671
6672diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6673index 1188e00..41cf144 100644
6674--- a/arch/mips/kernel/binfmt_elfn32.c
6675+++ b/arch/mips/kernel/binfmt_elfn32.c
6676@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6677 #undef ELF_ET_DYN_BASE
6678 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6679
6680+#ifdef CONFIG_PAX_ASLR
6681+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6682+
6683+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6684+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6685+#endif
6686+
6687 #include <asm/processor.h>
6688 #include <linux/module.h>
6689 #include <linux/elfcore.h>
6690diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6691index 9287678..f870e47 100644
6692--- a/arch/mips/kernel/binfmt_elfo32.c
6693+++ b/arch/mips/kernel/binfmt_elfo32.c
6694@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6695 #undef ELF_ET_DYN_BASE
6696 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6697
6698+#ifdef CONFIG_PAX_ASLR
6699+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6700+
6701+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6702+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6703+#endif
6704+
6705 #include <asm/processor.h>
6706
6707 #include <linux/module.h>
6708diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6709index a74ec3a..4f06f18 100644
6710--- a/arch/mips/kernel/i8259.c
6711+++ b/arch/mips/kernel/i8259.c
6712@@ -202,7 +202,7 @@ spurious_8259A_irq:
6713 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6714 spurious_irq_mask |= irqmask;
6715 }
6716- atomic_inc(&irq_err_count);
6717+ atomic_inc_unchecked(&irq_err_count);
6718 /*
6719 * Theoretically we do not have to handle this IRQ,
6720 * but in Linux this does not cause problems and is
6721diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6722index 44a1f79..2bd6aa3 100644
6723--- a/arch/mips/kernel/irq-gt641xx.c
6724+++ b/arch/mips/kernel/irq-gt641xx.c
6725@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6726 }
6727 }
6728
6729- atomic_inc(&irq_err_count);
6730+ atomic_inc_unchecked(&irq_err_count);
6731 }
6732
6733 void __init gt641xx_irq_init(void)
6734diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6735index 3c8a18a..b4929b6 100644
6736--- a/arch/mips/kernel/irq.c
6737+++ b/arch/mips/kernel/irq.c
6738@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6739 printk("unexpected IRQ # %d\n", irq);
6740 }
6741
6742-atomic_t irq_err_count;
6743+atomic_unchecked_t irq_err_count;
6744
6745 int arch_show_interrupts(struct seq_file *p, int prec)
6746 {
6747- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6748+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6749 return 0;
6750 }
6751
6752 asmlinkage void spurious_interrupt(void)
6753 {
6754- atomic_inc(&irq_err_count);
6755+ atomic_inc_unchecked(&irq_err_count);
6756 }
6757
6758 void __init init_IRQ(void)
6759@@ -110,6 +110,8 @@ void __init init_IRQ(void)
6760 }
6761
6762 #ifdef CONFIG_DEBUG_STACKOVERFLOW
6763+
6764+extern void gr_handle_kernel_exploit(void);
6765 static inline void check_stack_overflow(void)
6766 {
6767 unsigned long sp;
6768@@ -125,6 +127,7 @@ static inline void check_stack_overflow(void)
6769 printk("do_IRQ: stack overflow: %ld\n",
6770 sp - sizeof(struct thread_info));
6771 dump_stack();
6772+ gr_handle_kernel_exploit();
6773 }
6774 }
6775 #else
6776diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6777index 0614717..002fa43 100644
6778--- a/arch/mips/kernel/pm-cps.c
6779+++ b/arch/mips/kernel/pm-cps.c
6780@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6781 nc_core_ready_count = nc_addr;
6782
6783 /* Ensure ready_count is zero-initialised before the assembly runs */
6784- ACCESS_ONCE(*nc_core_ready_count) = 0;
6785+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6786 coupled_barrier(&per_cpu(pm_barrier, core), online);
6787
6788 /* Run the generated entry code */
6789diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6790index f2975d4..f61d355 100644
6791--- a/arch/mips/kernel/process.c
6792+++ b/arch/mips/kernel/process.c
6793@@ -541,18 +541,6 @@ out:
6794 return pc;
6795 }
6796
6797-/*
6798- * Don't forget that the stack pointer must be aligned on a 8 bytes
6799- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6800- */
6801-unsigned long arch_align_stack(unsigned long sp)
6802-{
6803- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6804- sp -= get_random_int() & ~PAGE_MASK;
6805-
6806- return sp & ALMASK;
6807-}
6808-
6809 static void arch_dump_stack(void *info)
6810 {
6811 struct pt_regs *regs;
6812diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6813index e933a30..0d02625 100644
6814--- a/arch/mips/kernel/ptrace.c
6815+++ b/arch/mips/kernel/ptrace.c
6816@@ -785,6 +785,10 @@ long arch_ptrace(struct task_struct *child, long request,
6817 return ret;
6818 }
6819
6820+#ifdef CONFIG_GRKERNSEC_SETXID
6821+extern void gr_delayed_cred_worker(void);
6822+#endif
6823+
6824 /*
6825 * Notification of system call entry/exit
6826 * - triggered by current->work.syscall_trace
6827@@ -803,6 +807,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6828 tracehook_report_syscall_entry(regs))
6829 ret = -1;
6830
6831+#ifdef CONFIG_GRKERNSEC_SETXID
6832+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6833+ gr_delayed_cred_worker();
6834+#endif
6835+
6836 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6837 trace_sys_enter(regs, regs->regs[2]);
6838
6839diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6840index 2242bdd..b284048 100644
6841--- a/arch/mips/kernel/sync-r4k.c
6842+++ b/arch/mips/kernel/sync-r4k.c
6843@@ -18,8 +18,8 @@
6844 #include <asm/mipsregs.h>
6845
6846 static atomic_t count_start_flag = ATOMIC_INIT(0);
6847-static atomic_t count_count_start = ATOMIC_INIT(0);
6848-static atomic_t count_count_stop = ATOMIC_INIT(0);
6849+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6850+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6851 static atomic_t count_reference = ATOMIC_INIT(0);
6852
6853 #define COUNTON 100
6854@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6855
6856 for (i = 0; i < NR_LOOPS; i++) {
6857 /* slaves loop on '!= 2' */
6858- while (atomic_read(&count_count_start) != 1)
6859+ while (atomic_read_unchecked(&count_count_start) != 1)
6860 mb();
6861- atomic_set(&count_count_stop, 0);
6862+ atomic_set_unchecked(&count_count_stop, 0);
6863 smp_wmb();
6864
6865 /* this lets the slaves write their count register */
6866- atomic_inc(&count_count_start);
6867+ atomic_inc_unchecked(&count_count_start);
6868
6869 /*
6870 * Everyone initialises count in the last loop:
6871@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6872 /*
6873 * Wait for all slaves to leave the synchronization point:
6874 */
6875- while (atomic_read(&count_count_stop) != 1)
6876+ while (atomic_read_unchecked(&count_count_stop) != 1)
6877 mb();
6878- atomic_set(&count_count_start, 0);
6879+ atomic_set_unchecked(&count_count_start, 0);
6880 smp_wmb();
6881- atomic_inc(&count_count_stop);
6882+ atomic_inc_unchecked(&count_count_stop);
6883 }
6884 /* Arrange for an interrupt in a short while */
6885 write_c0_compare(read_c0_count() + COUNTON);
6886@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6887 initcount = atomic_read(&count_reference);
6888
6889 for (i = 0; i < NR_LOOPS; i++) {
6890- atomic_inc(&count_count_start);
6891- while (atomic_read(&count_count_start) != 2)
6892+ atomic_inc_unchecked(&count_count_start);
6893+ while (atomic_read_unchecked(&count_count_start) != 2)
6894 mb();
6895
6896 /*
6897@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6898 if (i == NR_LOOPS-1)
6899 write_c0_count(initcount);
6900
6901- atomic_inc(&count_count_stop);
6902- while (atomic_read(&count_count_stop) != 2)
6903+ atomic_inc_unchecked(&count_count_stop);
6904+ while (atomic_read_unchecked(&count_count_stop) != 2)
6905 mb();
6906 }
6907 /* Arrange for an interrupt in a short while */
6908diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6909index 5f5f44e..cf10625 100644
6910--- a/arch/mips/kernel/traps.c
6911+++ b/arch/mips/kernel/traps.c
6912@@ -696,7 +696,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6913 siginfo_t info;
6914
6915 prev_state = exception_enter();
6916- die_if_kernel("Integer overflow", regs);
6917+ if (unlikely(!user_mode(regs))) {
6918+
6919+#ifdef CONFIG_PAX_REFCOUNT
6920+ if (fixup_exception(regs)) {
6921+ pax_report_refcount_overflow(regs);
6922+ exception_exit(prev_state);
6923+ return;
6924+ }
6925+#endif
6926+
6927+ die("Integer overflow", regs);
6928+ }
6929
6930 info.si_code = FPE_INTOVF;
6931 info.si_signo = SIGFPE;
6932diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6933index 52f205a..335927c 100644
6934--- a/arch/mips/kvm/mips.c
6935+++ b/arch/mips/kvm/mips.c
6936@@ -1013,7 +1013,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6937 return r;
6938 }
6939
6940-int kvm_arch_init(void *opaque)
6941+int kvm_arch_init(const void *opaque)
6942 {
6943 if (kvm_mips_callbacks) {
6944 kvm_err("kvm: module already exists\n");
6945diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6946index 7ff8637..6004edb 100644
6947--- a/arch/mips/mm/fault.c
6948+++ b/arch/mips/mm/fault.c
6949@@ -31,6 +31,23 @@
6950
6951 int show_unhandled_signals = 1;
6952
6953+#ifdef CONFIG_PAX_PAGEEXEC
6954+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6955+{
6956+ unsigned long i;
6957+
6958+ printk(KERN_ERR "PAX: bytes at PC: ");
6959+ for (i = 0; i < 5; i++) {
6960+ unsigned int c;
6961+ if (get_user(c, (unsigned int *)pc+i))
6962+ printk(KERN_CONT "???????? ");
6963+ else
6964+ printk(KERN_CONT "%08x ", c);
6965+ }
6966+ printk("\n");
6967+}
6968+#endif
6969+
6970 /*
6971 * This routine handles page faults. It determines the address,
6972 * and the problem, and then passes it off to one of the appropriate
6973@@ -206,6 +223,14 @@ bad_area:
6974 bad_area_nosemaphore:
6975 /* User mode accesses just cause a SIGSEGV */
6976 if (user_mode(regs)) {
6977+
6978+#ifdef CONFIG_PAX_PAGEEXEC
6979+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6980+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6981+ do_group_exit(SIGKILL);
6982+ }
6983+#endif
6984+
6985 tsk->thread.cp0_badvaddr = address;
6986 tsk->thread.error_code = write;
6987 if (show_unhandled_signals &&
6988diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6989index 5c81fdd..db158d3 100644
6990--- a/arch/mips/mm/mmap.c
6991+++ b/arch/mips/mm/mmap.c
6992@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6993 struct vm_area_struct *vma;
6994 unsigned long addr = addr0;
6995 int do_color_align;
6996+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6997 struct vm_unmapped_area_info info;
6998
6999 if (unlikely(len > TASK_SIZE))
7000@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7001 do_color_align = 1;
7002
7003 /* requesting a specific address */
7004+
7005+#ifdef CONFIG_PAX_RANDMMAP
7006+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
7007+#endif
7008+
7009 if (addr) {
7010 if (do_color_align)
7011 addr = COLOUR_ALIGN(addr, pgoff);
7012@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
7013 addr = PAGE_ALIGN(addr);
7014
7015 vma = find_vma(mm, addr);
7016- if (TASK_SIZE - len >= addr &&
7017- (!vma || addr + len <= vma->vm_start))
7018+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
7019 return addr;
7020 }
7021
7022 info.length = len;
7023 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
7024 info.align_offset = pgoff << PAGE_SHIFT;
7025+ info.threadstack_offset = offset;
7026
7027 if (dir == DOWN) {
7028 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
7029@@ -160,45 +166,34 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7030 {
7031 unsigned long random_factor = 0UL;
7032
7033+#ifdef CONFIG_PAX_RANDMMAP
7034+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7035+#endif
7036+
7037 if (current->flags & PF_RANDOMIZE)
7038 random_factor = arch_mmap_rnd();
7039
7040 if (mmap_is_legacy()) {
7041 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
7042+
7043+#ifdef CONFIG_PAX_RANDMMAP
7044+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7045+ mm->mmap_base += mm->delta_mmap;
7046+#endif
7047+
7048 mm->get_unmapped_area = arch_get_unmapped_area;
7049 } else {
7050 mm->mmap_base = mmap_base(random_factor);
7051+
7052+#ifdef CONFIG_PAX_RANDMMAP
7053+ if (mm->pax_flags & MF_PAX_RANDMMAP)
7054+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7055+#endif
7056+
7057 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
7058 }
7059 }
7060
7061-static inline unsigned long brk_rnd(void)
7062-{
7063- unsigned long rnd = get_random_int();
7064-
7065- rnd = rnd << PAGE_SHIFT;
7066- /* 8MB for 32bit, 256MB for 64bit */
7067- if (TASK_IS_32BIT_ADDR)
7068- rnd = rnd & 0x7ffffful;
7069- else
7070- rnd = rnd & 0xffffffful;
7071-
7072- return rnd;
7073-}
7074-
7075-unsigned long arch_randomize_brk(struct mm_struct *mm)
7076-{
7077- unsigned long base = mm->brk;
7078- unsigned long ret;
7079-
7080- ret = PAGE_ALIGN(base + brk_rnd());
7081-
7082- if (ret < mm->brk)
7083- return mm->brk;
7084-
7085- return ret;
7086-}
7087-
7088 int __virt_addr_valid(const volatile void *kaddr)
7089 {
7090 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7091diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7092index a2358b4..7cead4f 100644
7093--- a/arch/mips/sgi-ip27/ip27-nmi.c
7094+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7095@@ -187,9 +187,9 @@ void
7096 cont_nmi_dump(void)
7097 {
7098 #ifndef REAL_NMI_SIGNAL
7099- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7100+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7101
7102- atomic_inc(&nmied_cpus);
7103+ atomic_inc_unchecked(&nmied_cpus);
7104 #endif
7105 /*
7106 * Only allow 1 cpu to proceed
7107@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7108 udelay(10000);
7109 }
7110 #else
7111- while (atomic_read(&nmied_cpus) != num_online_cpus());
7112+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7113 #endif
7114
7115 /*
7116diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7117index a046b30..6799527 100644
7118--- a/arch/mips/sni/rm200.c
7119+++ b/arch/mips/sni/rm200.c
7120@@ -270,7 +270,7 @@ spurious_8259A_irq:
7121 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7122 spurious_irq_mask |= irqmask;
7123 }
7124- atomic_inc(&irq_err_count);
7125+ atomic_inc_unchecked(&irq_err_count);
7126 /*
7127 * Theoretically we do not have to handle this IRQ,
7128 * but in Linux this does not cause problems and is
7129diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7130index 41e873b..34d33a7 100644
7131--- a/arch/mips/vr41xx/common/icu.c
7132+++ b/arch/mips/vr41xx/common/icu.c
7133@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7134
7135 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7136
7137- atomic_inc(&irq_err_count);
7138+ atomic_inc_unchecked(&irq_err_count);
7139
7140 return -1;
7141 }
7142diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7143index ae0e4ee..e8f0692 100644
7144--- a/arch/mips/vr41xx/common/irq.c
7145+++ b/arch/mips/vr41xx/common/irq.c
7146@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7147 irq_cascade_t *cascade;
7148
7149 if (irq >= NR_IRQS) {
7150- atomic_inc(&irq_err_count);
7151+ atomic_inc_unchecked(&irq_err_count);
7152 return;
7153 }
7154
7155@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7156 ret = cascade->get_irq(irq);
7157 irq = ret;
7158 if (ret < 0)
7159- atomic_inc(&irq_err_count);
7160+ atomic_inc_unchecked(&irq_err_count);
7161 else
7162 irq_dispatch(irq);
7163 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7164diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7165index 967d144..db12197 100644
7166--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7167+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7168@@ -11,12 +11,14 @@
7169 #ifndef _ASM_PROC_CACHE_H
7170 #define _ASM_PROC_CACHE_H
7171
7172+#include <linux/const.h>
7173+
7174 /* L1 cache */
7175
7176 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7177 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7178-#define L1_CACHE_BYTES 16 /* bytes per entry */
7179 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7180+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7181 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7182
7183 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7184diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7185index bcb5df2..84fabd2 100644
7186--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7187+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7188@@ -16,13 +16,15 @@
7189 #ifndef _ASM_PROC_CACHE_H
7190 #define _ASM_PROC_CACHE_H
7191
7192+#include <linux/const.h>
7193+
7194 /*
7195 * L1 cache
7196 */
7197 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7198 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7199-#define L1_CACHE_BYTES 32 /* bytes per entry */
7200 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7201+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7202 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7203
7204 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7205diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7206index 4ce7a01..449202a 100644
7207--- a/arch/openrisc/include/asm/cache.h
7208+++ b/arch/openrisc/include/asm/cache.h
7209@@ -19,11 +19,13 @@
7210 #ifndef __ASM_OPENRISC_CACHE_H
7211 #define __ASM_OPENRISC_CACHE_H
7212
7213+#include <linux/const.h>
7214+
7215 /* FIXME: How can we replace these with values from the CPU...
7216 * they shouldn't be hard-coded!
7217 */
7218
7219-#define L1_CACHE_BYTES 16
7220 #define L1_CACHE_SHIFT 4
7221+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7222
7223 #endif /* __ASM_OPENRISC_CACHE_H */
7224diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7225index 226f8ca9..9d9b87d 100644
7226--- a/arch/parisc/include/asm/atomic.h
7227+++ b/arch/parisc/include/asm/atomic.h
7228@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7229 return dec;
7230 }
7231
7232+#define atomic64_read_unchecked(v) atomic64_read(v)
7233+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7234+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7235+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7236+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7237+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7238+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7239+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7240+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7241+
7242 #endif /* !CONFIG_64BIT */
7243
7244
7245diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7246index 47f11c7..3420df2 100644
7247--- a/arch/parisc/include/asm/cache.h
7248+++ b/arch/parisc/include/asm/cache.h
7249@@ -5,6 +5,7 @@
7250 #ifndef __ARCH_PARISC_CACHE_H
7251 #define __ARCH_PARISC_CACHE_H
7252
7253+#include <linux/const.h>
7254
7255 /*
7256 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7257@@ -15,13 +16,13 @@
7258 * just ruin performance.
7259 */
7260 #ifdef CONFIG_PA20
7261-#define L1_CACHE_BYTES 64
7262 #define L1_CACHE_SHIFT 6
7263 #else
7264-#define L1_CACHE_BYTES 32
7265 #define L1_CACHE_SHIFT 5
7266 #endif
7267
7268+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7269+
7270 #ifndef __ASSEMBLY__
7271
7272 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7273diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7274index 78c9fd3..42fa66a 100644
7275--- a/arch/parisc/include/asm/elf.h
7276+++ b/arch/parisc/include/asm/elf.h
7277@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7278
7279 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7280
7281+#ifdef CONFIG_PAX_ASLR
7282+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7283+
7284+#define PAX_DELTA_MMAP_LEN 16
7285+#define PAX_DELTA_STACK_LEN 16
7286+#endif
7287+
7288 /* This yields a mask that user programs can use to figure out what
7289 instruction set this CPU supports. This could be done in user space,
7290 but it's not easy, and we've already done it here. */
7291diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7292index 3edbb9f..08fef28 100644
7293--- a/arch/parisc/include/asm/pgalloc.h
7294+++ b/arch/parisc/include/asm/pgalloc.h
7295@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7296 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7297 }
7298
7299+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7300+{
7301+ pgd_populate(mm, pgd, pmd);
7302+}
7303+
7304 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7305 {
7306 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7307@@ -97,6 +102,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7308 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7309 #define pmd_free(mm, x) do { } while (0)
7310 #define pgd_populate(mm, pmd, pte) BUG()
7311+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7312
7313 #endif
7314
7315diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7316index f93c4a4..cfd5663 100644
7317--- a/arch/parisc/include/asm/pgtable.h
7318+++ b/arch/parisc/include/asm/pgtable.h
7319@@ -231,6 +231,17 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr)
7320 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7321 #define PAGE_COPY PAGE_EXECREAD
7322 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7323+
7324+#ifdef CONFIG_PAX_PAGEEXEC
7325+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7326+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7327+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7328+#else
7329+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7330+# define PAGE_COPY_NOEXEC PAGE_COPY
7331+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7332+#endif
7333+
7334 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7335 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7336 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7337diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7338index 0abdd4c..1af92f0 100644
7339--- a/arch/parisc/include/asm/uaccess.h
7340+++ b/arch/parisc/include/asm/uaccess.h
7341@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7342 const void __user *from,
7343 unsigned long n)
7344 {
7345- int sz = __compiletime_object_size(to);
7346+ size_t sz = __compiletime_object_size(to);
7347 int ret = -EFAULT;
7348
7349- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7350+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7351 ret = __copy_from_user(to, from, n);
7352 else
7353 copy_from_user_overflow();
7354diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7355index 3c63a82..b1d6ee9 100644
7356--- a/arch/parisc/kernel/module.c
7357+++ b/arch/parisc/kernel/module.c
7358@@ -98,16 +98,38 @@
7359
7360 /* three functions to determine where in the module core
7361 * or init pieces the location is */
7362+static inline int in_init_rx(struct module *me, void *loc)
7363+{
7364+ return (loc >= me->module_init_rx &&
7365+ loc < (me->module_init_rx + me->init_size_rx));
7366+}
7367+
7368+static inline int in_init_rw(struct module *me, void *loc)
7369+{
7370+ return (loc >= me->module_init_rw &&
7371+ loc < (me->module_init_rw + me->init_size_rw));
7372+}
7373+
7374 static inline int in_init(struct module *me, void *loc)
7375 {
7376- return (loc >= me->module_init &&
7377- loc <= (me->module_init + me->init_size));
7378+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7379+}
7380+
7381+static inline int in_core_rx(struct module *me, void *loc)
7382+{
7383+ return (loc >= me->module_core_rx &&
7384+ loc < (me->module_core_rx + me->core_size_rx));
7385+}
7386+
7387+static inline int in_core_rw(struct module *me, void *loc)
7388+{
7389+ return (loc >= me->module_core_rw &&
7390+ loc < (me->module_core_rw + me->core_size_rw));
7391 }
7392
7393 static inline int in_core(struct module *me, void *loc)
7394 {
7395- return (loc >= me->module_core &&
7396- loc <= (me->module_core + me->core_size));
7397+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7398 }
7399
7400 static inline int in_local(struct module *me, void *loc)
7401@@ -367,13 +389,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7402 }
7403
7404 /* align things a bit */
7405- me->core_size = ALIGN(me->core_size, 16);
7406- me->arch.got_offset = me->core_size;
7407- me->core_size += gots * sizeof(struct got_entry);
7408+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7409+ me->arch.got_offset = me->core_size_rw;
7410+ me->core_size_rw += gots * sizeof(struct got_entry);
7411
7412- me->core_size = ALIGN(me->core_size, 16);
7413- me->arch.fdesc_offset = me->core_size;
7414- me->core_size += fdescs * sizeof(Elf_Fdesc);
7415+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7416+ me->arch.fdesc_offset = me->core_size_rw;
7417+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7418
7419 me->arch.got_max = gots;
7420 me->arch.fdesc_max = fdescs;
7421@@ -391,7 +413,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7422
7423 BUG_ON(value == 0);
7424
7425- got = me->module_core + me->arch.got_offset;
7426+ got = me->module_core_rw + me->arch.got_offset;
7427 for (i = 0; got[i].addr; i++)
7428 if (got[i].addr == value)
7429 goto out;
7430@@ -409,7 +431,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7431 #ifdef CONFIG_64BIT
7432 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7433 {
7434- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7435+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7436
7437 if (!value) {
7438 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7439@@ -427,7 +449,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7440
7441 /* Create new one */
7442 fdesc->addr = value;
7443- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7444+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7445 return (Elf_Addr)fdesc;
7446 }
7447 #endif /* CONFIG_64BIT */
7448@@ -839,7 +861,7 @@ register_unwind_table(struct module *me,
7449
7450 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7451 end = table + sechdrs[me->arch.unwind_section].sh_size;
7452- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7453+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7454
7455 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7456 me->arch.unwind_section, table, end, gp);
7457diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7458index 5aba01a..47cdd5a 100644
7459--- a/arch/parisc/kernel/sys_parisc.c
7460+++ b/arch/parisc/kernel/sys_parisc.c
7461@@ -92,6 +92,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7462 unsigned long task_size = TASK_SIZE;
7463 int do_color_align, last_mmap;
7464 struct vm_unmapped_area_info info;
7465+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7466
7467 if (len > task_size)
7468 return -ENOMEM;
7469@@ -109,6 +110,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7470 goto found_addr;
7471 }
7472
7473+#ifdef CONFIG_PAX_RANDMMAP
7474+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7475+#endif
7476+
7477 if (addr) {
7478 if (do_color_align && last_mmap)
7479 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7480@@ -127,6 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7481 info.high_limit = mmap_upper_limit();
7482 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7483 info.align_offset = shared_align_offset(last_mmap, pgoff);
7484+ info.threadstack_offset = offset;
7485 addr = vm_unmapped_area(&info);
7486
7487 found_addr:
7488@@ -146,6 +152,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7489 unsigned long addr = addr0;
7490 int do_color_align, last_mmap;
7491 struct vm_unmapped_area_info info;
7492+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7493
7494 #ifdef CONFIG_64BIT
7495 /* This should only ever run for 32-bit processes. */
7496@@ -170,6 +177,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7497 }
7498
7499 /* requesting a specific address */
7500+#ifdef CONFIG_PAX_RANDMMAP
7501+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7502+#endif
7503+
7504 if (addr) {
7505 if (do_color_align && last_mmap)
7506 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7507@@ -187,6 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7508 info.high_limit = mm->mmap_base;
7509 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7510 info.align_offset = shared_align_offset(last_mmap, pgoff);
7511+ info.threadstack_offset = offset;
7512 addr = vm_unmapped_area(&info);
7513 if (!(addr & ~PAGE_MASK))
7514 goto found_addr;
7515@@ -252,6 +264,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7516 mm->mmap_legacy_base = mmap_legacy_base();
7517 mm->mmap_base = mmap_upper_limit();
7518
7519+#ifdef CONFIG_PAX_RANDMMAP
7520+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7521+ mm->mmap_legacy_base += mm->delta_mmap;
7522+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7523+ }
7524+#endif
7525+
7526 if (mmap_is_legacy()) {
7527 mm->mmap_base = mm->mmap_legacy_base;
7528 mm->get_unmapped_area = arch_get_unmapped_area;
7529diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7530index 7f67c4c..d85c11d 100644
7531--- a/arch/parisc/kernel/traps.c
7532+++ b/arch/parisc/kernel/traps.c
7533@@ -722,9 +722,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7534
7535 down_read(&current->mm->mmap_sem);
7536 vma = find_vma(current->mm,regs->iaoq[0]);
7537- if (vma && (regs->iaoq[0] >= vma->vm_start)
7538- && (vma->vm_flags & VM_EXEC)) {
7539-
7540+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7541 fault_address = regs->iaoq[0];
7542 fault_space = regs->iasq[0];
7543
7544diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7545index e5120e6..8ddb5cc 100644
7546--- a/arch/parisc/mm/fault.c
7547+++ b/arch/parisc/mm/fault.c
7548@@ -15,6 +15,7 @@
7549 #include <linux/sched.h>
7550 #include <linux/interrupt.h>
7551 #include <linux/module.h>
7552+#include <linux/unistd.h>
7553
7554 #include <asm/uaccess.h>
7555 #include <asm/traps.h>
7556@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7557 static unsigned long
7558 parisc_acctyp(unsigned long code, unsigned int inst)
7559 {
7560- if (code == 6 || code == 16)
7561+ if (code == 6 || code == 7 || code == 16)
7562 return VM_EXEC;
7563
7564 switch (inst & 0xf0000000) {
7565@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7566 }
7567 #endif
7568
7569+#ifdef CONFIG_PAX_PAGEEXEC
7570+/*
7571+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7572+ *
7573+ * returns 1 when task should be killed
7574+ * 2 when rt_sigreturn trampoline was detected
7575+ * 3 when unpatched PLT trampoline was detected
7576+ */
7577+static int pax_handle_fetch_fault(struct pt_regs *regs)
7578+{
7579+
7580+#ifdef CONFIG_PAX_EMUPLT
7581+ int err;
7582+
7583+ do { /* PaX: unpatched PLT emulation */
7584+ unsigned int bl, depwi;
7585+
7586+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7587+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7588+
7589+ if (err)
7590+ break;
7591+
7592+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7593+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7594+
7595+ err = get_user(ldw, (unsigned int *)addr);
7596+ err |= get_user(bv, (unsigned int *)(addr+4));
7597+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7598+
7599+ if (err)
7600+ break;
7601+
7602+ if (ldw == 0x0E801096U &&
7603+ bv == 0xEAC0C000U &&
7604+ ldw2 == 0x0E881095U)
7605+ {
7606+ unsigned int resolver, map;
7607+
7608+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7609+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7610+ if (err)
7611+ break;
7612+
7613+ regs->gr[20] = instruction_pointer(regs)+8;
7614+ regs->gr[21] = map;
7615+ regs->gr[22] = resolver;
7616+ regs->iaoq[0] = resolver | 3UL;
7617+ regs->iaoq[1] = regs->iaoq[0] + 4;
7618+ return 3;
7619+ }
7620+ }
7621+ } while (0);
7622+#endif
7623+
7624+#ifdef CONFIG_PAX_EMUTRAMP
7625+
7626+#ifndef CONFIG_PAX_EMUSIGRT
7627+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7628+ return 1;
7629+#endif
7630+
7631+ do { /* PaX: rt_sigreturn emulation */
7632+ unsigned int ldi1, ldi2, bel, nop;
7633+
7634+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7635+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7636+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7637+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7638+
7639+ if (err)
7640+ break;
7641+
7642+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7643+ ldi2 == 0x3414015AU &&
7644+ bel == 0xE4008200U &&
7645+ nop == 0x08000240U)
7646+ {
7647+ regs->gr[25] = (ldi1 & 2) >> 1;
7648+ regs->gr[20] = __NR_rt_sigreturn;
7649+ regs->gr[31] = regs->iaoq[1] + 16;
7650+ regs->sr[0] = regs->iasq[1];
7651+ regs->iaoq[0] = 0x100UL;
7652+ regs->iaoq[1] = regs->iaoq[0] + 4;
7653+ regs->iasq[0] = regs->sr[2];
7654+ regs->iasq[1] = regs->sr[2];
7655+ return 2;
7656+ }
7657+ } while (0);
7658+#endif
7659+
7660+ return 1;
7661+}
7662+
7663+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7664+{
7665+ unsigned long i;
7666+
7667+ printk(KERN_ERR "PAX: bytes at PC: ");
7668+ for (i = 0; i < 5; i++) {
7669+ unsigned int c;
7670+ if (get_user(c, (unsigned int *)pc+i))
7671+ printk(KERN_CONT "???????? ");
7672+ else
7673+ printk(KERN_CONT "%08x ", c);
7674+ }
7675+ printk("\n");
7676+}
7677+#endif
7678+
7679 int fixup_exception(struct pt_regs *regs)
7680 {
7681 const struct exception_table_entry *fix;
7682@@ -234,8 +345,33 @@ retry:
7683
7684 good_area:
7685
7686- if ((vma->vm_flags & acc_type) != acc_type)
7687+ if ((vma->vm_flags & acc_type) != acc_type) {
7688+
7689+#ifdef CONFIG_PAX_PAGEEXEC
7690+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7691+ (address & ~3UL) == instruction_pointer(regs))
7692+ {
7693+ up_read(&mm->mmap_sem);
7694+ switch (pax_handle_fetch_fault(regs)) {
7695+
7696+#ifdef CONFIG_PAX_EMUPLT
7697+ case 3:
7698+ return;
7699+#endif
7700+
7701+#ifdef CONFIG_PAX_EMUTRAMP
7702+ case 2:
7703+ return;
7704+#endif
7705+
7706+ }
7707+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7708+ do_group_exit(SIGKILL);
7709+ }
7710+#endif
7711+
7712 goto bad_area;
7713+ }
7714
7715 /*
7716 * If for any reason at all we couldn't handle the fault, make
7717diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7718index 190cc48..48439ce 100644
7719--- a/arch/powerpc/Kconfig
7720+++ b/arch/powerpc/Kconfig
7721@@ -413,6 +413,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7722 config KEXEC
7723 bool "kexec system call"
7724 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7725+ depends on !GRKERNSEC_KMEM
7726 help
7727 kexec is a system call that implements the ability to shutdown your
7728 current kernel, and to start another kernel. It is like a reboot
7729diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7730index 512d278..d31fadd 100644
7731--- a/arch/powerpc/include/asm/atomic.h
7732+++ b/arch/powerpc/include/asm/atomic.h
7733@@ -12,6 +12,11 @@
7734
7735 #define ATOMIC_INIT(i) { (i) }
7736
7737+#define _ASM_EXTABLE(from, to) \
7738+" .section __ex_table,\"a\"\n" \
7739+ PPC_LONG" " #from ", " #to"\n" \
7740+" .previous\n"
7741+
7742 static __inline__ int atomic_read(const atomic_t *v)
7743 {
7744 int t;
7745@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7746 return t;
7747 }
7748
7749+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7750+{
7751+ int t;
7752+
7753+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7754+
7755+ return t;
7756+}
7757+
7758 static __inline__ void atomic_set(atomic_t *v, int i)
7759 {
7760 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7761 }
7762
7763-#define ATOMIC_OP(op, asm_op) \
7764-static __inline__ void atomic_##op(int a, atomic_t *v) \
7765+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7766+{
7767+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7768+}
7769+
7770+#ifdef CONFIG_PAX_REFCOUNT
7771+#define __REFCOUNT_OP(op) op##o.
7772+#define __OVERFLOW_PRE \
7773+ " mcrxr cr0\n"
7774+#define __OVERFLOW_POST \
7775+ " bf 4*cr0+so, 3f\n" \
7776+ "2: .long 0x00c00b00\n" \
7777+ "3:\n"
7778+#define __OVERFLOW_EXTABLE \
7779+ "\n4:\n"
7780+ _ASM_EXTABLE(2b, 4b)
7781+#else
7782+#define __REFCOUNT_OP(op) op
7783+#define __OVERFLOW_PRE
7784+#define __OVERFLOW_POST
7785+#define __OVERFLOW_EXTABLE
7786+#endif
7787+
7788+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7789+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7790 { \
7791 int t; \
7792 \
7793 __asm__ __volatile__( \
7794-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7795+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7796+ pre_op \
7797 #asm_op " %0,%2,%0\n" \
7798+ post_op \
7799 PPC405_ERR77(0,%3) \
7800 " stwcx. %0,0,%3 \n" \
7801 " bne- 1b\n" \
7802+ extable \
7803 : "=&r" (t), "+m" (v->counter) \
7804 : "r" (a), "r" (&v->counter) \
7805 : "cc"); \
7806 } \
7807
7808-#define ATOMIC_OP_RETURN(op, asm_op) \
7809-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7810+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7811+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7812+
7813+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7814+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7815 { \
7816 int t; \
7817 \
7818 __asm__ __volatile__( \
7819 PPC_ATOMIC_ENTRY_BARRIER \
7820-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7821+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7822+ pre_op \
7823 #asm_op " %0,%1,%0\n" \
7824+ post_op \
7825 PPC405_ERR77(0,%2) \
7826 " stwcx. %0,0,%2 \n" \
7827 " bne- 1b\n" \
7828+ extable \
7829 PPC_ATOMIC_EXIT_BARRIER \
7830 : "=&r" (t) \
7831 : "r" (a), "r" (&v->counter) \
7832@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7833 return t; \
7834 }
7835
7836+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7837+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7838+
7839 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7840
7841 ATOMIC_OPS(add, add)
7842@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7843
7844 #undef ATOMIC_OPS
7845 #undef ATOMIC_OP_RETURN
7846+#undef __ATOMIC_OP_RETURN
7847 #undef ATOMIC_OP
7848+#undef __ATOMIC_OP
7849
7850 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7851
7852-static __inline__ void atomic_inc(atomic_t *v)
7853-{
7854- int t;
7855+/*
7856+ * atomic_inc - increment atomic variable
7857+ * @v: pointer of type atomic_t
7858+ *
7859+ * Automatically increments @v by 1
7860+ */
7861+#define atomic_inc(v) atomic_add(1, (v))
7862+#define atomic_inc_return(v) atomic_add_return(1, (v))
7863
7864- __asm__ __volatile__(
7865-"1: lwarx %0,0,%2 # atomic_inc\n\
7866- addic %0,%0,1\n"
7867- PPC405_ERR77(0,%2)
7868-" stwcx. %0,0,%2 \n\
7869- bne- 1b"
7870- : "=&r" (t), "+m" (v->counter)
7871- : "r" (&v->counter)
7872- : "cc", "xer");
7873+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7874+{
7875+ atomic_add_unchecked(1, v);
7876 }
7877
7878-static __inline__ int atomic_inc_return(atomic_t *v)
7879+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7880 {
7881- int t;
7882-
7883- __asm__ __volatile__(
7884- PPC_ATOMIC_ENTRY_BARRIER
7885-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7886- addic %0,%0,1\n"
7887- PPC405_ERR77(0,%1)
7888-" stwcx. %0,0,%1 \n\
7889- bne- 1b"
7890- PPC_ATOMIC_EXIT_BARRIER
7891- : "=&r" (t)
7892- : "r" (&v->counter)
7893- : "cc", "xer", "memory");
7894-
7895- return t;
7896+ return atomic_add_return_unchecked(1, v);
7897 }
7898
7899 /*
7900@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7901 */
7902 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7903
7904-static __inline__ void atomic_dec(atomic_t *v)
7905+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7906 {
7907- int t;
7908-
7909- __asm__ __volatile__(
7910-"1: lwarx %0,0,%2 # atomic_dec\n\
7911- addic %0,%0,-1\n"
7912- PPC405_ERR77(0,%2)\
7913-" stwcx. %0,0,%2\n\
7914- bne- 1b"
7915- : "=&r" (t), "+m" (v->counter)
7916- : "r" (&v->counter)
7917- : "cc", "xer");
7918+ return atomic_add_return_unchecked(1, v) == 0;
7919 }
7920
7921-static __inline__ int atomic_dec_return(atomic_t *v)
7922+/*
7923+ * atomic_dec - decrement atomic variable
7924+ * @v: pointer of type atomic_t
7925+ *
7926+ * Atomically decrements @v by 1
7927+ */
7928+#define atomic_dec(v) atomic_sub(1, (v))
7929+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7930+
7931+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7932 {
7933- int t;
7934-
7935- __asm__ __volatile__(
7936- PPC_ATOMIC_ENTRY_BARRIER
7937-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7938- addic %0,%0,-1\n"
7939- PPC405_ERR77(0,%1)
7940-" stwcx. %0,0,%1\n\
7941- bne- 1b"
7942- PPC_ATOMIC_EXIT_BARRIER
7943- : "=&r" (t)
7944- : "r" (&v->counter)
7945- : "cc", "xer", "memory");
7946-
7947- return t;
7948+ atomic_sub_unchecked(1, v);
7949 }
7950
7951 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7952 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7953
7954+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7955+{
7956+ return cmpxchg(&(v->counter), old, new);
7957+}
7958+
7959+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7960+{
7961+ return xchg(&(v->counter), new);
7962+}
7963+
7964 /**
7965 * __atomic_add_unless - add unless the number is a given value
7966 * @v: pointer of type atomic_t
7967@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7968 PPC_ATOMIC_ENTRY_BARRIER
7969 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7970 cmpw 0,%0,%3 \n\
7971- beq- 2f \n\
7972- add %0,%2,%0 \n"
7973+ beq- 2f \n"
7974+
7975+#ifdef CONFIG_PAX_REFCOUNT
7976+" mcrxr cr0\n"
7977+" addo. %0,%2,%0\n"
7978+" bf 4*cr0+so, 4f\n"
7979+"3:.long " "0x00c00b00""\n"
7980+"4:\n"
7981+#else
7982+ "add %0,%2,%0 \n"
7983+#endif
7984+
7985 PPC405_ERR77(0,%2)
7986 " stwcx. %0,0,%1 \n\
7987 bne- 1b \n"
7988+"5:"
7989+
7990+#ifdef CONFIG_PAX_REFCOUNT
7991+ _ASM_EXTABLE(3b, 5b)
7992+#endif
7993+
7994 PPC_ATOMIC_EXIT_BARRIER
7995 " subf %0,%2,%0 \n\
7996 2:"
7997@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7998 }
7999 #define atomic_dec_if_positive atomic_dec_if_positive
8000
8001+#define smp_mb__before_atomic_dec() smp_mb()
8002+#define smp_mb__after_atomic_dec() smp_mb()
8003+#define smp_mb__before_atomic_inc() smp_mb()
8004+#define smp_mb__after_atomic_inc() smp_mb()
8005+
8006 #ifdef __powerpc64__
8007
8008 #define ATOMIC64_INIT(i) { (i) }
8009@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
8010 return t;
8011 }
8012
8013+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8014+{
8015+ long t;
8016+
8017+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
8018+
8019+ return t;
8020+}
8021+
8022 static __inline__ void atomic64_set(atomic64_t *v, long i)
8023 {
8024 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8025 }
8026
8027-#define ATOMIC64_OP(op, asm_op) \
8028-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
8029+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8030+{
8031+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8032+}
8033+
8034+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
8035+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8036 { \
8037 long t; \
8038 \
8039 __asm__ __volatile__( \
8040 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8041+ pre_op \
8042 #asm_op " %0,%2,%0\n" \
8043+ post_op \
8044 " stdcx. %0,0,%3 \n" \
8045 " bne- 1b\n" \
8046+ extable \
8047 : "=&r" (t), "+m" (v->counter) \
8048 : "r" (a), "r" (&v->counter) \
8049 : "cc"); \
8050 }
8051
8052-#define ATOMIC64_OP_RETURN(op, asm_op) \
8053-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8054+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8055+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8056+
8057+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8058+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8059 { \
8060 long t; \
8061 \
8062 __asm__ __volatile__( \
8063 PPC_ATOMIC_ENTRY_BARRIER \
8064 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8065+ pre_op \
8066 #asm_op " %0,%1,%0\n" \
8067+ post_op \
8068 " stdcx. %0,0,%2 \n" \
8069 " bne- 1b\n" \
8070+ extable \
8071 PPC_ATOMIC_EXIT_BARRIER \
8072 : "=&r" (t) \
8073 : "r" (a), "r" (&v->counter) \
8074@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8075 return t; \
8076 }
8077
8078+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8079+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8080+
8081 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8082
8083 ATOMIC64_OPS(add, add)
8084@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8085
8086 #undef ATOMIC64_OPS
8087 #undef ATOMIC64_OP_RETURN
8088+#undef __ATOMIC64_OP_RETURN
8089 #undef ATOMIC64_OP
8090+#undef __ATOMIC64_OP
8091+#undef __OVERFLOW_EXTABLE
8092+#undef __OVERFLOW_POST
8093+#undef __OVERFLOW_PRE
8094+#undef __REFCOUNT_OP
8095
8096 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8097
8098-static __inline__ void atomic64_inc(atomic64_t *v)
8099-{
8100- long t;
8101+/*
8102+ * atomic64_inc - increment atomic variable
8103+ * @v: pointer of type atomic64_t
8104+ *
8105+ * Automatically increments @v by 1
8106+ */
8107+#define atomic64_inc(v) atomic64_add(1, (v))
8108+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8109
8110- __asm__ __volatile__(
8111-"1: ldarx %0,0,%2 # atomic64_inc\n\
8112- addic %0,%0,1\n\
8113- stdcx. %0,0,%2 \n\
8114- bne- 1b"
8115- : "=&r" (t), "+m" (v->counter)
8116- : "r" (&v->counter)
8117- : "cc", "xer");
8118+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8119+{
8120+ atomic64_add_unchecked(1, v);
8121 }
8122
8123-static __inline__ long atomic64_inc_return(atomic64_t *v)
8124+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8125 {
8126- long t;
8127-
8128- __asm__ __volatile__(
8129- PPC_ATOMIC_ENTRY_BARRIER
8130-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8131- addic %0,%0,1\n\
8132- stdcx. %0,0,%1 \n\
8133- bne- 1b"
8134- PPC_ATOMIC_EXIT_BARRIER
8135- : "=&r" (t)
8136- : "r" (&v->counter)
8137- : "cc", "xer", "memory");
8138-
8139- return t;
8140+ return atomic64_add_return_unchecked(1, v);
8141 }
8142
8143 /*
8144@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8145 */
8146 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8147
8148-static __inline__ void atomic64_dec(atomic64_t *v)
8149+/*
8150+ * atomic64_dec - decrement atomic variable
8151+ * @v: pointer of type atomic64_t
8152+ *
8153+ * Atomically decrements @v by 1
8154+ */
8155+#define atomic64_dec(v) atomic64_sub(1, (v))
8156+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8157+
8158+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8159 {
8160- long t;
8161-
8162- __asm__ __volatile__(
8163-"1: ldarx %0,0,%2 # atomic64_dec\n\
8164- addic %0,%0,-1\n\
8165- stdcx. %0,0,%2\n\
8166- bne- 1b"
8167- : "=&r" (t), "+m" (v->counter)
8168- : "r" (&v->counter)
8169- : "cc", "xer");
8170-}
8171-
8172-static __inline__ long atomic64_dec_return(atomic64_t *v)
8173-{
8174- long t;
8175-
8176- __asm__ __volatile__(
8177- PPC_ATOMIC_ENTRY_BARRIER
8178-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8179- addic %0,%0,-1\n\
8180- stdcx. %0,0,%1\n\
8181- bne- 1b"
8182- PPC_ATOMIC_EXIT_BARRIER
8183- : "=&r" (t)
8184- : "r" (&v->counter)
8185- : "cc", "xer", "memory");
8186-
8187- return t;
8188+ atomic64_sub_unchecked(1, v);
8189 }
8190
8191 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8192@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8193 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8194 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8195
8196+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8197+{
8198+ return cmpxchg(&(v->counter), old, new);
8199+}
8200+
8201+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8202+{
8203+ return xchg(&(v->counter), new);
8204+}
8205+
8206 /**
8207 * atomic64_add_unless - add unless the number is a given value
8208 * @v: pointer of type atomic64_t
8209@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8210
8211 __asm__ __volatile__ (
8212 PPC_ATOMIC_ENTRY_BARRIER
8213-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8214+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8215 cmpd 0,%0,%3 \n\
8216- beq- 2f \n\
8217- add %0,%2,%0 \n"
8218+ beq- 2f \n"
8219+
8220+#ifdef CONFIG_PAX_REFCOUNT
8221+" mcrxr cr0\n"
8222+" addo. %0,%2,%0\n"
8223+" bf 4*cr0+so, 4f\n"
8224+"3:.long " "0x00c00b00""\n"
8225+"4:\n"
8226+#else
8227+ "add %0,%2,%0 \n"
8228+#endif
8229+
8230 " stdcx. %0,0,%1 \n\
8231 bne- 1b \n"
8232 PPC_ATOMIC_EXIT_BARRIER
8233+"5:"
8234+
8235+#ifdef CONFIG_PAX_REFCOUNT
8236+ _ASM_EXTABLE(3b, 5b)
8237+#endif
8238+
8239 " subf %0,%2,%0 \n\
8240 2:"
8241 : "=&r" (t)
8242diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8243index a3bf5be..e03ba81 100644
8244--- a/arch/powerpc/include/asm/barrier.h
8245+++ b/arch/powerpc/include/asm/barrier.h
8246@@ -76,7 +76,7 @@
8247 do { \
8248 compiletime_assert_atomic_type(*p); \
8249 smp_lwsync(); \
8250- ACCESS_ONCE(*p) = (v); \
8251+ ACCESS_ONCE_RW(*p) = (v); \
8252 } while (0)
8253
8254 #define smp_load_acquire(p) \
8255diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8256index 0dc42c5..b80a3a1 100644
8257--- a/arch/powerpc/include/asm/cache.h
8258+++ b/arch/powerpc/include/asm/cache.h
8259@@ -4,6 +4,7 @@
8260 #ifdef __KERNEL__
8261
8262 #include <asm/reg.h>
8263+#include <linux/const.h>
8264
8265 /* bytes per L1 cache line */
8266 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8267@@ -23,7 +24,7 @@
8268 #define L1_CACHE_SHIFT 7
8269 #endif
8270
8271-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8272+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8273
8274 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8275
8276diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8277index ee46ffe..b36c98c 100644
8278--- a/arch/powerpc/include/asm/elf.h
8279+++ b/arch/powerpc/include/asm/elf.h
8280@@ -30,6 +30,18 @@
8281
8282 #define ELF_ET_DYN_BASE 0x20000000
8283
8284+#ifdef CONFIG_PAX_ASLR
8285+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8286+
8287+#ifdef __powerpc64__
8288+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8289+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8290+#else
8291+#define PAX_DELTA_MMAP_LEN 15
8292+#define PAX_DELTA_STACK_LEN 15
8293+#endif
8294+#endif
8295+
8296 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8297
8298 /*
8299diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8300index 8196e9c..d83a9f3 100644
8301--- a/arch/powerpc/include/asm/exec.h
8302+++ b/arch/powerpc/include/asm/exec.h
8303@@ -4,6 +4,6 @@
8304 #ifndef _ASM_POWERPC_EXEC_H
8305 #define _ASM_POWERPC_EXEC_H
8306
8307-extern unsigned long arch_align_stack(unsigned long sp);
8308+#define arch_align_stack(x) ((x) & ~0xfUL)
8309
8310 #endif /* _ASM_POWERPC_EXEC_H */
8311diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8312index 5acabbd..7ea14fa 100644
8313--- a/arch/powerpc/include/asm/kmap_types.h
8314+++ b/arch/powerpc/include/asm/kmap_types.h
8315@@ -10,7 +10,7 @@
8316 * 2 of the License, or (at your option) any later version.
8317 */
8318
8319-#define KM_TYPE_NR 16
8320+#define KM_TYPE_NR 17
8321
8322 #endif /* __KERNEL__ */
8323 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8324diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8325index b8da913..c02b593 100644
8326--- a/arch/powerpc/include/asm/local.h
8327+++ b/arch/powerpc/include/asm/local.h
8328@@ -9,21 +9,65 @@ typedef struct
8329 atomic_long_t a;
8330 } local_t;
8331
8332+typedef struct
8333+{
8334+ atomic_long_unchecked_t a;
8335+} local_unchecked_t;
8336+
8337 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8338
8339 #define local_read(l) atomic_long_read(&(l)->a)
8340+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8341 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8342+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8343
8344 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8345+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8346 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8347+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8348 #define local_inc(l) atomic_long_inc(&(l)->a)
8349+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8350 #define local_dec(l) atomic_long_dec(&(l)->a)
8351+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8352
8353 static __inline__ long local_add_return(long a, local_t *l)
8354 {
8355 long t;
8356
8357 __asm__ __volatile__(
8358+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8359+
8360+#ifdef CONFIG_PAX_REFCOUNT
8361+" mcrxr cr0\n"
8362+" addo. %0,%1,%0\n"
8363+" bf 4*cr0+so, 3f\n"
8364+"2:.long " "0x00c00b00""\n"
8365+#else
8366+" add %0,%1,%0\n"
8367+#endif
8368+
8369+"3:\n"
8370+ PPC405_ERR77(0,%2)
8371+ PPC_STLCX "%0,0,%2 \n\
8372+ bne- 1b"
8373+
8374+#ifdef CONFIG_PAX_REFCOUNT
8375+"\n4:\n"
8376+ _ASM_EXTABLE(2b, 4b)
8377+#endif
8378+
8379+ : "=&r" (t)
8380+ : "r" (a), "r" (&(l->a.counter))
8381+ : "cc", "memory");
8382+
8383+ return t;
8384+}
8385+
8386+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8387+{
8388+ long t;
8389+
8390+ __asm__ __volatile__(
8391 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8392 add %0,%1,%0\n"
8393 PPC405_ERR77(0,%2)
8394@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8395
8396 #define local_cmpxchg(l, o, n) \
8397 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8398+#define local_cmpxchg_unchecked(l, o, n) \
8399+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8400 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8401
8402 /**
8403diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8404index 8565c25..2865190 100644
8405--- a/arch/powerpc/include/asm/mman.h
8406+++ b/arch/powerpc/include/asm/mman.h
8407@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8408 }
8409 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8410
8411-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8412+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8413 {
8414 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8415 }
8416diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8417index 69c0598..2c56964 100644
8418--- a/arch/powerpc/include/asm/page.h
8419+++ b/arch/powerpc/include/asm/page.h
8420@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8421 * and needs to be executable. This means the whole heap ends
8422 * up being executable.
8423 */
8424-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8425- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8426+#define VM_DATA_DEFAULT_FLAGS32 \
8427+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8428+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8429
8430 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8431 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8432@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8433 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8434 #endif
8435
8436+#define ktla_ktva(addr) (addr)
8437+#define ktva_ktla(addr) (addr)
8438+
8439 #ifndef CONFIG_PPC_BOOK3S_64
8440 /*
8441 * Use the top bit of the higher-level page table entries to indicate whether
8442diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8443index d908a46..3753f71 100644
8444--- a/arch/powerpc/include/asm/page_64.h
8445+++ b/arch/powerpc/include/asm/page_64.h
8446@@ -172,15 +172,18 @@ do { \
8447 * stack by default, so in the absence of a PT_GNU_STACK program header
8448 * we turn execute permission off.
8449 */
8450-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8451- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8452+#define VM_STACK_DEFAULT_FLAGS32 \
8453+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8454+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8455
8456 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8457 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8458
8459+#ifndef CONFIG_PAX_PAGEEXEC
8460 #define VM_STACK_DEFAULT_FLAGS \
8461 (is_32bit_task() ? \
8462 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8463+#endif
8464
8465 #include <asm-generic/getorder.h>
8466
8467diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8468index 4b0be20..c15a27d 100644
8469--- a/arch/powerpc/include/asm/pgalloc-64.h
8470+++ b/arch/powerpc/include/asm/pgalloc-64.h
8471@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8472 #ifndef CONFIG_PPC_64K_PAGES
8473
8474 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8475+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8476
8477 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8478 {
8479@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8480 pud_set(pud, (unsigned long)pmd);
8481 }
8482
8483+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8484+{
8485+ pud_populate(mm, pud, pmd);
8486+}
8487+
8488 #define pmd_populate(mm, pmd, pte_page) \
8489 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8490 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8491@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8492 #endif
8493
8494 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8495+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8496
8497 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8498 pte_t *pte)
8499diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8500index 11a3863..108f194 100644
8501--- a/arch/powerpc/include/asm/pgtable.h
8502+++ b/arch/powerpc/include/asm/pgtable.h
8503@@ -2,6 +2,7 @@
8504 #define _ASM_POWERPC_PGTABLE_H
8505 #ifdef __KERNEL__
8506
8507+#include <linux/const.h>
8508 #ifndef __ASSEMBLY__
8509 #include <linux/mmdebug.h>
8510 #include <linux/mmzone.h>
8511diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8512index 62cfb0c..50c6402 100644
8513--- a/arch/powerpc/include/asm/pte-hash32.h
8514+++ b/arch/powerpc/include/asm/pte-hash32.h
8515@@ -20,6 +20,7 @@
8516 #define _PAGE_HASHPTE 0x002 /* hash_page has made an HPTE for this pte */
8517 #define _PAGE_USER 0x004 /* usermode access allowed */
8518 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8519+#define _PAGE_EXEC _PAGE_GUARDED
8520 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8521 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8522 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8523diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8524index af56b5c..f86f3f6 100644
8525--- a/arch/powerpc/include/asm/reg.h
8526+++ b/arch/powerpc/include/asm/reg.h
8527@@ -253,6 +253,7 @@
8528 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8529 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8530 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8531+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8532 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8533 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8534 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8535diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8536index 825663c..f9e9134 100644
8537--- a/arch/powerpc/include/asm/smp.h
8538+++ b/arch/powerpc/include/asm/smp.h
8539@@ -51,7 +51,7 @@ struct smp_ops_t {
8540 int (*cpu_disable)(void);
8541 void (*cpu_die)(unsigned int nr);
8542 int (*cpu_bootable)(unsigned int nr);
8543-};
8544+} __no_const;
8545
8546 extern void smp_send_debugger_break(void);
8547 extern void start_secondary_resume(void);
8548diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8549index 4dbe072..b803275 100644
8550--- a/arch/powerpc/include/asm/spinlock.h
8551+++ b/arch/powerpc/include/asm/spinlock.h
8552@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8553 __asm__ __volatile__(
8554 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8555 __DO_SIGN_EXTEND
8556-" addic. %0,%0,1\n\
8557- ble- 2f\n"
8558+
8559+#ifdef CONFIG_PAX_REFCOUNT
8560+" mcrxr cr0\n"
8561+" addico. %0,%0,1\n"
8562+" bf 4*cr0+so, 3f\n"
8563+"2:.long " "0x00c00b00""\n"
8564+#else
8565+" addic. %0,%0,1\n"
8566+#endif
8567+
8568+"3:\n"
8569+ "ble- 4f\n"
8570 PPC405_ERR77(0,%1)
8571 " stwcx. %0,0,%1\n\
8572 bne- 1b\n"
8573 PPC_ACQUIRE_BARRIER
8574-"2:" : "=&r" (tmp)
8575+"4:"
8576+
8577+#ifdef CONFIG_PAX_REFCOUNT
8578+ _ASM_EXTABLE(2b,4b)
8579+#endif
8580+
8581+ : "=&r" (tmp)
8582 : "r" (&rw->lock)
8583 : "cr0", "xer", "memory");
8584
8585@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8586 __asm__ __volatile__(
8587 "# read_unlock\n\t"
8588 PPC_RELEASE_BARRIER
8589-"1: lwarx %0,0,%1\n\
8590- addic %0,%0,-1\n"
8591+"1: lwarx %0,0,%1\n"
8592+
8593+#ifdef CONFIG_PAX_REFCOUNT
8594+" mcrxr cr0\n"
8595+" addico. %0,%0,-1\n"
8596+" bf 4*cr0+so, 3f\n"
8597+"2:.long " "0x00c00b00""\n"
8598+#else
8599+" addic. %0,%0,-1\n"
8600+#endif
8601+
8602+"3:\n"
8603 PPC405_ERR77(0,%1)
8604 " stwcx. %0,0,%1\n\
8605 bne- 1b"
8606+
8607+#ifdef CONFIG_PAX_REFCOUNT
8608+"\n4:\n"
8609+ _ASM_EXTABLE(2b, 4b)
8610+#endif
8611+
8612 : "=&r"(tmp)
8613 : "r"(&rw->lock)
8614 : "cr0", "xer", "memory");
8615diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8616index 7efee4a..48d47cc 100644
8617--- a/arch/powerpc/include/asm/thread_info.h
8618+++ b/arch/powerpc/include/asm/thread_info.h
8619@@ -101,6 +101,8 @@ static inline struct thread_info *current_thread_info(void)
8620 #if defined(CONFIG_PPC64)
8621 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8622 #endif
8623+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8624+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8625
8626 /* as above, but as bit values */
8627 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8628@@ -119,9 +121,10 @@ static inline struct thread_info *current_thread_info(void)
8629 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8630 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8631 #define _TIF_NOHZ (1<<TIF_NOHZ)
8632+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8633 #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8634 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8635- _TIF_NOHZ)
8636+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8637
8638 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8639 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8640diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8641index a0c071d..49cdc7f 100644
8642--- a/arch/powerpc/include/asm/uaccess.h
8643+++ b/arch/powerpc/include/asm/uaccess.h
8644@@ -58,6 +58,7 @@
8645
8646 #endif
8647
8648+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8649 #define access_ok(type, addr, size) \
8650 (__chk_user_ptr(addr), \
8651 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8652@@ -318,52 +319,6 @@ do { \
8653 extern unsigned long __copy_tofrom_user(void __user *to,
8654 const void __user *from, unsigned long size);
8655
8656-#ifndef __powerpc64__
8657-
8658-static inline unsigned long copy_from_user(void *to,
8659- const void __user *from, unsigned long n)
8660-{
8661- unsigned long over;
8662-
8663- if (access_ok(VERIFY_READ, from, n))
8664- return __copy_tofrom_user((__force void __user *)to, from, n);
8665- if ((unsigned long)from < TASK_SIZE) {
8666- over = (unsigned long)from + n - TASK_SIZE;
8667- return __copy_tofrom_user((__force void __user *)to, from,
8668- n - over) + over;
8669- }
8670- return n;
8671-}
8672-
8673-static inline unsigned long copy_to_user(void __user *to,
8674- const void *from, unsigned long n)
8675-{
8676- unsigned long over;
8677-
8678- if (access_ok(VERIFY_WRITE, to, n))
8679- return __copy_tofrom_user(to, (__force void __user *)from, n);
8680- if ((unsigned long)to < TASK_SIZE) {
8681- over = (unsigned long)to + n - TASK_SIZE;
8682- return __copy_tofrom_user(to, (__force void __user *)from,
8683- n - over) + over;
8684- }
8685- return n;
8686-}
8687-
8688-#else /* __powerpc64__ */
8689-
8690-#define __copy_in_user(to, from, size) \
8691- __copy_tofrom_user((to), (from), (size))
8692-
8693-extern unsigned long copy_from_user(void *to, const void __user *from,
8694- unsigned long n);
8695-extern unsigned long copy_to_user(void __user *to, const void *from,
8696- unsigned long n);
8697-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8698- unsigned long n);
8699-
8700-#endif /* __powerpc64__ */
8701-
8702 static inline unsigned long __copy_from_user_inatomic(void *to,
8703 const void __user *from, unsigned long n)
8704 {
8705@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8706 if (ret == 0)
8707 return 0;
8708 }
8709+
8710+ if (!__builtin_constant_p(n))
8711+ check_object_size(to, n, false);
8712+
8713 return __copy_tofrom_user((__force void __user *)to, from, n);
8714 }
8715
8716@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8717 if (ret == 0)
8718 return 0;
8719 }
8720+
8721+ if (!__builtin_constant_p(n))
8722+ check_object_size(from, n, true);
8723+
8724 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8725 }
8726
8727@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8728 return __copy_to_user_inatomic(to, from, size);
8729 }
8730
8731+#ifndef __powerpc64__
8732+
8733+static inline unsigned long __must_check copy_from_user(void *to,
8734+ const void __user *from, unsigned long n)
8735+{
8736+ unsigned long over;
8737+
8738+ if ((long)n < 0)
8739+ return n;
8740+
8741+ if (access_ok(VERIFY_READ, from, n)) {
8742+ if (!__builtin_constant_p(n))
8743+ check_object_size(to, n, false);
8744+ return __copy_tofrom_user((__force void __user *)to, from, n);
8745+ }
8746+ if ((unsigned long)from < TASK_SIZE) {
8747+ over = (unsigned long)from + n - TASK_SIZE;
8748+ if (!__builtin_constant_p(n - over))
8749+ check_object_size(to, n - over, false);
8750+ return __copy_tofrom_user((__force void __user *)to, from,
8751+ n - over) + over;
8752+ }
8753+ return n;
8754+}
8755+
8756+static inline unsigned long __must_check copy_to_user(void __user *to,
8757+ const void *from, unsigned long n)
8758+{
8759+ unsigned long over;
8760+
8761+ if ((long)n < 0)
8762+ return n;
8763+
8764+ if (access_ok(VERIFY_WRITE, to, n)) {
8765+ if (!__builtin_constant_p(n))
8766+ check_object_size(from, n, true);
8767+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8768+ }
8769+ if ((unsigned long)to < TASK_SIZE) {
8770+ over = (unsigned long)to + n - TASK_SIZE;
8771+ if (!__builtin_constant_p(n))
8772+ check_object_size(from, n - over, true);
8773+ return __copy_tofrom_user(to, (__force void __user *)from,
8774+ n - over) + over;
8775+ }
8776+ return n;
8777+}
8778+
8779+#else /* __powerpc64__ */
8780+
8781+#define __copy_in_user(to, from, size) \
8782+ __copy_tofrom_user((to), (from), (size))
8783+
8784+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8785+{
8786+ if ((long)n < 0 || n > INT_MAX)
8787+ return n;
8788+
8789+ if (!__builtin_constant_p(n))
8790+ check_object_size(to, n, false);
8791+
8792+ if (likely(access_ok(VERIFY_READ, from, n)))
8793+ n = __copy_from_user(to, from, n);
8794+ else
8795+ memset(to, 0, n);
8796+ return n;
8797+}
8798+
8799+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8800+{
8801+ if ((long)n < 0 || n > INT_MAX)
8802+ return n;
8803+
8804+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8805+ if (!__builtin_constant_p(n))
8806+ check_object_size(from, n, true);
8807+ n = __copy_to_user(to, from, n);
8808+ }
8809+ return n;
8810+}
8811+
8812+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8813+ unsigned long n);
8814+
8815+#endif /* __powerpc64__ */
8816+
8817 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8818
8819 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8820diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8821index c1ebbda..fd8a98d 100644
8822--- a/arch/powerpc/kernel/Makefile
8823+++ b/arch/powerpc/kernel/Makefile
8824@@ -15,6 +15,11 @@ CFLAGS_prom_init.o += -fPIC
8825 CFLAGS_btext.o += -fPIC
8826 endif
8827
8828+CFLAGS_REMOVE_cputable.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8829+CFLAGS_REMOVE_prom_init.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8830+CFLAGS_REMOVE_btext.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8831+CFLAGS_REMOVE_prom.o = $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8832+
8833 ifdef CONFIG_FUNCTION_TRACER
8834 # Do not trace early boot code
8835 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
8836@@ -27,6 +32,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8837 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8838 endif
8839
8840+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8841+
8842 obj-y := cputable.o ptrace.o syscalls.o \
8843 irq.o align.o signal_32.o pmc.o vdso.o \
8844 process.o systbl.o idle.o \
8845diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8846index 3e68d1c..72a5ee6 100644
8847--- a/arch/powerpc/kernel/exceptions-64e.S
8848+++ b/arch/powerpc/kernel/exceptions-64e.S
8849@@ -1010,6 +1010,7 @@ storage_fault_common:
8850 std r14,_DAR(r1)
8851 std r15,_DSISR(r1)
8852 addi r3,r1,STACK_FRAME_OVERHEAD
8853+ bl save_nvgprs
8854 mr r4,r14
8855 mr r5,r15
8856 ld r14,PACA_EXGEN+EX_R14(r13)
8857@@ -1018,8 +1019,7 @@ storage_fault_common:
8858 cmpdi r3,0
8859 bne- 1f
8860 b ret_from_except_lite
8861-1: bl save_nvgprs
8862- mr r5,r3
8863+1: mr r5,r3
8864 addi r3,r1,STACK_FRAME_OVERHEAD
8865 ld r4,_DAR(r1)
8866 bl bad_page_fault
8867diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8868index 9519e6b..13f6c38 100644
8869--- a/arch/powerpc/kernel/exceptions-64s.S
8870+++ b/arch/powerpc/kernel/exceptions-64s.S
8871@@ -1599,10 +1599,10 @@ handle_page_fault:
8872 11: ld r4,_DAR(r1)
8873 ld r5,_DSISR(r1)
8874 addi r3,r1,STACK_FRAME_OVERHEAD
8875+ bl save_nvgprs
8876 bl do_page_fault
8877 cmpdi r3,0
8878 beq+ 12f
8879- bl save_nvgprs
8880 mr r5,r3
8881 addi r3,r1,STACK_FRAME_OVERHEAD
8882 lwz r4,_DAR(r1)
8883diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8884index 4509603..cdb491f 100644
8885--- a/arch/powerpc/kernel/irq.c
8886+++ b/arch/powerpc/kernel/irq.c
8887@@ -460,6 +460,8 @@ void migrate_irqs(void)
8888 }
8889 #endif
8890
8891+extern void gr_handle_kernel_exploit(void);
8892+
8893 static inline void check_stack_overflow(void)
8894 {
8895 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8896@@ -472,6 +474,7 @@ static inline void check_stack_overflow(void)
8897 pr_err("do_IRQ: stack overflow: %ld\n",
8898 sp - sizeof(struct thread_info));
8899 dump_stack();
8900+ gr_handle_kernel_exploit();
8901 }
8902 #endif
8903 }
8904diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8905index c94d2e0..992a9ce 100644
8906--- a/arch/powerpc/kernel/module_32.c
8907+++ b/arch/powerpc/kernel/module_32.c
8908@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8909 me->arch.core_plt_section = i;
8910 }
8911 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8912- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8913+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8914 return -ENOEXEC;
8915 }
8916
8917@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8918
8919 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8920 /* Init, or core PLT? */
8921- if (location >= mod->module_core
8922- && location < mod->module_core + mod->core_size)
8923+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8924+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8925 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8926- else
8927+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8928+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8929 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8930+ else {
8931+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8932+ return ~0UL;
8933+ }
8934
8935 /* Find this entry, or if that fails, the next avail. entry */
8936 while (entry->jump[0]) {
8937@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8938 }
8939 #ifdef CONFIG_DYNAMIC_FTRACE
8940 module->arch.tramp =
8941- do_plt_call(module->module_core,
8942+ do_plt_call(module->module_core_rx,
8943 (unsigned long)ftrace_caller,
8944 sechdrs, module);
8945 #endif
8946diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8947index febb50d..bb10020 100644
8948--- a/arch/powerpc/kernel/process.c
8949+++ b/arch/powerpc/kernel/process.c
8950@@ -1036,8 +1036,8 @@ void show_regs(struct pt_regs * regs)
8951 * Lookup NIP late so we have the best change of getting the
8952 * above info out without failing
8953 */
8954- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8955- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8956+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8957+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8958 #endif
8959 show_stack(current, (unsigned long *) regs->gpr[1]);
8960 if (!user_mode(regs))
8961@@ -1554,10 +1554,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8962 newsp = stack[0];
8963 ip = stack[STACK_FRAME_LR_SAVE];
8964 if (!firstframe || ip != lr) {
8965- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8966+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8967 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8968 if ((ip == rth) && curr_frame >= 0) {
8969- printk(" (%pS)",
8970+ printk(" (%pA)",
8971 (void *)current->ret_stack[curr_frame].ret);
8972 curr_frame--;
8973 }
8974@@ -1577,7 +1577,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8975 struct pt_regs *regs = (struct pt_regs *)
8976 (sp + STACK_FRAME_OVERHEAD);
8977 lr = regs->link;
8978- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8979+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8980 regs->trap, (void *)regs->nip, (void *)lr);
8981 firstframe = 1;
8982 }
8983@@ -1613,49 +1613,3 @@ void notrace __ppc64_runlatch_off(void)
8984 mtspr(SPRN_CTRLT, ctrl);
8985 }
8986 #endif /* CONFIG_PPC64 */
8987-
8988-unsigned long arch_align_stack(unsigned long sp)
8989-{
8990- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8991- sp -= get_random_int() & ~PAGE_MASK;
8992- return sp & ~0xf;
8993-}
8994-
8995-static inline unsigned long brk_rnd(void)
8996-{
8997- unsigned long rnd = 0;
8998-
8999- /* 8MB for 32bit, 1GB for 64bit */
9000- if (is_32bit_task())
9001- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
9002- else
9003- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
9004-
9005- return rnd << PAGE_SHIFT;
9006-}
9007-
9008-unsigned long arch_randomize_brk(struct mm_struct *mm)
9009-{
9010- unsigned long base = mm->brk;
9011- unsigned long ret;
9012-
9013-#ifdef CONFIG_PPC_STD_MMU_64
9014- /*
9015- * If we are using 1TB segments and we are allowed to randomise
9016- * the heap, we can put it above 1TB so it is backed by a 1TB
9017- * segment. Otherwise the heap will be in the bottom 1TB
9018- * which always uses 256MB segments and this may result in a
9019- * performance penalty.
9020- */
9021- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
9022- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
9023-#endif
9024-
9025- ret = PAGE_ALIGN(base + brk_rnd());
9026-
9027- if (ret < mm->brk)
9028- return mm->brk;
9029-
9030- return ret;
9031-}
9032-
9033diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9034index f21897b..28c0428 100644
9035--- a/arch/powerpc/kernel/ptrace.c
9036+++ b/arch/powerpc/kernel/ptrace.c
9037@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9038 return ret;
9039 }
9040
9041+#ifdef CONFIG_GRKERNSEC_SETXID
9042+extern void gr_delayed_cred_worker(void);
9043+#endif
9044+
9045 /*
9046 * We must return the syscall number to actually look up in the table.
9047 * This can be -1L to skip running any syscall at all.
9048@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9049
9050 secure_computing_strict(regs->gpr[0]);
9051
9052+#ifdef CONFIG_GRKERNSEC_SETXID
9053+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9054+ gr_delayed_cred_worker();
9055+#endif
9056+
9057 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9058 tracehook_report_syscall_entry(regs))
9059 /*
9060@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9061 {
9062 int step;
9063
9064+#ifdef CONFIG_GRKERNSEC_SETXID
9065+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9066+ gr_delayed_cred_worker();
9067+#endif
9068+
9069 audit_syscall_exit(regs);
9070
9071 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9072diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9073index da50e0c..5ff6307 100644
9074--- a/arch/powerpc/kernel/signal_32.c
9075+++ b/arch/powerpc/kernel/signal_32.c
9076@@ -1009,7 +1009,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9077 /* Save user registers on the stack */
9078 frame = &rt_sf->uc.uc_mcontext;
9079 addr = frame;
9080- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9081+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9082 sigret = 0;
9083 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9084 } else {
9085diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9086index c7c24d2..1bf7039 100644
9087--- a/arch/powerpc/kernel/signal_64.c
9088+++ b/arch/powerpc/kernel/signal_64.c
9089@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9090 current->thread.fp_state.fpscr = 0;
9091
9092 /* Set up to return from userspace. */
9093- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9094+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9095 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9096 } else {
9097 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9098diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9099index 19e4744..28a8d7b 100644
9100--- a/arch/powerpc/kernel/traps.c
9101+++ b/arch/powerpc/kernel/traps.c
9102@@ -36,6 +36,7 @@
9103 #include <linux/debugfs.h>
9104 #include <linux/ratelimit.h>
9105 #include <linux/context_tracking.h>
9106+#include <linux/uaccess.h>
9107
9108 #include <asm/emulated_ops.h>
9109 #include <asm/pgtable.h>
9110@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9111 return flags;
9112 }
9113
9114+extern void gr_handle_kernel_exploit(void);
9115+
9116 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9117 int signr)
9118 {
9119@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9120 panic("Fatal exception in interrupt");
9121 if (panic_on_oops)
9122 panic("Fatal exception");
9123+
9124+ gr_handle_kernel_exploit();
9125+
9126 do_exit(signr);
9127 }
9128
9129@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9130 enum ctx_state prev_state = exception_enter();
9131 unsigned int reason = get_reason(regs);
9132
9133+#ifdef CONFIG_PAX_REFCOUNT
9134+ unsigned int bkpt;
9135+ const struct exception_table_entry *entry;
9136+
9137+ if (reason & REASON_ILLEGAL) {
9138+ /* Check if PaX bad instruction */
9139+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9140+ current->thread.trap_nr = 0;
9141+ pax_report_refcount_overflow(regs);
9142+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9143+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9144+ regs->nip = entry->fixup;
9145+ return;
9146+ }
9147+ /* fixup_exception() could not handle */
9148+ goto bail;
9149+ }
9150+ }
9151+#endif
9152+
9153 /* We can now get here via a FP Unavailable exception if the core
9154 * has no FPU, in that case the reason flags will be 0 */
9155
9156diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9157index 305eb0d..accc5b40 100644
9158--- a/arch/powerpc/kernel/vdso.c
9159+++ b/arch/powerpc/kernel/vdso.c
9160@@ -34,6 +34,7 @@
9161 #include <asm/vdso.h>
9162 #include <asm/vdso_datapage.h>
9163 #include <asm/setup.h>
9164+#include <asm/mman.h>
9165
9166 #undef DEBUG
9167
9168@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9169 vdso_base = VDSO32_MBASE;
9170 #endif
9171
9172- current->mm->context.vdso_base = 0;
9173+ current->mm->context.vdso_base = ~0UL;
9174
9175 /* vDSO has a problem and was disabled, just don't "enable" it for the
9176 * process
9177@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9178 vdso_base = get_unmapped_area(NULL, vdso_base,
9179 (vdso_pages << PAGE_SHIFT) +
9180 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9181- 0, 0);
9182+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9183 if (IS_ERR_VALUE(vdso_base)) {
9184 rc = vdso_base;
9185 goto fail_mmapsem;
9186diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9187index ac3ddf1..9a54c76 100644
9188--- a/arch/powerpc/kvm/powerpc.c
9189+++ b/arch/powerpc/kvm/powerpc.c
9190@@ -1403,7 +1403,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9191 }
9192 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9193
9194-int kvm_arch_init(void *opaque)
9195+int kvm_arch_init(const void *opaque)
9196 {
9197 return 0;
9198 }
9199diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9200index 5eea6f3..5d10396 100644
9201--- a/arch/powerpc/lib/usercopy_64.c
9202+++ b/arch/powerpc/lib/usercopy_64.c
9203@@ -9,22 +9,6 @@
9204 #include <linux/module.h>
9205 #include <asm/uaccess.h>
9206
9207-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9208-{
9209- if (likely(access_ok(VERIFY_READ, from, n)))
9210- n = __copy_from_user(to, from, n);
9211- else
9212- memset(to, 0, n);
9213- return n;
9214-}
9215-
9216-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9217-{
9218- if (likely(access_ok(VERIFY_WRITE, to, n)))
9219- n = __copy_to_user(to, from, n);
9220- return n;
9221-}
9222-
9223 unsigned long copy_in_user(void __user *to, const void __user *from,
9224 unsigned long n)
9225 {
9226@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9227 return n;
9228 }
9229
9230-EXPORT_SYMBOL(copy_from_user);
9231-EXPORT_SYMBOL(copy_to_user);
9232 EXPORT_SYMBOL(copy_in_user);
9233
9234diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9235index b396868..3eb6b9f 100644
9236--- a/arch/powerpc/mm/fault.c
9237+++ b/arch/powerpc/mm/fault.c
9238@@ -33,6 +33,10 @@
9239 #include <linux/ratelimit.h>
9240 #include <linux/context_tracking.h>
9241 #include <linux/hugetlb.h>
9242+#include <linux/slab.h>
9243+#include <linux/pagemap.h>
9244+#include <linux/compiler.h>
9245+#include <linux/unistd.h>
9246
9247 #include <asm/firmware.h>
9248 #include <asm/page.h>
9249@@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9250 }
9251 #endif
9252
9253+#ifdef CONFIG_PAX_PAGEEXEC
9254+/*
9255+ * PaX: decide what to do with offenders (regs->nip = fault address)
9256+ *
9257+ * returns 1 when task should be killed
9258+ */
9259+static int pax_handle_fetch_fault(struct pt_regs *regs)
9260+{
9261+ return 1;
9262+}
9263+
9264+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9265+{
9266+ unsigned long i;
9267+
9268+ printk(KERN_ERR "PAX: bytes at PC: ");
9269+ for (i = 0; i < 5; i++) {
9270+ unsigned int c;
9271+ if (get_user(c, (unsigned int __user *)pc+i))
9272+ printk(KERN_CONT "???????? ");
9273+ else
9274+ printk(KERN_CONT "%08x ", c);
9275+ }
9276+ printk("\n");
9277+}
9278+#endif
9279+
9280 /*
9281 * Check whether the instruction at regs->nip is a store using
9282 * an update addressing form which will update r1.
9283@@ -227,7 +258,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9284 * indicate errors in DSISR but can validly be set in SRR1.
9285 */
9286 if (trap == 0x400)
9287- error_code &= 0x48200000;
9288+ error_code &= 0x58200000;
9289 else
9290 is_write = error_code & DSISR_ISSTORE;
9291 #else
9292@@ -383,12 +414,16 @@ good_area:
9293 * "undefined". Of those that can be set, this is the only
9294 * one which seems bad.
9295 */
9296- if (error_code & 0x10000000)
9297+ if (error_code & DSISR_GUARDED)
9298 /* Guarded storage error. */
9299 goto bad_area;
9300 #endif /* CONFIG_8xx */
9301
9302 if (is_exec) {
9303+#ifdef CONFIG_PPC_STD_MMU
9304+ if (error_code & DSISR_GUARDED)
9305+ goto bad_area;
9306+#endif
9307 /*
9308 * Allow execution from readable areas if the MMU does not
9309 * provide separate controls over reading and executing.
9310@@ -483,6 +518,23 @@ bad_area:
9311 bad_area_nosemaphore:
9312 /* User mode accesses cause a SIGSEGV */
9313 if (user_mode(regs)) {
9314+
9315+#ifdef CONFIG_PAX_PAGEEXEC
9316+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9317+#ifdef CONFIG_PPC_STD_MMU
9318+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9319+#else
9320+ if (is_exec && regs->nip == address) {
9321+#endif
9322+ switch (pax_handle_fetch_fault(regs)) {
9323+ }
9324+
9325+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9326+ do_group_exit(SIGKILL);
9327+ }
9328+ }
9329+#endif
9330+
9331 _exception(SIGSEGV, regs, code, address);
9332 goto bail;
9333 }
9334diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9335index 0f0502e..bc3e7a3 100644
9336--- a/arch/powerpc/mm/mmap.c
9337+++ b/arch/powerpc/mm/mmap.c
9338@@ -86,6 +86,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9339 {
9340 unsigned long random_factor = 0UL;
9341
9342+#ifdef CONFIG_PAX_RANDMMAP
9343+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9344+#endif
9345+
9346 if (current->flags & PF_RANDOMIZE)
9347 random_factor = arch_mmap_rnd();
9348
9349@@ -95,9 +99,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9350 */
9351 if (mmap_is_legacy()) {
9352 mm->mmap_base = TASK_UNMAPPED_BASE;
9353+
9354+#ifdef CONFIG_PAX_RANDMMAP
9355+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9356+ mm->mmap_base += mm->delta_mmap;
9357+#endif
9358+
9359 mm->get_unmapped_area = arch_get_unmapped_area;
9360 } else {
9361 mm->mmap_base = mmap_base(random_factor);
9362+
9363+#ifdef CONFIG_PAX_RANDMMAP
9364+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9365+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9366+#endif
9367+
9368 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9369 }
9370 }
9371diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9372index 0f432a7..abfe841 100644
9373--- a/arch/powerpc/mm/slice.c
9374+++ b/arch/powerpc/mm/slice.c
9375@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9376 if ((mm->task_size - len) < addr)
9377 return 0;
9378 vma = find_vma(mm, addr);
9379- return (!vma || (addr + len) <= vma->vm_start);
9380+ return check_heap_stack_gap(vma, addr, len, 0);
9381 }
9382
9383 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9384@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9385 info.align_offset = 0;
9386
9387 addr = TASK_UNMAPPED_BASE;
9388+
9389+#ifdef CONFIG_PAX_RANDMMAP
9390+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9391+ addr += mm->delta_mmap;
9392+#endif
9393+
9394 while (addr < TASK_SIZE) {
9395 info.low_limit = addr;
9396 if (!slice_scan_available(addr, available, 1, &addr))
9397@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9398 if (fixed && addr > (mm->task_size - len))
9399 return -ENOMEM;
9400
9401+#ifdef CONFIG_PAX_RANDMMAP
9402+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9403+ addr = 0;
9404+#endif
9405+
9406 /* If hint, make sure it matches our alignment restrictions */
9407 if (!fixed && addr) {
9408 addr = _ALIGN_UP(addr, 1ul << pshift);
9409diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9410index d966bbe..372124a 100644
9411--- a/arch/powerpc/platforms/cell/spufs/file.c
9412+++ b/arch/powerpc/platforms/cell/spufs/file.c
9413@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9414 return VM_FAULT_NOPAGE;
9415 }
9416
9417-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9418+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9419 unsigned long address,
9420- void *buf, int len, int write)
9421+ void *buf, size_t len, int write)
9422 {
9423 struct spu_context *ctx = vma->vm_file->private_data;
9424 unsigned long offset = address - vma->vm_start;
9425diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9426index adbe380..adb7516 100644
9427--- a/arch/s390/include/asm/atomic.h
9428+++ b/arch/s390/include/asm/atomic.h
9429@@ -317,4 +317,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9430 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9431 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9432
9433+#define atomic64_read_unchecked(v) atomic64_read(v)
9434+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9435+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9436+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9437+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9438+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9439+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9440+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9441+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9442+
9443 #endif /* __ARCH_S390_ATOMIC__ */
9444diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9445index 8d72471..5322500 100644
9446--- a/arch/s390/include/asm/barrier.h
9447+++ b/arch/s390/include/asm/barrier.h
9448@@ -42,7 +42,7 @@
9449 do { \
9450 compiletime_assert_atomic_type(*p); \
9451 barrier(); \
9452- ACCESS_ONCE(*p) = (v); \
9453+ ACCESS_ONCE_RW(*p) = (v); \
9454 } while (0)
9455
9456 #define smp_load_acquire(p) \
9457diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9458index 4d7ccac..d03d0ad 100644
9459--- a/arch/s390/include/asm/cache.h
9460+++ b/arch/s390/include/asm/cache.h
9461@@ -9,8 +9,10 @@
9462 #ifndef __ARCH_S390_CACHE_H
9463 #define __ARCH_S390_CACHE_H
9464
9465-#define L1_CACHE_BYTES 256
9466+#include <linux/const.h>
9467+
9468 #define L1_CACHE_SHIFT 8
9469+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9470 #define NET_SKB_PAD 32
9471
9472 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9473diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9474index 3ad48f2..64cc6f3 100644
9475--- a/arch/s390/include/asm/elf.h
9476+++ b/arch/s390/include/asm/elf.h
9477@@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
9478 (STACK_TOP / 3 * 2) : \
9479 (STACK_TOP / 3 * 2) & ~((1UL << 32) - 1))
9480
9481+#ifdef CONFIG_PAX_ASLR
9482+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9483+
9484+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9485+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9486+#endif
9487+
9488 /* This yields a mask that user programs can use to figure out what
9489 instruction set this CPU supports. */
9490
9491diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9492index c4a93d6..4d2a9b4 100644
9493--- a/arch/s390/include/asm/exec.h
9494+++ b/arch/s390/include/asm/exec.h
9495@@ -7,6 +7,6 @@
9496 #ifndef __ASM_EXEC_H
9497 #define __ASM_EXEC_H
9498
9499-extern unsigned long arch_align_stack(unsigned long sp);
9500+#define arch_align_stack(x) ((x) & ~0xfUL)
9501
9502 #endif /* __ASM_EXEC_H */
9503diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9504index d64a7a6..0830329 100644
9505--- a/arch/s390/include/asm/uaccess.h
9506+++ b/arch/s390/include/asm/uaccess.h
9507@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9508 __range_ok((unsigned long)(addr), (size)); \
9509 })
9510
9511+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9512 #define access_ok(type, addr, size) __access_ok(addr, size)
9513
9514 /*
9515@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9516 copy_to_user(void __user *to, const void *from, unsigned long n)
9517 {
9518 might_fault();
9519+
9520+ if ((long)n < 0)
9521+ return n;
9522+
9523 return __copy_to_user(to, from, n);
9524 }
9525
9526@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9527 static inline unsigned long __must_check
9528 copy_from_user(void *to, const void __user *from, unsigned long n)
9529 {
9530- unsigned int sz = __compiletime_object_size(to);
9531+ size_t sz = __compiletime_object_size(to);
9532
9533 might_fault();
9534- if (unlikely(sz != -1 && sz < n)) {
9535+
9536+ if ((long)n < 0)
9537+ return n;
9538+
9539+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9540 copy_from_user_overflow();
9541 return n;
9542 }
9543diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9544index 0c1a679..e1df357 100644
9545--- a/arch/s390/kernel/module.c
9546+++ b/arch/s390/kernel/module.c
9547@@ -159,11 +159,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9548
9549 /* Increase core size by size of got & plt and set start
9550 offsets for got and plt. */
9551- me->core_size = ALIGN(me->core_size, 4);
9552- me->arch.got_offset = me->core_size;
9553- me->core_size += me->arch.got_size;
9554- me->arch.plt_offset = me->core_size;
9555- me->core_size += me->arch.plt_size;
9556+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9557+ me->arch.got_offset = me->core_size_rw;
9558+ me->core_size_rw += me->arch.got_size;
9559+ me->arch.plt_offset = me->core_size_rx;
9560+ me->core_size_rx += me->arch.plt_size;
9561 return 0;
9562 }
9563
9564@@ -279,7 +279,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9565 if (info->got_initialized == 0) {
9566 Elf_Addr *gotent;
9567
9568- gotent = me->module_core + me->arch.got_offset +
9569+ gotent = me->module_core_rw + me->arch.got_offset +
9570 info->got_offset;
9571 *gotent = val;
9572 info->got_initialized = 1;
9573@@ -302,7 +302,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9574 rc = apply_rela_bits(loc, val, 0, 64, 0);
9575 else if (r_type == R_390_GOTENT ||
9576 r_type == R_390_GOTPLTENT) {
9577- val += (Elf_Addr) me->module_core - loc;
9578+ val += (Elf_Addr) me->module_core_rw - loc;
9579 rc = apply_rela_bits(loc, val, 1, 32, 1);
9580 }
9581 break;
9582@@ -315,7 +315,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9583 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9584 if (info->plt_initialized == 0) {
9585 unsigned int *ip;
9586- ip = me->module_core + me->arch.plt_offset +
9587+ ip = me->module_core_rx + me->arch.plt_offset +
9588 info->plt_offset;
9589 ip[0] = 0x0d10e310; /* basr 1,0; lg 1,10(1); br 1 */
9590 ip[1] = 0x100a0004;
9591@@ -334,7 +334,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9592 val - loc + 0xffffUL < 0x1ffffeUL) ||
9593 (r_type == R_390_PLT32DBL &&
9594 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9595- val = (Elf_Addr) me->module_core +
9596+ val = (Elf_Addr) me->module_core_rx +
9597 me->arch.plt_offset +
9598 info->plt_offset;
9599 val += rela->r_addend - loc;
9600@@ -356,7 +356,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9601 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9602 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9603 val = val + rela->r_addend -
9604- ((Elf_Addr) me->module_core + me->arch.got_offset);
9605+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9606 if (r_type == R_390_GOTOFF16)
9607 rc = apply_rela_bits(loc, val, 0, 16, 0);
9608 else if (r_type == R_390_GOTOFF32)
9609@@ -366,7 +366,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9610 break;
9611 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9612 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9613- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9614+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9615 rela->r_addend - loc;
9616 if (r_type == R_390_GOTPC)
9617 rc = apply_rela_bits(loc, val, 1, 32, 0);
9618diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9619index 8f587d8..0642516b 100644
9620--- a/arch/s390/kernel/process.c
9621+++ b/arch/s390/kernel/process.c
9622@@ -200,27 +200,3 @@ unsigned long get_wchan(struct task_struct *p)
9623 }
9624 return 0;
9625 }
9626-
9627-unsigned long arch_align_stack(unsigned long sp)
9628-{
9629- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9630- sp -= get_random_int() & ~PAGE_MASK;
9631- return sp & ~0xf;
9632-}
9633-
9634-static inline unsigned long brk_rnd(void)
9635-{
9636- /* 8MB for 32bit, 1GB for 64bit */
9637- if (is_32bit_task())
9638- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9639- else
9640- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9641-}
9642-
9643-unsigned long arch_randomize_brk(struct mm_struct *mm)
9644-{
9645- unsigned long ret;
9646-
9647- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9648- return (ret > mm->brk) ? ret : mm->brk;
9649-}
9650diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9651index 6e552af..3e608a1 100644
9652--- a/arch/s390/mm/mmap.c
9653+++ b/arch/s390/mm/mmap.c
9654@@ -239,6 +239,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9655 {
9656 unsigned long random_factor = 0UL;
9657
9658+#ifdef CONFIG_PAX_RANDMMAP
9659+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9660+#endif
9661+
9662 if (current->flags & PF_RANDOMIZE)
9663 random_factor = arch_mmap_rnd();
9664
9665@@ -248,9 +252,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9666 */
9667 if (mmap_is_legacy()) {
9668 mm->mmap_base = mmap_base_legacy(random_factor);
9669+
9670+#ifdef CONFIG_PAX_RANDMMAP
9671+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9672+ mm->mmap_base += mm->delta_mmap;
9673+#endif
9674+
9675 mm->get_unmapped_area = s390_get_unmapped_area;
9676 } else {
9677 mm->mmap_base = mmap_base(random_factor);
9678+
9679+#ifdef CONFIG_PAX_RANDMMAP
9680+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9681+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9682+#endif
9683+
9684 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9685 }
9686 }
9687diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9688index ae3d59f..f65f075 100644
9689--- a/arch/score/include/asm/cache.h
9690+++ b/arch/score/include/asm/cache.h
9691@@ -1,7 +1,9 @@
9692 #ifndef _ASM_SCORE_CACHE_H
9693 #define _ASM_SCORE_CACHE_H
9694
9695+#include <linux/const.h>
9696+
9697 #define L1_CACHE_SHIFT 4
9698-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9699+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9700
9701 #endif /* _ASM_SCORE_CACHE_H */
9702diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9703index f9f3cd5..58ff438 100644
9704--- a/arch/score/include/asm/exec.h
9705+++ b/arch/score/include/asm/exec.h
9706@@ -1,6 +1,6 @@
9707 #ifndef _ASM_SCORE_EXEC_H
9708 #define _ASM_SCORE_EXEC_H
9709
9710-extern unsigned long arch_align_stack(unsigned long sp);
9711+#define arch_align_stack(x) (x)
9712
9713 #endif /* _ASM_SCORE_EXEC_H */
9714diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9715index a1519ad3..e8ac1ff 100644
9716--- a/arch/score/kernel/process.c
9717+++ b/arch/score/kernel/process.c
9718@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9719
9720 return task_pt_regs(task)->cp0_epc;
9721 }
9722-
9723-unsigned long arch_align_stack(unsigned long sp)
9724-{
9725- return sp;
9726-}
9727diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9728index ef9e555..331bd29 100644
9729--- a/arch/sh/include/asm/cache.h
9730+++ b/arch/sh/include/asm/cache.h
9731@@ -9,10 +9,11 @@
9732 #define __ASM_SH_CACHE_H
9733 #ifdef __KERNEL__
9734
9735+#include <linux/const.h>
9736 #include <linux/init.h>
9737 #include <cpu/cache.h>
9738
9739-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9740+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9741
9742 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9743
9744diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9745index 6777177..cb5e44f 100644
9746--- a/arch/sh/mm/mmap.c
9747+++ b/arch/sh/mm/mmap.c
9748@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9749 struct mm_struct *mm = current->mm;
9750 struct vm_area_struct *vma;
9751 int do_colour_align;
9752+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9753 struct vm_unmapped_area_info info;
9754
9755 if (flags & MAP_FIXED) {
9756@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9757 if (filp || (flags & MAP_SHARED))
9758 do_colour_align = 1;
9759
9760+#ifdef CONFIG_PAX_RANDMMAP
9761+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9762+#endif
9763+
9764 if (addr) {
9765 if (do_colour_align)
9766 addr = COLOUR_ALIGN(addr, pgoff);
9767@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9768 addr = PAGE_ALIGN(addr);
9769
9770 vma = find_vma(mm, addr);
9771- if (TASK_SIZE - len >= addr &&
9772- (!vma || addr + len <= vma->vm_start))
9773+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9774 return addr;
9775 }
9776
9777 info.flags = 0;
9778 info.length = len;
9779- info.low_limit = TASK_UNMAPPED_BASE;
9780+ info.low_limit = mm->mmap_base;
9781 info.high_limit = TASK_SIZE;
9782 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9783 info.align_offset = pgoff << PAGE_SHIFT;
9784@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9785 struct mm_struct *mm = current->mm;
9786 unsigned long addr = addr0;
9787 int do_colour_align;
9788+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9789 struct vm_unmapped_area_info info;
9790
9791 if (flags & MAP_FIXED) {
9792@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9793 if (filp || (flags & MAP_SHARED))
9794 do_colour_align = 1;
9795
9796+#ifdef CONFIG_PAX_RANDMMAP
9797+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9798+#endif
9799+
9800 /* requesting a specific address */
9801 if (addr) {
9802 if (do_colour_align)
9803@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9804 addr = PAGE_ALIGN(addr);
9805
9806 vma = find_vma(mm, addr);
9807- if (TASK_SIZE - len >= addr &&
9808- (!vma || addr + len <= vma->vm_start))
9809+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9810 return addr;
9811 }
9812
9813@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9814 VM_BUG_ON(addr != -ENOMEM);
9815 info.flags = 0;
9816 info.low_limit = TASK_UNMAPPED_BASE;
9817+
9818+#ifdef CONFIG_PAX_RANDMMAP
9819+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9820+ info.low_limit += mm->delta_mmap;
9821+#endif
9822+
9823 info.high_limit = TASK_SIZE;
9824 addr = vm_unmapped_area(&info);
9825 }
9826diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9827index 4082749..fd97781 100644
9828--- a/arch/sparc/include/asm/atomic_64.h
9829+++ b/arch/sparc/include/asm/atomic_64.h
9830@@ -15,18 +15,38 @@
9831 #define ATOMIC64_INIT(i) { (i) }
9832
9833 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9834+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9835+{
9836+ return ACCESS_ONCE(v->counter);
9837+}
9838 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9839+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9840+{
9841+ return ACCESS_ONCE(v->counter);
9842+}
9843
9844 #define atomic_set(v, i) (((v)->counter) = i)
9845+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9846+{
9847+ v->counter = i;
9848+}
9849 #define atomic64_set(v, i) (((v)->counter) = i)
9850+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9851+{
9852+ v->counter = i;
9853+}
9854
9855-#define ATOMIC_OP(op) \
9856-void atomic_##op(int, atomic_t *); \
9857-void atomic64_##op(long, atomic64_t *);
9858+#define __ATOMIC_OP(op, suffix) \
9859+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9860+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9861
9862-#define ATOMIC_OP_RETURN(op) \
9863-int atomic_##op##_return(int, atomic_t *); \
9864-long atomic64_##op##_return(long, atomic64_t *);
9865+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9866+
9867+#define __ATOMIC_OP_RETURN(op, suffix) \
9868+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9869+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9870+
9871+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9872
9873 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9874
9875@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9876
9877 #undef ATOMIC_OPS
9878 #undef ATOMIC_OP_RETURN
9879+#undef __ATOMIC_OP_RETURN
9880 #undef ATOMIC_OP
9881+#undef __ATOMIC_OP
9882
9883 #define atomic_dec_return(v) atomic_sub_return(1, v)
9884 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9885
9886 #define atomic_inc_return(v) atomic_add_return(1, v)
9887+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9888+{
9889+ return atomic_add_return_unchecked(1, v);
9890+}
9891 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9892+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9893+{
9894+ return atomic64_add_return_unchecked(1, v);
9895+}
9896
9897 /*
9898 * atomic_inc_and_test - increment and test
9899@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9900 * other cases.
9901 */
9902 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9903+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9904+{
9905+ return atomic_inc_return_unchecked(v) == 0;
9906+}
9907 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9908
9909 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9910@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9911 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9912
9913 #define atomic_inc(v) atomic_add(1, v)
9914+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9915+{
9916+ atomic_add_unchecked(1, v);
9917+}
9918 #define atomic64_inc(v) atomic64_add(1, v)
9919+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9920+{
9921+ atomic64_add_unchecked(1, v);
9922+}
9923
9924 #define atomic_dec(v) atomic_sub(1, v)
9925+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9926+{
9927+ atomic_sub_unchecked(1, v);
9928+}
9929 #define atomic64_dec(v) atomic64_sub(1, v)
9930+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9931+{
9932+ atomic64_sub_unchecked(1, v);
9933+}
9934
9935 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9936 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9937
9938 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9939+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9940+{
9941+ return cmpxchg(&v->counter, old, new);
9942+}
9943 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9944+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9945+{
9946+ return xchg(&v->counter, new);
9947+}
9948
9949 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9950 {
9951- int c, old;
9952+ int c, old, new;
9953 c = atomic_read(v);
9954 for (;;) {
9955- if (unlikely(c == (u)))
9956+ if (unlikely(c == u))
9957 break;
9958- old = atomic_cmpxchg((v), c, c + (a));
9959+
9960+ asm volatile("addcc %2, %0, %0\n"
9961+
9962+#ifdef CONFIG_PAX_REFCOUNT
9963+ "tvs %%icc, 6\n"
9964+#endif
9965+
9966+ : "=r" (new)
9967+ : "0" (c), "ir" (a)
9968+ : "cc");
9969+
9970+ old = atomic_cmpxchg(v, c, new);
9971 if (likely(old == c))
9972 break;
9973 c = old;
9974@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9975 #define atomic64_cmpxchg(v, o, n) \
9976 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
9977 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
9978+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
9979+{
9980+ return xchg(&v->counter, new);
9981+}
9982
9983 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
9984 {
9985- long c, old;
9986+ long c, old, new;
9987 c = atomic64_read(v);
9988 for (;;) {
9989- if (unlikely(c == (u)))
9990+ if (unlikely(c == u))
9991 break;
9992- old = atomic64_cmpxchg((v), c, c + (a));
9993+
9994+ asm volatile("addcc %2, %0, %0\n"
9995+
9996+#ifdef CONFIG_PAX_REFCOUNT
9997+ "tvs %%xcc, 6\n"
9998+#endif
9999+
10000+ : "=r" (new)
10001+ : "0" (c), "ir" (a)
10002+ : "cc");
10003+
10004+ old = atomic64_cmpxchg(v, c, new);
10005 if (likely(old == c))
10006 break;
10007 c = old;
10008 }
10009- return c != (u);
10010+ return c != u;
10011 }
10012
10013 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10014diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10015index 7664894..45a974b 100644
10016--- a/arch/sparc/include/asm/barrier_64.h
10017+++ b/arch/sparc/include/asm/barrier_64.h
10018@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10019 do { \
10020 compiletime_assert_atomic_type(*p); \
10021 barrier(); \
10022- ACCESS_ONCE(*p) = (v); \
10023+ ACCESS_ONCE_RW(*p) = (v); \
10024 } while (0)
10025
10026 #define smp_load_acquire(p) \
10027diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10028index 5bb6991..5c2132e 100644
10029--- a/arch/sparc/include/asm/cache.h
10030+++ b/arch/sparc/include/asm/cache.h
10031@@ -7,10 +7,12 @@
10032 #ifndef _SPARC_CACHE_H
10033 #define _SPARC_CACHE_H
10034
10035+#include <linux/const.h>
10036+
10037 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10038
10039 #define L1_CACHE_SHIFT 5
10040-#define L1_CACHE_BYTES 32
10041+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10042
10043 #ifdef CONFIG_SPARC32
10044 #define SMP_CACHE_BYTES_SHIFT 5
10045diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10046index a24e41f..47677ff 100644
10047--- a/arch/sparc/include/asm/elf_32.h
10048+++ b/arch/sparc/include/asm/elf_32.h
10049@@ -114,6 +114,13 @@ typedef struct {
10050
10051 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10052
10053+#ifdef CONFIG_PAX_ASLR
10054+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10055+
10056+#define PAX_DELTA_MMAP_LEN 16
10057+#define PAX_DELTA_STACK_LEN 16
10058+#endif
10059+
10060 /* This yields a mask that user programs can use to figure out what
10061 instruction set this cpu supports. This can NOT be done in userspace
10062 on Sparc. */
10063diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10064index 370ca1e..d4f4a98 100644
10065--- a/arch/sparc/include/asm/elf_64.h
10066+++ b/arch/sparc/include/asm/elf_64.h
10067@@ -189,6 +189,13 @@ typedef struct {
10068 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10069 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10070
10071+#ifdef CONFIG_PAX_ASLR
10072+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10073+
10074+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10075+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10076+#endif
10077+
10078 extern unsigned long sparc64_elf_hwcap;
10079 #define ELF_HWCAP sparc64_elf_hwcap
10080
10081diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10082index a3890da..f6a408e 100644
10083--- a/arch/sparc/include/asm/pgalloc_32.h
10084+++ b/arch/sparc/include/asm/pgalloc_32.h
10085@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10086 }
10087
10088 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10089+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10090
10091 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10092 unsigned long address)
10093diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10094index 5e31871..13469c6 100644
10095--- a/arch/sparc/include/asm/pgalloc_64.h
10096+++ b/arch/sparc/include/asm/pgalloc_64.h
10097@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10098 }
10099
10100 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10101+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10102
10103 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10104 {
10105@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10106 }
10107
10108 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10109+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10110
10111 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10112 {
10113diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10114index 59ba6f6..4518128 100644
10115--- a/arch/sparc/include/asm/pgtable.h
10116+++ b/arch/sparc/include/asm/pgtable.h
10117@@ -5,4 +5,8 @@
10118 #else
10119 #include <asm/pgtable_32.h>
10120 #endif
10121+
10122+#define ktla_ktva(addr) (addr)
10123+#define ktva_ktla(addr) (addr)
10124+
10125 #endif
10126diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10127index f06b36a..bca3189 100644
10128--- a/arch/sparc/include/asm/pgtable_32.h
10129+++ b/arch/sparc/include/asm/pgtable_32.h
10130@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10131 #define PAGE_SHARED SRMMU_PAGE_SHARED
10132 #define PAGE_COPY SRMMU_PAGE_COPY
10133 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10134+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10135+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10136+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10137 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10138
10139 /* Top-level page directory - dummy used by init-mm.
10140@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10141
10142 /* xwr */
10143 #define __P000 PAGE_NONE
10144-#define __P001 PAGE_READONLY
10145-#define __P010 PAGE_COPY
10146-#define __P011 PAGE_COPY
10147+#define __P001 PAGE_READONLY_NOEXEC
10148+#define __P010 PAGE_COPY_NOEXEC
10149+#define __P011 PAGE_COPY_NOEXEC
10150 #define __P100 PAGE_READONLY
10151 #define __P101 PAGE_READONLY
10152 #define __P110 PAGE_COPY
10153 #define __P111 PAGE_COPY
10154
10155 #define __S000 PAGE_NONE
10156-#define __S001 PAGE_READONLY
10157-#define __S010 PAGE_SHARED
10158-#define __S011 PAGE_SHARED
10159+#define __S001 PAGE_READONLY_NOEXEC
10160+#define __S010 PAGE_SHARED_NOEXEC
10161+#define __S011 PAGE_SHARED_NOEXEC
10162 #define __S100 PAGE_READONLY
10163 #define __S101 PAGE_READONLY
10164 #define __S110 PAGE_SHARED
10165diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10166index ae51a11..eadfd03 100644
10167--- a/arch/sparc/include/asm/pgtsrmmu.h
10168+++ b/arch/sparc/include/asm/pgtsrmmu.h
10169@@ -111,6 +111,11 @@
10170 SRMMU_EXEC | SRMMU_REF)
10171 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10172 SRMMU_EXEC | SRMMU_REF)
10173+
10174+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10175+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10176+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10177+
10178 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10179 SRMMU_DIRTY | SRMMU_REF)
10180
10181diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10182index 29d64b1..4272fe8 100644
10183--- a/arch/sparc/include/asm/setup.h
10184+++ b/arch/sparc/include/asm/setup.h
10185@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10186 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10187
10188 /* init_64.c */
10189-extern atomic_t dcpage_flushes;
10190-extern atomic_t dcpage_flushes_xcall;
10191+extern atomic_unchecked_t dcpage_flushes;
10192+extern atomic_unchecked_t dcpage_flushes_xcall;
10193
10194 extern int sysctl_tsb_ratio;
10195 #endif
10196diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10197index 9689176..63c18ea 100644
10198--- a/arch/sparc/include/asm/spinlock_64.h
10199+++ b/arch/sparc/include/asm/spinlock_64.h
10200@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10201
10202 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10203
10204-static void inline arch_read_lock(arch_rwlock_t *lock)
10205+static inline void arch_read_lock(arch_rwlock_t *lock)
10206 {
10207 unsigned long tmp1, tmp2;
10208
10209 __asm__ __volatile__ (
10210 "1: ldsw [%2], %0\n"
10211 " brlz,pn %0, 2f\n"
10212-"4: add %0, 1, %1\n"
10213+"4: addcc %0, 1, %1\n"
10214+
10215+#ifdef CONFIG_PAX_REFCOUNT
10216+" tvs %%icc, 6\n"
10217+#endif
10218+
10219 " cas [%2], %0, %1\n"
10220 " cmp %0, %1\n"
10221 " bne,pn %%icc, 1b\n"
10222@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10223 " .previous"
10224 : "=&r" (tmp1), "=&r" (tmp2)
10225 : "r" (lock)
10226- : "memory");
10227+ : "memory", "cc");
10228 }
10229
10230-static int inline arch_read_trylock(arch_rwlock_t *lock)
10231+static inline int arch_read_trylock(arch_rwlock_t *lock)
10232 {
10233 int tmp1, tmp2;
10234
10235@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10236 "1: ldsw [%2], %0\n"
10237 " brlz,a,pn %0, 2f\n"
10238 " mov 0, %0\n"
10239-" add %0, 1, %1\n"
10240+" addcc %0, 1, %1\n"
10241+
10242+#ifdef CONFIG_PAX_REFCOUNT
10243+" tvs %%icc, 6\n"
10244+#endif
10245+
10246 " cas [%2], %0, %1\n"
10247 " cmp %0, %1\n"
10248 " bne,pn %%icc, 1b\n"
10249@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10250 return tmp1;
10251 }
10252
10253-static void inline arch_read_unlock(arch_rwlock_t *lock)
10254+static inline void arch_read_unlock(arch_rwlock_t *lock)
10255 {
10256 unsigned long tmp1, tmp2;
10257
10258 __asm__ __volatile__(
10259 "1: lduw [%2], %0\n"
10260-" sub %0, 1, %1\n"
10261+" subcc %0, 1, %1\n"
10262+
10263+#ifdef CONFIG_PAX_REFCOUNT
10264+" tvs %%icc, 6\n"
10265+#endif
10266+
10267 " cas [%2], %0, %1\n"
10268 " cmp %0, %1\n"
10269 " bne,pn %%xcc, 1b\n"
10270@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10271 : "memory");
10272 }
10273
10274-static void inline arch_write_lock(arch_rwlock_t *lock)
10275+static inline void arch_write_lock(arch_rwlock_t *lock)
10276 {
10277 unsigned long mask, tmp1, tmp2;
10278
10279@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10280 : "memory");
10281 }
10282
10283-static void inline arch_write_unlock(arch_rwlock_t *lock)
10284+static inline void arch_write_unlock(arch_rwlock_t *lock)
10285 {
10286 __asm__ __volatile__(
10287 " stw %%g0, [%0]"
10288@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10289 : "memory");
10290 }
10291
10292-static int inline arch_write_trylock(arch_rwlock_t *lock)
10293+static inline int arch_write_trylock(arch_rwlock_t *lock)
10294 {
10295 unsigned long mask, tmp1, tmp2, result;
10296
10297diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10298index 229475f..2fca9163 100644
10299--- a/arch/sparc/include/asm/thread_info_32.h
10300+++ b/arch/sparc/include/asm/thread_info_32.h
10301@@ -48,6 +48,7 @@ struct thread_info {
10302 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10303 unsigned long rwbuf_stkptrs[NSWINS];
10304 unsigned long w_saved;
10305+ unsigned long lowest_stack;
10306 };
10307
10308 /*
10309diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10310index bde5982..9cbb56d 100644
10311--- a/arch/sparc/include/asm/thread_info_64.h
10312+++ b/arch/sparc/include/asm/thread_info_64.h
10313@@ -59,6 +59,8 @@ struct thread_info {
10314 struct pt_regs *kern_una_regs;
10315 unsigned int kern_una_insn;
10316
10317+ unsigned long lowest_stack;
10318+
10319 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10320 __attribute__ ((aligned(64)));
10321 };
10322@@ -180,12 +182,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10323 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10324 /* flag bit 4 is available */
10325 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10326-/* flag bit 6 is available */
10327+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10328 #define TIF_32BIT 7 /* 32-bit binary */
10329 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10330 #define TIF_SECCOMP 9 /* secure computing */
10331 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10332 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10333+
10334 /* NOTE: Thread flags >= 12 should be ones we have no interest
10335 * in using in assembly, else we can't use the mask as
10336 * an immediate value in instructions such as andcc.
10337@@ -205,12 +208,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10338 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10339 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10340 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10341+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10342
10343 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10344 _TIF_DO_NOTIFY_RESUME_MASK | \
10345 _TIF_NEED_RESCHED)
10346 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10347
10348+#define _TIF_WORK_SYSCALL \
10349+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10350+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10351+
10352 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10353
10354 /*
10355diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10356index bd56c28..4b63d83 100644
10357--- a/arch/sparc/include/asm/uaccess.h
10358+++ b/arch/sparc/include/asm/uaccess.h
10359@@ -1,5 +1,6 @@
10360 #ifndef ___ASM_SPARC_UACCESS_H
10361 #define ___ASM_SPARC_UACCESS_H
10362+
10363 #if defined(__sparc__) && defined(__arch64__)
10364 #include <asm/uaccess_64.h>
10365 #else
10366diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10367index 64ee103..388aef0 100644
10368--- a/arch/sparc/include/asm/uaccess_32.h
10369+++ b/arch/sparc/include/asm/uaccess_32.h
10370@@ -47,6 +47,7 @@
10371 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10372 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10373 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10374+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10375 #define access_ok(type, addr, size) \
10376 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10377
10378@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10379
10380 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10381 {
10382- if (n && __access_ok((unsigned long) to, n))
10383+ if ((long)n < 0)
10384+ return n;
10385+
10386+ if (n && __access_ok((unsigned long) to, n)) {
10387+ if (!__builtin_constant_p(n))
10388+ check_object_size(from, n, true);
10389 return __copy_user(to, (__force void __user *) from, n);
10390- else
10391+ } else
10392 return n;
10393 }
10394
10395 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10396 {
10397+ if ((long)n < 0)
10398+ return n;
10399+
10400+ if (!__builtin_constant_p(n))
10401+ check_object_size(from, n, true);
10402+
10403 return __copy_user(to, (__force void __user *) from, n);
10404 }
10405
10406 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10407 {
10408- if (n && __access_ok((unsigned long) from, n))
10409+ if ((long)n < 0)
10410+ return n;
10411+
10412+ if (n && __access_ok((unsigned long) from, n)) {
10413+ if (!__builtin_constant_p(n))
10414+ check_object_size(to, n, false);
10415 return __copy_user((__force void __user *) to, from, n);
10416- else
10417+ } else
10418 return n;
10419 }
10420
10421 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10422 {
10423+ if ((long)n < 0)
10424+ return n;
10425+
10426 return __copy_user((__force void __user *) to, from, n);
10427 }
10428
10429diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10430index a35194b..47dabc0d 100644
10431--- a/arch/sparc/include/asm/uaccess_64.h
10432+++ b/arch/sparc/include/asm/uaccess_64.h
10433@@ -10,6 +10,7 @@
10434 #include <linux/compiler.h>
10435 #include <linux/string.h>
10436 #include <linux/thread_info.h>
10437+#include <linux/kernel.h>
10438 #include <asm/asi.h>
10439 #include <asm/spitfire.h>
10440 #include <asm-generic/uaccess-unaligned.h>
10441@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10442 return 1;
10443 }
10444
10445+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10446+{
10447+ return 1;
10448+}
10449+
10450 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10451 {
10452 return 1;
10453@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10454 static inline unsigned long __must_check
10455 copy_from_user(void *to, const void __user *from, unsigned long size)
10456 {
10457- unsigned long ret = ___copy_from_user(to, from, size);
10458+ unsigned long ret;
10459
10460+ if ((long)size < 0 || size > INT_MAX)
10461+ return size;
10462+
10463+ if (!__builtin_constant_p(size))
10464+ check_object_size(to, size, false);
10465+
10466+ ret = ___copy_from_user(to, from, size);
10467 if (unlikely(ret))
10468 ret = copy_from_user_fixup(to, from, size);
10469
10470@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10471 static inline unsigned long __must_check
10472 copy_to_user(void __user *to, const void *from, unsigned long size)
10473 {
10474- unsigned long ret = ___copy_to_user(to, from, size);
10475+ unsigned long ret;
10476
10477+ if ((long)size < 0 || size > INT_MAX)
10478+ return size;
10479+
10480+ if (!__builtin_constant_p(size))
10481+ check_object_size(from, size, true);
10482+
10483+ ret = ___copy_to_user(to, from, size);
10484 if (unlikely(ret))
10485 ret = copy_to_user_fixup(to, from, size);
10486 return ret;
10487diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10488index 7cf9c6e..6206648 100644
10489--- a/arch/sparc/kernel/Makefile
10490+++ b/arch/sparc/kernel/Makefile
10491@@ -4,7 +4,7 @@
10492 #
10493
10494 asflags-y := -ansi
10495-ccflags-y := -Werror
10496+#ccflags-y := -Werror
10497
10498 extra-y := head_$(BITS).o
10499
10500diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10501index 50e7b62..79fae35 100644
10502--- a/arch/sparc/kernel/process_32.c
10503+++ b/arch/sparc/kernel/process_32.c
10504@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10505
10506 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10507 r->psr, r->pc, r->npc, r->y, print_tainted());
10508- printk("PC: <%pS>\n", (void *) r->pc);
10509+ printk("PC: <%pA>\n", (void *) r->pc);
10510 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10511 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10512 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10513 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10514 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10515 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10516- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10517+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10518
10519 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10520 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10521@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10522 rw = (struct reg_window32 *) fp;
10523 pc = rw->ins[7];
10524 printk("[%08lx : ", pc);
10525- printk("%pS ] ", (void *) pc);
10526+ printk("%pA ] ", (void *) pc);
10527 fp = rw->ins[6];
10528 } while (++count < 16);
10529 printk("\n");
10530diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10531index 46a5964..a35c62c 100644
10532--- a/arch/sparc/kernel/process_64.c
10533+++ b/arch/sparc/kernel/process_64.c
10534@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10535 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10536 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10537 if (regs->tstate & TSTATE_PRIV)
10538- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10539+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10540 }
10541
10542 void show_regs(struct pt_regs *regs)
10543@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10544
10545 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10546 regs->tpc, regs->tnpc, regs->y, print_tainted());
10547- printk("TPC: <%pS>\n", (void *) regs->tpc);
10548+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10549 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10550 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10551 regs->u_regs[3]);
10552@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10553 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10554 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10555 regs->u_regs[15]);
10556- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10557+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10558 show_regwindow(regs);
10559 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10560 }
10561@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10562 ((tp && tp->task) ? tp->task->pid : -1));
10563
10564 if (gp->tstate & TSTATE_PRIV) {
10565- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10566+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10567 (void *) gp->tpc,
10568 (void *) gp->o7,
10569 (void *) gp->i7,
10570diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10571index 79cc0d1..ec62734 100644
10572--- a/arch/sparc/kernel/prom_common.c
10573+++ b/arch/sparc/kernel/prom_common.c
10574@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10575
10576 unsigned int prom_early_allocated __initdata;
10577
10578-static struct of_pdt_ops prom_sparc_ops __initdata = {
10579+static struct of_pdt_ops prom_sparc_ops __initconst = {
10580 .nextprop = prom_common_nextprop,
10581 .getproplen = prom_getproplen,
10582 .getproperty = prom_getproperty,
10583diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10584index 9ddc492..27a5619 100644
10585--- a/arch/sparc/kernel/ptrace_64.c
10586+++ b/arch/sparc/kernel/ptrace_64.c
10587@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10588 return ret;
10589 }
10590
10591+#ifdef CONFIG_GRKERNSEC_SETXID
10592+extern void gr_delayed_cred_worker(void);
10593+#endif
10594+
10595 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10596 {
10597 int ret = 0;
10598@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10599 if (test_thread_flag(TIF_NOHZ))
10600 user_exit();
10601
10602+#ifdef CONFIG_GRKERNSEC_SETXID
10603+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10604+ gr_delayed_cred_worker();
10605+#endif
10606+
10607 if (test_thread_flag(TIF_SYSCALL_TRACE))
10608 ret = tracehook_report_syscall_entry(regs);
10609
10610@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10611 if (test_thread_flag(TIF_NOHZ))
10612 user_exit();
10613
10614+#ifdef CONFIG_GRKERNSEC_SETXID
10615+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10616+ gr_delayed_cred_worker();
10617+#endif
10618+
10619 audit_syscall_exit(regs);
10620
10621 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10622diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10623index 19cd08d..ff21e99 100644
10624--- a/arch/sparc/kernel/smp_64.c
10625+++ b/arch/sparc/kernel/smp_64.c
10626@@ -891,7 +891,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10627 return;
10628
10629 #ifdef CONFIG_DEBUG_DCFLUSH
10630- atomic_inc(&dcpage_flushes);
10631+ atomic_inc_unchecked(&dcpage_flushes);
10632 #endif
10633
10634 this_cpu = get_cpu();
10635@@ -915,7 +915,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10636 xcall_deliver(data0, __pa(pg_addr),
10637 (u64) pg_addr, cpumask_of(cpu));
10638 #ifdef CONFIG_DEBUG_DCFLUSH
10639- atomic_inc(&dcpage_flushes_xcall);
10640+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10641 #endif
10642 }
10643 }
10644@@ -934,7 +934,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10645 preempt_disable();
10646
10647 #ifdef CONFIG_DEBUG_DCFLUSH
10648- atomic_inc(&dcpage_flushes);
10649+ atomic_inc_unchecked(&dcpage_flushes);
10650 #endif
10651 data0 = 0;
10652 pg_addr = page_address(page);
10653@@ -951,7 +951,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10654 xcall_deliver(data0, __pa(pg_addr),
10655 (u64) pg_addr, cpu_online_mask);
10656 #ifdef CONFIG_DEBUG_DCFLUSH
10657- atomic_inc(&dcpage_flushes_xcall);
10658+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10659 #endif
10660 }
10661 __local_flush_dcache_page(page);
10662diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10663index 646988d..b88905f 100644
10664--- a/arch/sparc/kernel/sys_sparc_32.c
10665+++ b/arch/sparc/kernel/sys_sparc_32.c
10666@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10667 if (len > TASK_SIZE - PAGE_SIZE)
10668 return -ENOMEM;
10669 if (!addr)
10670- addr = TASK_UNMAPPED_BASE;
10671+ addr = current->mm->mmap_base;
10672
10673 info.flags = 0;
10674 info.length = len;
10675diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10676index 30e7ddb..266a3b0 100644
10677--- a/arch/sparc/kernel/sys_sparc_64.c
10678+++ b/arch/sparc/kernel/sys_sparc_64.c
10679@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10680 struct vm_area_struct * vma;
10681 unsigned long task_size = TASK_SIZE;
10682 int do_color_align;
10683+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10684 struct vm_unmapped_area_info info;
10685
10686 if (flags & MAP_FIXED) {
10687 /* We do not accept a shared mapping if it would violate
10688 * cache aliasing constraints.
10689 */
10690- if ((flags & MAP_SHARED) &&
10691+ if ((filp || (flags & MAP_SHARED)) &&
10692 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10693 return -EINVAL;
10694 return addr;
10695@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10696 if (filp || (flags & MAP_SHARED))
10697 do_color_align = 1;
10698
10699+#ifdef CONFIG_PAX_RANDMMAP
10700+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10701+#endif
10702+
10703 if (addr) {
10704 if (do_color_align)
10705 addr = COLOR_ALIGN(addr, pgoff);
10706@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10707 addr = PAGE_ALIGN(addr);
10708
10709 vma = find_vma(mm, addr);
10710- if (task_size - len >= addr &&
10711- (!vma || addr + len <= vma->vm_start))
10712+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10713 return addr;
10714 }
10715
10716 info.flags = 0;
10717 info.length = len;
10718- info.low_limit = TASK_UNMAPPED_BASE;
10719+ info.low_limit = mm->mmap_base;
10720 info.high_limit = min(task_size, VA_EXCLUDE_START);
10721 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10722 info.align_offset = pgoff << PAGE_SHIFT;
10723+ info.threadstack_offset = offset;
10724 addr = vm_unmapped_area(&info);
10725
10726 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10727 VM_BUG_ON(addr != -ENOMEM);
10728 info.low_limit = VA_EXCLUDE_END;
10729+
10730+#ifdef CONFIG_PAX_RANDMMAP
10731+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10732+ info.low_limit += mm->delta_mmap;
10733+#endif
10734+
10735 info.high_limit = task_size;
10736 addr = vm_unmapped_area(&info);
10737 }
10738@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10739 unsigned long task_size = STACK_TOP32;
10740 unsigned long addr = addr0;
10741 int do_color_align;
10742+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10743 struct vm_unmapped_area_info info;
10744
10745 /* This should only ever run for 32-bit processes. */
10746@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10747 /* We do not accept a shared mapping if it would violate
10748 * cache aliasing constraints.
10749 */
10750- if ((flags & MAP_SHARED) &&
10751+ if ((filp || (flags & MAP_SHARED)) &&
10752 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10753 return -EINVAL;
10754 return addr;
10755@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10756 if (filp || (flags & MAP_SHARED))
10757 do_color_align = 1;
10758
10759+#ifdef CONFIG_PAX_RANDMMAP
10760+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10761+#endif
10762+
10763 /* requesting a specific address */
10764 if (addr) {
10765 if (do_color_align)
10766@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10767 addr = PAGE_ALIGN(addr);
10768
10769 vma = find_vma(mm, addr);
10770- if (task_size - len >= addr &&
10771- (!vma || addr + len <= vma->vm_start))
10772+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10773 return addr;
10774 }
10775
10776@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10777 info.high_limit = mm->mmap_base;
10778 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10779 info.align_offset = pgoff << PAGE_SHIFT;
10780+ info.threadstack_offset = offset;
10781 addr = vm_unmapped_area(&info);
10782
10783 /*
10784@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10785 VM_BUG_ON(addr != -ENOMEM);
10786 info.flags = 0;
10787 info.low_limit = TASK_UNMAPPED_BASE;
10788+
10789+#ifdef CONFIG_PAX_RANDMMAP
10790+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10791+ info.low_limit += mm->delta_mmap;
10792+#endif
10793+
10794 info.high_limit = STACK_TOP32;
10795 addr = vm_unmapped_area(&info);
10796 }
10797@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10798 EXPORT_SYMBOL(get_fb_unmapped_area);
10799
10800 /* Essentially the same as PowerPC. */
10801-static unsigned long mmap_rnd(void)
10802+static unsigned long mmap_rnd(struct mm_struct *mm)
10803 {
10804 unsigned long rnd = 0UL;
10805
10806+#ifdef CONFIG_PAX_RANDMMAP
10807+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10808+#endif
10809+
10810 if (current->flags & PF_RANDOMIZE) {
10811 unsigned long val = get_random_int();
10812 if (test_thread_flag(TIF_32BIT))
10813@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10814
10815 void arch_pick_mmap_layout(struct mm_struct *mm)
10816 {
10817- unsigned long random_factor = mmap_rnd();
10818+ unsigned long random_factor = mmap_rnd(mm);
10819 unsigned long gap;
10820
10821 /*
10822@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10823 gap == RLIM_INFINITY ||
10824 sysctl_legacy_va_layout) {
10825 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10826+
10827+#ifdef CONFIG_PAX_RANDMMAP
10828+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10829+ mm->mmap_base += mm->delta_mmap;
10830+#endif
10831+
10832 mm->get_unmapped_area = arch_get_unmapped_area;
10833 } else {
10834 /* We know it's 32-bit */
10835@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10836 gap = (task_size / 6 * 5);
10837
10838 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10839+
10840+#ifdef CONFIG_PAX_RANDMMAP
10841+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10842+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10843+#endif
10844+
10845 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10846 }
10847 }
10848diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10849index bb00089..e0ea580 100644
10850--- a/arch/sparc/kernel/syscalls.S
10851+++ b/arch/sparc/kernel/syscalls.S
10852@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10853 #endif
10854 .align 32
10855 1: ldx [%g6 + TI_FLAGS], %l5
10856- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10857+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10858 be,pt %icc, rtrap
10859 nop
10860 call syscall_trace_leave
10861@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10862
10863 srl %i3, 0, %o3 ! IEU0
10864 srl %i2, 0, %o2 ! IEU0 Group
10865- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10866+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10867 bne,pn %icc, linux_syscall_trace32 ! CTI
10868 mov %i0, %l5 ! IEU1
10869 5: call %l7 ! CTI Group brk forced
10870@@ -218,7 +218,7 @@ linux_sparc_syscall:
10871
10872 mov %i3, %o3 ! IEU1
10873 mov %i4, %o4 ! IEU0 Group
10874- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10875+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10876 bne,pn %icc, linux_syscall_trace ! CTI Group
10877 mov %i0, %l5 ! IEU0
10878 2: call %l7 ! CTI Group brk forced
10879@@ -233,7 +233,7 @@ ret_sys_call:
10880
10881 cmp %o0, -ERESTART_RESTARTBLOCK
10882 bgeu,pn %xcc, 1f
10883- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10884+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10885 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10886
10887 2:
10888diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10889index 4f21df7..0a374da 100644
10890--- a/arch/sparc/kernel/traps_32.c
10891+++ b/arch/sparc/kernel/traps_32.c
10892@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10893 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10894 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10895
10896+extern void gr_handle_kernel_exploit(void);
10897+
10898 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10899 {
10900 static int die_counter;
10901@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10902 count++ < 30 &&
10903 (((unsigned long) rw) >= PAGE_OFFSET) &&
10904 !(((unsigned long) rw) & 0x7)) {
10905- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10906+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10907 (void *) rw->ins[7]);
10908 rw = (struct reg_window32 *)rw->ins[6];
10909 }
10910 }
10911 printk("Instruction DUMP:");
10912 instruction_dump ((unsigned long *) regs->pc);
10913- if(regs->psr & PSR_PS)
10914+ if(regs->psr & PSR_PS) {
10915+ gr_handle_kernel_exploit();
10916 do_exit(SIGKILL);
10917+ }
10918 do_exit(SIGSEGV);
10919 }
10920
10921diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10922index d21cd62..00a4a17 100644
10923--- a/arch/sparc/kernel/traps_64.c
10924+++ b/arch/sparc/kernel/traps_64.c
10925@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10926 i + 1,
10927 p->trapstack[i].tstate, p->trapstack[i].tpc,
10928 p->trapstack[i].tnpc, p->trapstack[i].tt);
10929- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10930+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10931 }
10932 }
10933
10934@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10935
10936 lvl -= 0x100;
10937 if (regs->tstate & TSTATE_PRIV) {
10938+
10939+#ifdef CONFIG_PAX_REFCOUNT
10940+ if (lvl == 6)
10941+ pax_report_refcount_overflow(regs);
10942+#endif
10943+
10944 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10945 die_if_kernel(buffer, regs);
10946 }
10947@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10948 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10949 {
10950 char buffer[32];
10951-
10952+
10953 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10954 0, lvl, SIGTRAP) == NOTIFY_STOP)
10955 return;
10956
10957+#ifdef CONFIG_PAX_REFCOUNT
10958+ if (lvl == 6)
10959+ pax_report_refcount_overflow(regs);
10960+#endif
10961+
10962 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10963
10964 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10965@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
10966 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10967 printk("%s" "ERROR(%d): ",
10968 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10969- printk("TPC<%pS>\n", (void *) regs->tpc);
10970+ printk("TPC<%pA>\n", (void *) regs->tpc);
10971 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10972 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10973 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10974@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10975 smp_processor_id(),
10976 (type & 0x1) ? 'I' : 'D',
10977 regs->tpc);
10978- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
10979+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
10980 panic("Irrecoverable Cheetah+ parity error.");
10981 }
10982
10983@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10984 smp_processor_id(),
10985 (type & 0x1) ? 'I' : 'D',
10986 regs->tpc);
10987- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
10988+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
10989 }
10990
10991 struct sun4v_error_entry {
10992@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
10993 /*0x38*/u64 reserved_5;
10994 };
10995
10996-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10997-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
10998+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
10999+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11000
11001 static const char *sun4v_err_type_to_str(u8 type)
11002 {
11003@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11004 }
11005
11006 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11007- int cpu, const char *pfx, atomic_t *ocnt)
11008+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11009 {
11010 u64 *raw_ptr = (u64 *) ent;
11011 u32 attrs;
11012@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11013
11014 show_regs(regs);
11015
11016- if ((cnt = atomic_read(ocnt)) != 0) {
11017- atomic_set(ocnt, 0);
11018+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11019+ atomic_set_unchecked(ocnt, 0);
11020 wmb();
11021 printk("%s: Queue overflowed %d times.\n",
11022 pfx, cnt);
11023@@ -2048,7 +2059,7 @@ out:
11024 */
11025 void sun4v_resum_overflow(struct pt_regs *regs)
11026 {
11027- atomic_inc(&sun4v_resum_oflow_cnt);
11028+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11029 }
11030
11031 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11032@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11033 /* XXX Actually even this can make not that much sense. Perhaps
11034 * XXX we should just pull the plug and panic directly from here?
11035 */
11036- atomic_inc(&sun4v_nonresum_oflow_cnt);
11037+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11038 }
11039
11040 static void sun4v_tlb_error(struct pt_regs *regs)
11041@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11042
11043 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11044 regs->tpc, tl);
11045- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11046+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11047 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11048- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11049+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11050 (void *) regs->u_regs[UREG_I7]);
11051 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11052 "pte[%lx] error[%lx]\n",
11053@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11054
11055 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11056 regs->tpc, tl);
11057- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11058+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11059 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11060- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11061+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11062 (void *) regs->u_regs[UREG_I7]);
11063 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11064 "pte[%lx] error[%lx]\n",
11065@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11066 fp = (unsigned long)sf->fp + STACK_BIAS;
11067 }
11068
11069- printk(" [%016lx] %pS\n", pc, (void *) pc);
11070+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11071 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11072 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11073 int index = tsk->curr_ret_stack;
11074 if (tsk->ret_stack && index >= graph) {
11075 pc = tsk->ret_stack[index - graph].ret;
11076- printk(" [%016lx] %pS\n", pc, (void *) pc);
11077+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11078 graph++;
11079 }
11080 }
11081@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11082 return (struct reg_window *) (fp + STACK_BIAS);
11083 }
11084
11085+extern void gr_handle_kernel_exploit(void);
11086+
11087 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11088 {
11089 static int die_counter;
11090@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11091 while (rw &&
11092 count++ < 30 &&
11093 kstack_valid(tp, (unsigned long) rw)) {
11094- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11095+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11096 (void *) rw->ins[7]);
11097
11098 rw = kernel_stack_up(rw);
11099@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11100 }
11101 if (panic_on_oops)
11102 panic("Fatal exception");
11103- if (regs->tstate & TSTATE_PRIV)
11104+ if (regs->tstate & TSTATE_PRIV) {
11105+ gr_handle_kernel_exploit();
11106 do_exit(SIGKILL);
11107+ }
11108 do_exit(SIGSEGV);
11109 }
11110 EXPORT_SYMBOL(die_if_kernel);
11111diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11112index 62098a8..547ab2c 100644
11113--- a/arch/sparc/kernel/unaligned_64.c
11114+++ b/arch/sparc/kernel/unaligned_64.c
11115@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11116 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11117
11118 if (__ratelimit(&ratelimit)) {
11119- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11120+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11121 regs->tpc, (void *) regs->tpc);
11122 }
11123 }
11124diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11125index 3269b02..64f5231 100644
11126--- a/arch/sparc/lib/Makefile
11127+++ b/arch/sparc/lib/Makefile
11128@@ -2,7 +2,7 @@
11129 #
11130
11131 asflags-y := -ansi -DST_DIV0=0x02
11132-ccflags-y := -Werror
11133+#ccflags-y := -Werror
11134
11135 lib-$(CONFIG_SPARC32) += ashrdi3.o
11136 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11137diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11138index 05dac43..76f8ed4 100644
11139--- a/arch/sparc/lib/atomic_64.S
11140+++ b/arch/sparc/lib/atomic_64.S
11141@@ -15,11 +15,22 @@
11142 * a value and does the barriers.
11143 */
11144
11145-#define ATOMIC_OP(op) \
11146-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11147+#ifdef CONFIG_PAX_REFCOUNT
11148+#define __REFCOUNT_OP(op) op##cc
11149+#define __OVERFLOW_IOP tvs %icc, 6;
11150+#define __OVERFLOW_XOP tvs %xcc, 6;
11151+#else
11152+#define __REFCOUNT_OP(op) op
11153+#define __OVERFLOW_IOP
11154+#define __OVERFLOW_XOP
11155+#endif
11156+
11157+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11158+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11159 BACKOFF_SETUP(%o2); \
11160 1: lduw [%o1], %g1; \
11161- op %g1, %o0, %g7; \
11162+ asm_op %g1, %o0, %g7; \
11163+ post_op \
11164 cas [%o1], %g1, %g7; \
11165 cmp %g1, %g7; \
11166 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11167@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11168 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11169 ENDPROC(atomic_##op); \
11170
11171-#define ATOMIC_OP_RETURN(op) \
11172-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11173+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11174+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11175+
11176+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11177+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11178 BACKOFF_SETUP(%o2); \
11179 1: lduw [%o1], %g1; \
11180- op %g1, %o0, %g7; \
11181+ asm_op %g1, %o0, %g7; \
11182+ post_op \
11183 cas [%o1], %g1, %g7; \
11184 cmp %g1, %g7; \
11185 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11186@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11187 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11188 ENDPROC(atomic_##op##_return);
11189
11190+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11191+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11192+
11193 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11194
11195 ATOMIC_OPS(add)
11196@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11197
11198 #undef ATOMIC_OPS
11199 #undef ATOMIC_OP_RETURN
11200+#undef __ATOMIC_OP_RETURN
11201 #undef ATOMIC_OP
11202+#undef __ATOMIC_OP
11203
11204-#define ATOMIC64_OP(op) \
11205-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11206+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11207+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11208 BACKOFF_SETUP(%o2); \
11209 1: ldx [%o1], %g1; \
11210- op %g1, %o0, %g7; \
11211+ asm_op %g1, %o0, %g7; \
11212+ post_op \
11213 casx [%o1], %g1, %g7; \
11214 cmp %g1, %g7; \
11215 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11216@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11217 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11218 ENDPROC(atomic64_##op); \
11219
11220-#define ATOMIC64_OP_RETURN(op) \
11221-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11222+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11223+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11224+
11225+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11226+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11227 BACKOFF_SETUP(%o2); \
11228 1: ldx [%o1], %g1; \
11229- op %g1, %o0, %g7; \
11230+ asm_op %g1, %o0, %g7; \
11231+ post_op \
11232 casx [%o1], %g1, %g7; \
11233 cmp %g1, %g7; \
11234 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11235@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11236 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11237 ENDPROC(atomic64_##op##_return);
11238
11239+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11240+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11241+
11242 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11243
11244 ATOMIC64_OPS(add)
11245@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11246
11247 #undef ATOMIC64_OPS
11248 #undef ATOMIC64_OP_RETURN
11249+#undef __ATOMIC64_OP_RETURN
11250 #undef ATOMIC64_OP
11251+#undef __ATOMIC64_OP
11252+#undef __OVERFLOW_XOP
11253+#undef __OVERFLOW_IOP
11254+#undef __REFCOUNT_OP
11255
11256 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11257 BACKOFF_SETUP(%o2)
11258diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11259index 8069ce1..c2e23c4 100644
11260--- a/arch/sparc/lib/ksyms.c
11261+++ b/arch/sparc/lib/ksyms.c
11262@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11263 /* Atomic counter implementation. */
11264 #define ATOMIC_OP(op) \
11265 EXPORT_SYMBOL(atomic_##op); \
11266-EXPORT_SYMBOL(atomic64_##op);
11267+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11268+EXPORT_SYMBOL(atomic64_##op); \
11269+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11270
11271 #define ATOMIC_OP_RETURN(op) \
11272 EXPORT_SYMBOL(atomic_##op##_return); \
11273@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11274 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11275
11276 ATOMIC_OPS(add)
11277+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11278+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11279 ATOMIC_OPS(sub)
11280
11281 #undef ATOMIC_OPS
11282diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11283index 30c3ecc..736f015 100644
11284--- a/arch/sparc/mm/Makefile
11285+++ b/arch/sparc/mm/Makefile
11286@@ -2,7 +2,7 @@
11287 #
11288
11289 asflags-y := -ansi
11290-ccflags-y := -Werror
11291+#ccflags-y := -Werror
11292
11293 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11294 obj-y += fault_$(BITS).o
11295diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11296index 70d8171..274c6c0 100644
11297--- a/arch/sparc/mm/fault_32.c
11298+++ b/arch/sparc/mm/fault_32.c
11299@@ -21,6 +21,9 @@
11300 #include <linux/perf_event.h>
11301 #include <linux/interrupt.h>
11302 #include <linux/kdebug.h>
11303+#include <linux/slab.h>
11304+#include <linux/pagemap.h>
11305+#include <linux/compiler.h>
11306
11307 #include <asm/page.h>
11308 #include <asm/pgtable.h>
11309@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11310 return safe_compute_effective_address(regs, insn);
11311 }
11312
11313+#ifdef CONFIG_PAX_PAGEEXEC
11314+#ifdef CONFIG_PAX_DLRESOLVE
11315+static void pax_emuplt_close(struct vm_area_struct *vma)
11316+{
11317+ vma->vm_mm->call_dl_resolve = 0UL;
11318+}
11319+
11320+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11321+{
11322+ unsigned int *kaddr;
11323+
11324+ vmf->page = alloc_page(GFP_HIGHUSER);
11325+ if (!vmf->page)
11326+ return VM_FAULT_OOM;
11327+
11328+ kaddr = kmap(vmf->page);
11329+ memset(kaddr, 0, PAGE_SIZE);
11330+ kaddr[0] = 0x9DE3BFA8U; /* save */
11331+ flush_dcache_page(vmf->page);
11332+ kunmap(vmf->page);
11333+ return VM_FAULT_MAJOR;
11334+}
11335+
11336+static const struct vm_operations_struct pax_vm_ops = {
11337+ .close = pax_emuplt_close,
11338+ .fault = pax_emuplt_fault
11339+};
11340+
11341+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11342+{
11343+ int ret;
11344+
11345+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11346+ vma->vm_mm = current->mm;
11347+ vma->vm_start = addr;
11348+ vma->vm_end = addr + PAGE_SIZE;
11349+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11350+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11351+ vma->vm_ops = &pax_vm_ops;
11352+
11353+ ret = insert_vm_struct(current->mm, vma);
11354+ if (ret)
11355+ return ret;
11356+
11357+ ++current->mm->total_vm;
11358+ return 0;
11359+}
11360+#endif
11361+
11362+/*
11363+ * PaX: decide what to do with offenders (regs->pc = fault address)
11364+ *
11365+ * returns 1 when task should be killed
11366+ * 2 when patched PLT trampoline was detected
11367+ * 3 when unpatched PLT trampoline was detected
11368+ */
11369+static int pax_handle_fetch_fault(struct pt_regs *regs)
11370+{
11371+
11372+#ifdef CONFIG_PAX_EMUPLT
11373+ int err;
11374+
11375+ do { /* PaX: patched PLT emulation #1 */
11376+ unsigned int sethi1, sethi2, jmpl;
11377+
11378+ err = get_user(sethi1, (unsigned int *)regs->pc);
11379+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11380+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11381+
11382+ if (err)
11383+ break;
11384+
11385+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11386+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11387+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11388+ {
11389+ unsigned int addr;
11390+
11391+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11392+ addr = regs->u_regs[UREG_G1];
11393+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11394+ regs->pc = addr;
11395+ regs->npc = addr+4;
11396+ return 2;
11397+ }
11398+ } while (0);
11399+
11400+ do { /* PaX: patched PLT emulation #2 */
11401+ unsigned int ba;
11402+
11403+ err = get_user(ba, (unsigned int *)regs->pc);
11404+
11405+ if (err)
11406+ break;
11407+
11408+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11409+ unsigned int addr;
11410+
11411+ if ((ba & 0xFFC00000U) == 0x30800000U)
11412+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11413+ else
11414+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11415+ regs->pc = addr;
11416+ regs->npc = addr+4;
11417+ return 2;
11418+ }
11419+ } while (0);
11420+
11421+ do { /* PaX: patched PLT emulation #3 */
11422+ unsigned int sethi, bajmpl, nop;
11423+
11424+ err = get_user(sethi, (unsigned int *)regs->pc);
11425+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11426+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11427+
11428+ if (err)
11429+ break;
11430+
11431+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11432+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11433+ nop == 0x01000000U)
11434+ {
11435+ unsigned int addr;
11436+
11437+ addr = (sethi & 0x003FFFFFU) << 10;
11438+ regs->u_regs[UREG_G1] = addr;
11439+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11440+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11441+ else
11442+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11443+ regs->pc = addr;
11444+ regs->npc = addr+4;
11445+ return 2;
11446+ }
11447+ } while (0);
11448+
11449+ do { /* PaX: unpatched PLT emulation step 1 */
11450+ unsigned int sethi, ba, nop;
11451+
11452+ err = get_user(sethi, (unsigned int *)regs->pc);
11453+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11454+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11455+
11456+ if (err)
11457+ break;
11458+
11459+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11460+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11461+ nop == 0x01000000U)
11462+ {
11463+ unsigned int addr, save, call;
11464+
11465+ if ((ba & 0xFFC00000U) == 0x30800000U)
11466+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11467+ else
11468+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11469+
11470+ err = get_user(save, (unsigned int *)addr);
11471+ err |= get_user(call, (unsigned int *)(addr+4));
11472+ err |= get_user(nop, (unsigned int *)(addr+8));
11473+ if (err)
11474+ break;
11475+
11476+#ifdef CONFIG_PAX_DLRESOLVE
11477+ if (save == 0x9DE3BFA8U &&
11478+ (call & 0xC0000000U) == 0x40000000U &&
11479+ nop == 0x01000000U)
11480+ {
11481+ struct vm_area_struct *vma;
11482+ unsigned long call_dl_resolve;
11483+
11484+ down_read(&current->mm->mmap_sem);
11485+ call_dl_resolve = current->mm->call_dl_resolve;
11486+ up_read(&current->mm->mmap_sem);
11487+ if (likely(call_dl_resolve))
11488+ goto emulate;
11489+
11490+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11491+
11492+ down_write(&current->mm->mmap_sem);
11493+ if (current->mm->call_dl_resolve) {
11494+ call_dl_resolve = current->mm->call_dl_resolve;
11495+ up_write(&current->mm->mmap_sem);
11496+ if (vma)
11497+ kmem_cache_free(vm_area_cachep, vma);
11498+ goto emulate;
11499+ }
11500+
11501+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11502+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11503+ up_write(&current->mm->mmap_sem);
11504+ if (vma)
11505+ kmem_cache_free(vm_area_cachep, vma);
11506+ return 1;
11507+ }
11508+
11509+ if (pax_insert_vma(vma, call_dl_resolve)) {
11510+ up_write(&current->mm->mmap_sem);
11511+ kmem_cache_free(vm_area_cachep, vma);
11512+ return 1;
11513+ }
11514+
11515+ current->mm->call_dl_resolve = call_dl_resolve;
11516+ up_write(&current->mm->mmap_sem);
11517+
11518+emulate:
11519+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11520+ regs->pc = call_dl_resolve;
11521+ regs->npc = addr+4;
11522+ return 3;
11523+ }
11524+#endif
11525+
11526+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11527+ if ((save & 0xFFC00000U) == 0x05000000U &&
11528+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11529+ nop == 0x01000000U)
11530+ {
11531+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11532+ regs->u_regs[UREG_G2] = addr + 4;
11533+ addr = (save & 0x003FFFFFU) << 10;
11534+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11535+ regs->pc = addr;
11536+ regs->npc = addr+4;
11537+ return 3;
11538+ }
11539+ }
11540+ } while (0);
11541+
11542+ do { /* PaX: unpatched PLT emulation step 2 */
11543+ unsigned int save, call, nop;
11544+
11545+ err = get_user(save, (unsigned int *)(regs->pc-4));
11546+ err |= get_user(call, (unsigned int *)regs->pc);
11547+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11548+ if (err)
11549+ break;
11550+
11551+ if (save == 0x9DE3BFA8U &&
11552+ (call & 0xC0000000U) == 0x40000000U &&
11553+ nop == 0x01000000U)
11554+ {
11555+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11556+
11557+ regs->u_regs[UREG_RETPC] = regs->pc;
11558+ regs->pc = dl_resolve;
11559+ regs->npc = dl_resolve+4;
11560+ return 3;
11561+ }
11562+ } while (0);
11563+#endif
11564+
11565+ return 1;
11566+}
11567+
11568+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11569+{
11570+ unsigned long i;
11571+
11572+ printk(KERN_ERR "PAX: bytes at PC: ");
11573+ for (i = 0; i < 8; i++) {
11574+ unsigned int c;
11575+ if (get_user(c, (unsigned int *)pc+i))
11576+ printk(KERN_CONT "???????? ");
11577+ else
11578+ printk(KERN_CONT "%08x ", c);
11579+ }
11580+ printk("\n");
11581+}
11582+#endif
11583+
11584 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11585 int text_fault)
11586 {
11587@@ -226,6 +500,24 @@ good_area:
11588 if (!(vma->vm_flags & VM_WRITE))
11589 goto bad_area;
11590 } else {
11591+
11592+#ifdef CONFIG_PAX_PAGEEXEC
11593+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11594+ up_read(&mm->mmap_sem);
11595+ switch (pax_handle_fetch_fault(regs)) {
11596+
11597+#ifdef CONFIG_PAX_EMUPLT
11598+ case 2:
11599+ case 3:
11600+ return;
11601+#endif
11602+
11603+ }
11604+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11605+ do_group_exit(SIGKILL);
11606+ }
11607+#endif
11608+
11609 /* Allow reads even for write-only mappings */
11610 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11611 goto bad_area;
11612diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11613index 4798232..f76e3aa 100644
11614--- a/arch/sparc/mm/fault_64.c
11615+++ b/arch/sparc/mm/fault_64.c
11616@@ -22,6 +22,9 @@
11617 #include <linux/kdebug.h>
11618 #include <linux/percpu.h>
11619 #include <linux/context_tracking.h>
11620+#include <linux/slab.h>
11621+#include <linux/pagemap.h>
11622+#include <linux/compiler.h>
11623
11624 #include <asm/page.h>
11625 #include <asm/pgtable.h>
11626@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11627 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11628 regs->tpc);
11629 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11630- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11631+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11632 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11633 dump_stack();
11634 unhandled_fault(regs->tpc, current, regs);
11635@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11636 show_regs(regs);
11637 }
11638
11639+#ifdef CONFIG_PAX_PAGEEXEC
11640+#ifdef CONFIG_PAX_DLRESOLVE
11641+static void pax_emuplt_close(struct vm_area_struct *vma)
11642+{
11643+ vma->vm_mm->call_dl_resolve = 0UL;
11644+}
11645+
11646+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11647+{
11648+ unsigned int *kaddr;
11649+
11650+ vmf->page = alloc_page(GFP_HIGHUSER);
11651+ if (!vmf->page)
11652+ return VM_FAULT_OOM;
11653+
11654+ kaddr = kmap(vmf->page);
11655+ memset(kaddr, 0, PAGE_SIZE);
11656+ kaddr[0] = 0x9DE3BFA8U; /* save */
11657+ flush_dcache_page(vmf->page);
11658+ kunmap(vmf->page);
11659+ return VM_FAULT_MAJOR;
11660+}
11661+
11662+static const struct vm_operations_struct pax_vm_ops = {
11663+ .close = pax_emuplt_close,
11664+ .fault = pax_emuplt_fault
11665+};
11666+
11667+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11668+{
11669+ int ret;
11670+
11671+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11672+ vma->vm_mm = current->mm;
11673+ vma->vm_start = addr;
11674+ vma->vm_end = addr + PAGE_SIZE;
11675+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11676+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11677+ vma->vm_ops = &pax_vm_ops;
11678+
11679+ ret = insert_vm_struct(current->mm, vma);
11680+ if (ret)
11681+ return ret;
11682+
11683+ ++current->mm->total_vm;
11684+ return 0;
11685+}
11686+#endif
11687+
11688+/*
11689+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11690+ *
11691+ * returns 1 when task should be killed
11692+ * 2 when patched PLT trampoline was detected
11693+ * 3 when unpatched PLT trampoline was detected
11694+ */
11695+static int pax_handle_fetch_fault(struct pt_regs *regs)
11696+{
11697+
11698+#ifdef CONFIG_PAX_EMUPLT
11699+ int err;
11700+
11701+ do { /* PaX: patched PLT emulation #1 */
11702+ unsigned int sethi1, sethi2, jmpl;
11703+
11704+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11705+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11706+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11707+
11708+ if (err)
11709+ break;
11710+
11711+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11712+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11713+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11714+ {
11715+ unsigned long addr;
11716+
11717+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11718+ addr = regs->u_regs[UREG_G1];
11719+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11720+
11721+ if (test_thread_flag(TIF_32BIT))
11722+ addr &= 0xFFFFFFFFUL;
11723+
11724+ regs->tpc = addr;
11725+ regs->tnpc = addr+4;
11726+ return 2;
11727+ }
11728+ } while (0);
11729+
11730+ do { /* PaX: patched PLT emulation #2 */
11731+ unsigned int ba;
11732+
11733+ err = get_user(ba, (unsigned int *)regs->tpc);
11734+
11735+ if (err)
11736+ break;
11737+
11738+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11739+ unsigned long addr;
11740+
11741+ if ((ba & 0xFFC00000U) == 0x30800000U)
11742+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11743+ else
11744+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11745+
11746+ if (test_thread_flag(TIF_32BIT))
11747+ addr &= 0xFFFFFFFFUL;
11748+
11749+ regs->tpc = addr;
11750+ regs->tnpc = addr+4;
11751+ return 2;
11752+ }
11753+ } while (0);
11754+
11755+ do { /* PaX: patched PLT emulation #3 */
11756+ unsigned int sethi, bajmpl, nop;
11757+
11758+ err = get_user(sethi, (unsigned int *)regs->tpc);
11759+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11760+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11761+
11762+ if (err)
11763+ break;
11764+
11765+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11766+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11767+ nop == 0x01000000U)
11768+ {
11769+ unsigned long addr;
11770+
11771+ addr = (sethi & 0x003FFFFFU) << 10;
11772+ regs->u_regs[UREG_G1] = addr;
11773+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11774+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11775+ else
11776+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11777+
11778+ if (test_thread_flag(TIF_32BIT))
11779+ addr &= 0xFFFFFFFFUL;
11780+
11781+ regs->tpc = addr;
11782+ regs->tnpc = addr+4;
11783+ return 2;
11784+ }
11785+ } while (0);
11786+
11787+ do { /* PaX: patched PLT emulation #4 */
11788+ unsigned int sethi, mov1, call, mov2;
11789+
11790+ err = get_user(sethi, (unsigned int *)regs->tpc);
11791+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11792+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11793+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11794+
11795+ if (err)
11796+ break;
11797+
11798+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11799+ mov1 == 0x8210000FU &&
11800+ (call & 0xC0000000U) == 0x40000000U &&
11801+ mov2 == 0x9E100001U)
11802+ {
11803+ unsigned long addr;
11804+
11805+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11806+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11807+
11808+ if (test_thread_flag(TIF_32BIT))
11809+ addr &= 0xFFFFFFFFUL;
11810+
11811+ regs->tpc = addr;
11812+ regs->tnpc = addr+4;
11813+ return 2;
11814+ }
11815+ } while (0);
11816+
11817+ do { /* PaX: patched PLT emulation #5 */
11818+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11819+
11820+ err = get_user(sethi, (unsigned int *)regs->tpc);
11821+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11822+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11823+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11824+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11825+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11826+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11827+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11828+
11829+ if (err)
11830+ break;
11831+
11832+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11833+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11834+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11835+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11836+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11837+ sllx == 0x83287020U &&
11838+ jmpl == 0x81C04005U &&
11839+ nop == 0x01000000U)
11840+ {
11841+ unsigned long addr;
11842+
11843+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11844+ regs->u_regs[UREG_G1] <<= 32;
11845+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11846+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11847+ regs->tpc = addr;
11848+ regs->tnpc = addr+4;
11849+ return 2;
11850+ }
11851+ } while (0);
11852+
11853+ do { /* PaX: patched PLT emulation #6 */
11854+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11855+
11856+ err = get_user(sethi, (unsigned int *)regs->tpc);
11857+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11858+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11859+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11860+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11861+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11862+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11863+
11864+ if (err)
11865+ break;
11866+
11867+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11868+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11869+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11870+ sllx == 0x83287020U &&
11871+ (or & 0xFFFFE000U) == 0x8A116000U &&
11872+ jmpl == 0x81C04005U &&
11873+ nop == 0x01000000U)
11874+ {
11875+ unsigned long addr;
11876+
11877+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11878+ regs->u_regs[UREG_G1] <<= 32;
11879+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11880+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11881+ regs->tpc = addr;
11882+ regs->tnpc = addr+4;
11883+ return 2;
11884+ }
11885+ } while (0);
11886+
11887+ do { /* PaX: unpatched PLT emulation step 1 */
11888+ unsigned int sethi, ba, nop;
11889+
11890+ err = get_user(sethi, (unsigned int *)regs->tpc);
11891+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11892+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11893+
11894+ if (err)
11895+ break;
11896+
11897+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11898+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11899+ nop == 0x01000000U)
11900+ {
11901+ unsigned long addr;
11902+ unsigned int save, call;
11903+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11904+
11905+ if ((ba & 0xFFC00000U) == 0x30800000U)
11906+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11907+ else
11908+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11909+
11910+ if (test_thread_flag(TIF_32BIT))
11911+ addr &= 0xFFFFFFFFUL;
11912+
11913+ err = get_user(save, (unsigned int *)addr);
11914+ err |= get_user(call, (unsigned int *)(addr+4));
11915+ err |= get_user(nop, (unsigned int *)(addr+8));
11916+ if (err)
11917+ break;
11918+
11919+#ifdef CONFIG_PAX_DLRESOLVE
11920+ if (save == 0x9DE3BFA8U &&
11921+ (call & 0xC0000000U) == 0x40000000U &&
11922+ nop == 0x01000000U)
11923+ {
11924+ struct vm_area_struct *vma;
11925+ unsigned long call_dl_resolve;
11926+
11927+ down_read(&current->mm->mmap_sem);
11928+ call_dl_resolve = current->mm->call_dl_resolve;
11929+ up_read(&current->mm->mmap_sem);
11930+ if (likely(call_dl_resolve))
11931+ goto emulate;
11932+
11933+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11934+
11935+ down_write(&current->mm->mmap_sem);
11936+ if (current->mm->call_dl_resolve) {
11937+ call_dl_resolve = current->mm->call_dl_resolve;
11938+ up_write(&current->mm->mmap_sem);
11939+ if (vma)
11940+ kmem_cache_free(vm_area_cachep, vma);
11941+ goto emulate;
11942+ }
11943+
11944+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11945+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11946+ up_write(&current->mm->mmap_sem);
11947+ if (vma)
11948+ kmem_cache_free(vm_area_cachep, vma);
11949+ return 1;
11950+ }
11951+
11952+ if (pax_insert_vma(vma, call_dl_resolve)) {
11953+ up_write(&current->mm->mmap_sem);
11954+ kmem_cache_free(vm_area_cachep, vma);
11955+ return 1;
11956+ }
11957+
11958+ current->mm->call_dl_resolve = call_dl_resolve;
11959+ up_write(&current->mm->mmap_sem);
11960+
11961+emulate:
11962+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11963+ regs->tpc = call_dl_resolve;
11964+ regs->tnpc = addr+4;
11965+ return 3;
11966+ }
11967+#endif
11968+
11969+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11970+ if ((save & 0xFFC00000U) == 0x05000000U &&
11971+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11972+ nop == 0x01000000U)
11973+ {
11974+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11975+ regs->u_regs[UREG_G2] = addr + 4;
11976+ addr = (save & 0x003FFFFFU) << 10;
11977+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11978+
11979+ if (test_thread_flag(TIF_32BIT))
11980+ addr &= 0xFFFFFFFFUL;
11981+
11982+ regs->tpc = addr;
11983+ regs->tnpc = addr+4;
11984+ return 3;
11985+ }
11986+
11987+ /* PaX: 64-bit PLT stub */
11988+ err = get_user(sethi1, (unsigned int *)addr);
11989+ err |= get_user(sethi2, (unsigned int *)(addr+4));
11990+ err |= get_user(or1, (unsigned int *)(addr+8));
11991+ err |= get_user(or2, (unsigned int *)(addr+12));
11992+ err |= get_user(sllx, (unsigned int *)(addr+16));
11993+ err |= get_user(add, (unsigned int *)(addr+20));
11994+ err |= get_user(jmpl, (unsigned int *)(addr+24));
11995+ err |= get_user(nop, (unsigned int *)(addr+28));
11996+ if (err)
11997+ break;
11998+
11999+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12000+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12001+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12002+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12003+ sllx == 0x89293020U &&
12004+ add == 0x8A010005U &&
12005+ jmpl == 0x89C14000U &&
12006+ nop == 0x01000000U)
12007+ {
12008+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12009+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12010+ regs->u_regs[UREG_G4] <<= 32;
12011+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12012+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12013+ regs->u_regs[UREG_G4] = addr + 24;
12014+ addr = regs->u_regs[UREG_G5];
12015+ regs->tpc = addr;
12016+ regs->tnpc = addr+4;
12017+ return 3;
12018+ }
12019+ }
12020+ } while (0);
12021+
12022+#ifdef CONFIG_PAX_DLRESOLVE
12023+ do { /* PaX: unpatched PLT emulation step 2 */
12024+ unsigned int save, call, nop;
12025+
12026+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12027+ err |= get_user(call, (unsigned int *)regs->tpc);
12028+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12029+ if (err)
12030+ break;
12031+
12032+ if (save == 0x9DE3BFA8U &&
12033+ (call & 0xC0000000U) == 0x40000000U &&
12034+ nop == 0x01000000U)
12035+ {
12036+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12037+
12038+ if (test_thread_flag(TIF_32BIT))
12039+ dl_resolve &= 0xFFFFFFFFUL;
12040+
12041+ regs->u_regs[UREG_RETPC] = regs->tpc;
12042+ regs->tpc = dl_resolve;
12043+ regs->tnpc = dl_resolve+4;
12044+ return 3;
12045+ }
12046+ } while (0);
12047+#endif
12048+
12049+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12050+ unsigned int sethi, ba, nop;
12051+
12052+ err = get_user(sethi, (unsigned int *)regs->tpc);
12053+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12054+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12055+
12056+ if (err)
12057+ break;
12058+
12059+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12060+ (ba & 0xFFF00000U) == 0x30600000U &&
12061+ nop == 0x01000000U)
12062+ {
12063+ unsigned long addr;
12064+
12065+ addr = (sethi & 0x003FFFFFU) << 10;
12066+ regs->u_regs[UREG_G1] = addr;
12067+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12068+
12069+ if (test_thread_flag(TIF_32BIT))
12070+ addr &= 0xFFFFFFFFUL;
12071+
12072+ regs->tpc = addr;
12073+ regs->tnpc = addr+4;
12074+ return 2;
12075+ }
12076+ } while (0);
12077+
12078+#endif
12079+
12080+ return 1;
12081+}
12082+
12083+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12084+{
12085+ unsigned long i;
12086+
12087+ printk(KERN_ERR "PAX: bytes at PC: ");
12088+ for (i = 0; i < 8; i++) {
12089+ unsigned int c;
12090+ if (get_user(c, (unsigned int *)pc+i))
12091+ printk(KERN_CONT "???????? ");
12092+ else
12093+ printk(KERN_CONT "%08x ", c);
12094+ }
12095+ printk("\n");
12096+}
12097+#endif
12098+
12099 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12100 {
12101 enum ctx_state prev_state = exception_enter();
12102@@ -353,6 +816,29 @@ retry:
12103 if (!vma)
12104 goto bad_area;
12105
12106+#ifdef CONFIG_PAX_PAGEEXEC
12107+ /* PaX: detect ITLB misses on non-exec pages */
12108+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12109+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12110+ {
12111+ if (address != regs->tpc)
12112+ goto good_area;
12113+
12114+ up_read(&mm->mmap_sem);
12115+ switch (pax_handle_fetch_fault(regs)) {
12116+
12117+#ifdef CONFIG_PAX_EMUPLT
12118+ case 2:
12119+ case 3:
12120+ return;
12121+#endif
12122+
12123+ }
12124+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12125+ do_group_exit(SIGKILL);
12126+ }
12127+#endif
12128+
12129 /* Pure DTLB misses do not tell us whether the fault causing
12130 * load/store/atomic was a write or not, it only says that there
12131 * was no match. So in such a case we (carefully) read the
12132diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12133index 4242eab..9ae6360 100644
12134--- a/arch/sparc/mm/hugetlbpage.c
12135+++ b/arch/sparc/mm/hugetlbpage.c
12136@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12137 unsigned long addr,
12138 unsigned long len,
12139 unsigned long pgoff,
12140- unsigned long flags)
12141+ unsigned long flags,
12142+ unsigned long offset)
12143 {
12144+ struct mm_struct *mm = current->mm;
12145 unsigned long task_size = TASK_SIZE;
12146 struct vm_unmapped_area_info info;
12147
12148@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12149
12150 info.flags = 0;
12151 info.length = len;
12152- info.low_limit = TASK_UNMAPPED_BASE;
12153+ info.low_limit = mm->mmap_base;
12154 info.high_limit = min(task_size, VA_EXCLUDE_START);
12155 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12156 info.align_offset = 0;
12157+ info.threadstack_offset = offset;
12158 addr = vm_unmapped_area(&info);
12159
12160 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12161 VM_BUG_ON(addr != -ENOMEM);
12162 info.low_limit = VA_EXCLUDE_END;
12163+
12164+#ifdef CONFIG_PAX_RANDMMAP
12165+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12166+ info.low_limit += mm->delta_mmap;
12167+#endif
12168+
12169 info.high_limit = task_size;
12170 addr = vm_unmapped_area(&info);
12171 }
12172@@ -55,7 +64,8 @@ static unsigned long
12173 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12174 const unsigned long len,
12175 const unsigned long pgoff,
12176- const unsigned long flags)
12177+ const unsigned long flags,
12178+ const unsigned long offset)
12179 {
12180 struct mm_struct *mm = current->mm;
12181 unsigned long addr = addr0;
12182@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12183 info.high_limit = mm->mmap_base;
12184 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12185 info.align_offset = 0;
12186+ info.threadstack_offset = offset;
12187 addr = vm_unmapped_area(&info);
12188
12189 /*
12190@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12191 VM_BUG_ON(addr != -ENOMEM);
12192 info.flags = 0;
12193 info.low_limit = TASK_UNMAPPED_BASE;
12194+
12195+#ifdef CONFIG_PAX_RANDMMAP
12196+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12197+ info.low_limit += mm->delta_mmap;
12198+#endif
12199+
12200 info.high_limit = STACK_TOP32;
12201 addr = vm_unmapped_area(&info);
12202 }
12203@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12204 struct mm_struct *mm = current->mm;
12205 struct vm_area_struct *vma;
12206 unsigned long task_size = TASK_SIZE;
12207+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12208
12209 if (test_thread_flag(TIF_32BIT))
12210 task_size = STACK_TOP32;
12211@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12212 return addr;
12213 }
12214
12215+#ifdef CONFIG_PAX_RANDMMAP
12216+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12217+#endif
12218+
12219 if (addr) {
12220 addr = ALIGN(addr, HPAGE_SIZE);
12221 vma = find_vma(mm, addr);
12222- if (task_size - len >= addr &&
12223- (!vma || addr + len <= vma->vm_start))
12224+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12225 return addr;
12226 }
12227 if (mm->get_unmapped_area == arch_get_unmapped_area)
12228 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12229- pgoff, flags);
12230+ pgoff, flags, offset);
12231 else
12232 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12233- pgoff, flags);
12234+ pgoff, flags, offset);
12235 }
12236
12237 pte_t *huge_pte_alloc(struct mm_struct *mm,
12238diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12239index 559cb74..9e5f097 100644
12240--- a/arch/sparc/mm/init_64.c
12241+++ b/arch/sparc/mm/init_64.c
12242@@ -187,9 +187,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12243 int num_kernel_image_mappings;
12244
12245 #ifdef CONFIG_DEBUG_DCFLUSH
12246-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12247+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12248 #ifdef CONFIG_SMP
12249-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12250+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12251 #endif
12252 #endif
12253
12254@@ -197,7 +197,7 @@ inline void flush_dcache_page_impl(struct page *page)
12255 {
12256 BUG_ON(tlb_type == hypervisor);
12257 #ifdef CONFIG_DEBUG_DCFLUSH
12258- atomic_inc(&dcpage_flushes);
12259+ atomic_inc_unchecked(&dcpage_flushes);
12260 #endif
12261
12262 #ifdef DCACHE_ALIASING_POSSIBLE
12263@@ -469,10 +469,10 @@ void mmu_info(struct seq_file *m)
12264
12265 #ifdef CONFIG_DEBUG_DCFLUSH
12266 seq_printf(m, "DCPageFlushes\t: %d\n",
12267- atomic_read(&dcpage_flushes));
12268+ atomic_read_unchecked(&dcpage_flushes));
12269 #ifdef CONFIG_SMP
12270 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12271- atomic_read(&dcpage_flushes_xcall));
12272+ atomic_read_unchecked(&dcpage_flushes_xcall));
12273 #endif /* CONFIG_SMP */
12274 #endif /* CONFIG_DEBUG_DCFLUSH */
12275 }
12276diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12277index a07e31b..85c9003 100644
12278--- a/arch/tile/Kconfig
12279+++ b/arch/tile/Kconfig
12280@@ -198,6 +198,7 @@ source "kernel/Kconfig.hz"
12281
12282 config KEXEC
12283 bool "kexec system call"
12284+ depends on !GRKERNSEC_KMEM
12285 ---help---
12286 kexec is a system call that implements the ability to shutdown your
12287 current kernel, and to start another kernel. It is like a reboot
12288diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12289index 7b11c5f..755a026 100644
12290--- a/arch/tile/include/asm/atomic_64.h
12291+++ b/arch/tile/include/asm/atomic_64.h
12292@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12293
12294 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12295
12296+#define atomic64_read_unchecked(v) atomic64_read(v)
12297+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12298+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12299+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12300+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12301+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12302+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12303+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12304+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12305+
12306 /* Define this to indicate that cmpxchg is an efficient operation. */
12307 #define __HAVE_ARCH_CMPXCHG
12308
12309diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12310index 6160761..00cac88 100644
12311--- a/arch/tile/include/asm/cache.h
12312+++ b/arch/tile/include/asm/cache.h
12313@@ -15,11 +15,12 @@
12314 #ifndef _ASM_TILE_CACHE_H
12315 #define _ASM_TILE_CACHE_H
12316
12317+#include <linux/const.h>
12318 #include <arch/chip.h>
12319
12320 /* bytes per L1 data cache line */
12321 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12322-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12323+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12324
12325 /* bytes per L2 cache line */
12326 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12327diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12328index f41cb53..31d3ab4 100644
12329--- a/arch/tile/include/asm/uaccess.h
12330+++ b/arch/tile/include/asm/uaccess.h
12331@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12332 const void __user *from,
12333 unsigned long n)
12334 {
12335- int sz = __compiletime_object_size(to);
12336+ size_t sz = __compiletime_object_size(to);
12337
12338- if (likely(sz == -1 || sz >= n))
12339+ if (likely(sz == (size_t)-1 || sz >= n))
12340 n = _copy_from_user(to, from, n);
12341 else
12342 copy_from_user_overflow();
12343diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12344index 8416240..a012fb7 100644
12345--- a/arch/tile/mm/hugetlbpage.c
12346+++ b/arch/tile/mm/hugetlbpage.c
12347@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12348 info.high_limit = TASK_SIZE;
12349 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12350 info.align_offset = 0;
12351+ info.threadstack_offset = 0;
12352 return vm_unmapped_area(&info);
12353 }
12354
12355@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12356 info.high_limit = current->mm->mmap_base;
12357 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12358 info.align_offset = 0;
12359+ info.threadstack_offset = 0;
12360 addr = vm_unmapped_area(&info);
12361
12362 /*
12363diff --git a/arch/um/Makefile b/arch/um/Makefile
12364index 17d4460..9d74338e3de4 100644
12365--- a/arch/um/Makefile
12366+++ b/arch/um/Makefile
12367@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12368 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12369 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12370
12371+ifdef CONSTIFY_PLUGIN
12372+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12373+endif
12374+
12375 #This will adjust *FLAGS accordingly to the platform.
12376 include $(ARCH_DIR)/Makefile-os-$(OS)
12377
12378diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12379index 19e1bdd..3665b77 100644
12380--- a/arch/um/include/asm/cache.h
12381+++ b/arch/um/include/asm/cache.h
12382@@ -1,6 +1,7 @@
12383 #ifndef __UM_CACHE_H
12384 #define __UM_CACHE_H
12385
12386+#include <linux/const.h>
12387
12388 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12389 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12390@@ -12,6 +13,6 @@
12391 # define L1_CACHE_SHIFT 5
12392 #endif
12393
12394-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12395+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12396
12397 #endif
12398diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12399index 2e0a6b1..a64d0f5 100644
12400--- a/arch/um/include/asm/kmap_types.h
12401+++ b/arch/um/include/asm/kmap_types.h
12402@@ -8,6 +8,6 @@
12403
12404 /* No more #include "asm/arch/kmap_types.h" ! */
12405
12406-#define KM_TYPE_NR 14
12407+#define KM_TYPE_NR 15
12408
12409 #endif
12410diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12411index 71c5d13..4c7b9f1 100644
12412--- a/arch/um/include/asm/page.h
12413+++ b/arch/um/include/asm/page.h
12414@@ -14,6 +14,9 @@
12415 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12416 #define PAGE_MASK (~(PAGE_SIZE-1))
12417
12418+#define ktla_ktva(addr) (addr)
12419+#define ktva_ktla(addr) (addr)
12420+
12421 #ifndef __ASSEMBLY__
12422
12423 struct page;
12424diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12425index 2b4274e..754fe06 100644
12426--- a/arch/um/include/asm/pgtable-3level.h
12427+++ b/arch/um/include/asm/pgtable-3level.h
12428@@ -58,6 +58,7 @@
12429 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12430 #define pud_populate(mm, pud, pmd) \
12431 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12432+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12433
12434 #ifdef CONFIG_64BIT
12435 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12436diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12437index 68b9119..f72353c 100644
12438--- a/arch/um/kernel/process.c
12439+++ b/arch/um/kernel/process.c
12440@@ -345,22 +345,6 @@ int singlestepping(void * t)
12441 return 2;
12442 }
12443
12444-/*
12445- * Only x86 and x86_64 have an arch_align_stack().
12446- * All other arches have "#define arch_align_stack(x) (x)"
12447- * in their asm/exec.h
12448- * As this is included in UML from asm-um/system-generic.h,
12449- * we can use it to behave as the subarch does.
12450- */
12451-#ifndef arch_align_stack
12452-unsigned long arch_align_stack(unsigned long sp)
12453-{
12454- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12455- sp -= get_random_int() % 8192;
12456- return sp & ~0xf;
12457-}
12458-#endif
12459-
12460 unsigned long get_wchan(struct task_struct *p)
12461 {
12462 unsigned long stack_page, sp, ip;
12463diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12464index ad8f795..2c7eec6 100644
12465--- a/arch/unicore32/include/asm/cache.h
12466+++ b/arch/unicore32/include/asm/cache.h
12467@@ -12,8 +12,10 @@
12468 #ifndef __UNICORE_CACHE_H__
12469 #define __UNICORE_CACHE_H__
12470
12471-#define L1_CACHE_SHIFT (5)
12472-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12473+#include <linux/const.h>
12474+
12475+#define L1_CACHE_SHIFT 5
12476+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12477
12478 /*
12479 * Memory returned by kmalloc() may be used for DMA, so we must make
12480diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12481index 226d569..297bf74 100644
12482--- a/arch/x86/Kconfig
12483+++ b/arch/x86/Kconfig
12484@@ -32,7 +32,7 @@ config X86
12485 select HAVE_AOUT if X86_32
12486 select HAVE_UNSTABLE_SCHED_CLOCK
12487 select ARCH_SUPPORTS_NUMA_BALANCING if X86_64
12488- select ARCH_SUPPORTS_INT128 if X86_64
12489+ select ARCH_SUPPORTS_INT128 if X86_64 && !PAX_SIZE_OVERFLOW
12490 select HAVE_IDE
12491 select HAVE_OPROFILE
12492 select HAVE_PCSPKR_PLATFORM
12493@@ -134,7 +134,7 @@ config X86
12494 select RTC_LIB
12495 select HAVE_DEBUG_STACKOVERFLOW
12496 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12497- select HAVE_CC_STACKPROTECTOR
12498+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12499 select GENERIC_CPU_AUTOPROBE
12500 select HAVE_ARCH_AUDITSYSCALL
12501 select ARCH_SUPPORTS_ATOMIC_RMW
12502@@ -266,7 +266,7 @@ config X86_HT
12503
12504 config X86_32_LAZY_GS
12505 def_bool y
12506- depends on X86_32 && !CC_STACKPROTECTOR
12507+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12508
12509 config ARCH_HWEIGHT_CFLAGS
12510 string
12511@@ -638,6 +638,7 @@ config SCHED_OMIT_FRAME_POINTER
12512
12513 menuconfig HYPERVISOR_GUEST
12514 bool "Linux guest support"
12515+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12516 ---help---
12517 Say Y here to enable options for running Linux under various hyper-
12518 visors. This option enables basic hypervisor detection and platform
12519@@ -1005,6 +1006,7 @@ config VM86
12520
12521 config X86_16BIT
12522 bool "Enable support for 16-bit segments" if EXPERT
12523+ depends on !GRKERNSEC
12524 default y
12525 ---help---
12526 This option is required by programs like Wine to run 16-bit
12527@@ -1178,6 +1180,7 @@ choice
12528
12529 config NOHIGHMEM
12530 bool "off"
12531+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12532 ---help---
12533 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12534 However, the address space of 32-bit x86 processors is only 4
12535@@ -1214,6 +1217,7 @@ config NOHIGHMEM
12536
12537 config HIGHMEM4G
12538 bool "4GB"
12539+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12540 ---help---
12541 Select this if you have a 32-bit processor and between 1 and 4
12542 gigabytes of physical RAM.
12543@@ -1266,7 +1270,7 @@ config PAGE_OFFSET
12544 hex
12545 default 0xB0000000 if VMSPLIT_3G_OPT
12546 default 0x80000000 if VMSPLIT_2G
12547- default 0x78000000 if VMSPLIT_2G_OPT
12548+ default 0x70000000 if VMSPLIT_2G_OPT
12549 default 0x40000000 if VMSPLIT_1G
12550 default 0xC0000000
12551 depends on X86_32
12552@@ -1286,7 +1290,6 @@ config X86_PAE
12553
12554 config ARCH_PHYS_ADDR_T_64BIT
12555 def_bool y
12556- depends on X86_64 || X86_PAE
12557
12558 config ARCH_DMA_ADDR_T_64BIT
12559 def_bool y
12560@@ -1717,6 +1720,7 @@ source kernel/Kconfig.hz
12561
12562 config KEXEC
12563 bool "kexec system call"
12564+ depends on !GRKERNSEC_KMEM
12565 ---help---
12566 kexec is a system call that implements the ability to shutdown your
12567 current kernel, and to start another kernel. It is like a reboot
12568@@ -1899,7 +1903,9 @@ config X86_NEED_RELOCS
12569
12570 config PHYSICAL_ALIGN
12571 hex "Alignment value to which kernel should be aligned"
12572- default "0x200000"
12573+ default "0x1000000"
12574+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12575+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12576 range 0x2000 0x1000000 if X86_32
12577 range 0x200000 0x1000000 if X86_64
12578 ---help---
12579@@ -1982,6 +1988,7 @@ config COMPAT_VDSO
12580 def_bool n
12581 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12582 depends on X86_32 || IA32_EMULATION
12583+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12584 ---help---
12585 Certain buggy versions of glibc will crash if they are
12586 presented with a 32-bit vDSO that is not mapped at the address
12587@@ -2046,6 +2053,22 @@ config CMDLINE_OVERRIDE
12588 This is used to work around broken boot loaders. This should
12589 be set to 'N' under normal conditions.
12590
12591+config DEFAULT_MODIFY_LDT_SYSCALL
12592+ bool "Allow userspace to modify the LDT by default"
12593+ default y
12594+
12595+ ---help---
12596+ Modifying the LDT (Local Descriptor Table) may be needed to run a
12597+ 16-bit or segmented code such as Dosemu or Wine. This is done via
12598+ a system call which is not needed to run portable applications,
12599+ and which can sometimes be abused to exploit some weaknesses of
12600+ the architecture, opening new vulnerabilities.
12601+
12602+ For this reason this option allows one to enable or disable the
12603+ feature at runtime. It is recommended to say 'N' here to leave
12604+ the system protected, and to enable it at runtime only if needed
12605+ by setting the sys.kernel.modify_ldt sysctl.
12606+
12607 source "kernel/livepatch/Kconfig"
12608
12609 endmenu
12610diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12611index 6983314..54ad7e8 100644
12612--- a/arch/x86/Kconfig.cpu
12613+++ b/arch/x86/Kconfig.cpu
12614@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12615
12616 config X86_F00F_BUG
12617 def_bool y
12618- depends on M586MMX || M586TSC || M586 || M486
12619+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12620
12621 config X86_INVD_BUG
12622 def_bool y
12623@@ -327,7 +327,7 @@ config X86_INVD_BUG
12624
12625 config X86_ALIGNMENT_16
12626 def_bool y
12627- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12628+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12629
12630 config X86_INTEL_USERCOPY
12631 def_bool y
12632@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12633 # generates cmov.
12634 config X86_CMOV
12635 def_bool y
12636- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12637+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12638
12639 config X86_MINIMUM_CPU_FAMILY
12640 int
12641diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12642index 72484a6..83a4411 100644
12643--- a/arch/x86/Kconfig.debug
12644+++ b/arch/x86/Kconfig.debug
12645@@ -89,7 +89,7 @@ config EFI_PGT_DUMP
12646 config DEBUG_RODATA
12647 bool "Write protect kernel read-only data structures"
12648 default y
12649- depends on DEBUG_KERNEL
12650+ depends on DEBUG_KERNEL && BROKEN
12651 ---help---
12652 Mark the kernel read-only data as write-protected in the pagetables,
12653 in order to catch accidental (and incorrect) writes to such const
12654@@ -107,7 +107,7 @@ config DEBUG_RODATA_TEST
12655
12656 config DEBUG_SET_MODULE_RONX
12657 bool "Set loadable kernel module data as NX and text as RO"
12658- depends on MODULES
12659+ depends on MODULES && BROKEN
12660 ---help---
12661 This option helps catch unintended modifications to loadable
12662 kernel module's text and read-only data. It also prevents execution
12663diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12664index 2fda005..2c72d40 100644
12665--- a/arch/x86/Makefile
12666+++ b/arch/x86/Makefile
12667@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12668 # CPU-specific tuning. Anything which can be shared with UML should go here.
12669 include arch/x86/Makefile_32.cpu
12670 KBUILD_CFLAGS += $(cflags-y)
12671-
12672- # temporary until string.h is fixed
12673- KBUILD_CFLAGS += -ffreestanding
12674 else
12675 BITS := 64
12676 UTS_MACHINE := x86_64
12677@@ -107,6 +104,9 @@ else
12678 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12679 endif
12680
12681+# temporary until string.h is fixed
12682+KBUILD_CFLAGS += -ffreestanding
12683+
12684 # Make sure compiler does not have buggy stack-protector support.
12685 ifdef CONFIG_CC_STACKPROTECTOR
12686 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12687@@ -181,6 +181,7 @@ archheaders:
12688 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12689
12690 archprepare:
12691+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12692 ifeq ($(CONFIG_KEXEC_FILE),y)
12693 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12694 endif
12695@@ -264,3 +265,9 @@ define archhelp
12696 echo ' FDARGS="..." arguments for the booted kernel'
12697 echo ' FDINITRD=file initrd for the booted kernel'
12698 endef
12699+
12700+define OLD_LD
12701+
12702+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12703+*** Please upgrade your binutils to 2.18 or newer
12704+endef
12705diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12706index 57bbf2f..b100fce 100644
12707--- a/arch/x86/boot/Makefile
12708+++ b/arch/x86/boot/Makefile
12709@@ -58,6 +58,9 @@ clean-files += cpustr.h
12710 # ---------------------------------------------------------------------------
12711
12712 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12713+ifdef CONSTIFY_PLUGIN
12714+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12715+endif
12716 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12717 GCOV_PROFILE := n
12718
12719diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12720index 878e4b9..20537ab 100644
12721--- a/arch/x86/boot/bitops.h
12722+++ b/arch/x86/boot/bitops.h
12723@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12724 u8 v;
12725 const u32 *p = (const u32 *)addr;
12726
12727- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12728+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12729 return v;
12730 }
12731
12732@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12733
12734 static inline void set_bit(int nr, void *addr)
12735 {
12736- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12737+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12738 }
12739
12740 #endif /* BOOT_BITOPS_H */
12741diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12742index bd49ec6..94c7f58 100644
12743--- a/arch/x86/boot/boot.h
12744+++ b/arch/x86/boot/boot.h
12745@@ -84,7 +84,7 @@ static inline void io_delay(void)
12746 static inline u16 ds(void)
12747 {
12748 u16 seg;
12749- asm("movw %%ds,%0" : "=rm" (seg));
12750+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12751 return seg;
12752 }
12753
12754diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12755index 0a291cd..9686efc 100644
12756--- a/arch/x86/boot/compressed/Makefile
12757+++ b/arch/x86/boot/compressed/Makefile
12758@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12759 KBUILD_CFLAGS += -mno-mmx -mno-sse
12760 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12761 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12762+ifdef CONSTIFY_PLUGIN
12763+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12764+endif
12765
12766 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12767 GCOV_PROFILE := n
12768diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12769index a53440e..c3dbf1e 100644
12770--- a/arch/x86/boot/compressed/efi_stub_32.S
12771+++ b/arch/x86/boot/compressed/efi_stub_32.S
12772@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12773 * parameter 2, ..., param n. To make things easy, we save the return
12774 * address of efi_call_phys in a global variable.
12775 */
12776- popl %ecx
12777- movl %ecx, saved_return_addr(%edx)
12778- /* get the function pointer into ECX*/
12779- popl %ecx
12780- movl %ecx, efi_rt_function_ptr(%edx)
12781+ popl saved_return_addr(%edx)
12782+ popl efi_rt_function_ptr(%edx)
12783
12784 /*
12785 * 3. Call the physical function.
12786 */
12787- call *%ecx
12788+ call *efi_rt_function_ptr(%edx)
12789
12790 /*
12791 * 4. Balance the stack. And because EAX contain the return value,
12792@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12793 1: popl %edx
12794 subl $1b, %edx
12795
12796- movl efi_rt_function_ptr(%edx), %ecx
12797- pushl %ecx
12798+ pushl efi_rt_function_ptr(%edx)
12799
12800 /*
12801 * 10. Push the saved return address onto the stack and return.
12802 */
12803- movl saved_return_addr(%edx), %ecx
12804- pushl %ecx
12805- ret
12806+ jmpl *saved_return_addr(%edx)
12807 ENDPROC(efi_call_phys)
12808 .previous
12809
12810diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12811index 630384a..278e788 100644
12812--- a/arch/x86/boot/compressed/efi_thunk_64.S
12813+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12814@@ -189,8 +189,8 @@ efi_gdt64:
12815 .long 0 /* Filled out by user */
12816 .word 0
12817 .quad 0x0000000000000000 /* NULL descriptor */
12818- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12819- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12820+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12821+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12822 .quad 0x0080890000000000 /* TS descriptor */
12823 .quad 0x0000000000000000 /* TS continued */
12824 efi_gdt64_end:
12825diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12826index 8ef964d..fcfb8aa 100644
12827--- a/arch/x86/boot/compressed/head_32.S
12828+++ b/arch/x86/boot/compressed/head_32.S
12829@@ -141,10 +141,10 @@ preferred_addr:
12830 addl %eax, %ebx
12831 notl %eax
12832 andl %eax, %ebx
12833- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12834+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12835 jge 1f
12836 #endif
12837- movl $LOAD_PHYSICAL_ADDR, %ebx
12838+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12839 1:
12840
12841 /* Target address to relocate to for decompression */
12842diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12843index b0c0d16..3b44ff8 100644
12844--- a/arch/x86/boot/compressed/head_64.S
12845+++ b/arch/x86/boot/compressed/head_64.S
12846@@ -95,10 +95,10 @@ ENTRY(startup_32)
12847 addl %eax, %ebx
12848 notl %eax
12849 andl %eax, %ebx
12850- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12851+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12852 jge 1f
12853 #endif
12854- movl $LOAD_PHYSICAL_ADDR, %ebx
12855+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12856 1:
12857
12858 /* Target address to relocate to for decompression */
12859@@ -323,10 +323,10 @@ preferred_addr:
12860 addq %rax, %rbp
12861 notq %rax
12862 andq %rax, %rbp
12863- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12864+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12865 jge 1f
12866 #endif
12867- movq $LOAD_PHYSICAL_ADDR, %rbp
12868+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12869 1:
12870
12871 /* Target address to relocate to for decompression */
12872@@ -435,8 +435,8 @@ gdt:
12873 .long gdt
12874 .word 0
12875 .quad 0x0000000000000000 /* NULL descriptor */
12876- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12877- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12878+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12879+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12880 .quad 0x0080890000000000 /* TS descriptor */
12881 .quad 0x0000000000000000 /* TS continued */
12882 gdt_end:
12883diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12884index a107b93..55602de 100644
12885--- a/arch/x86/boot/compressed/misc.c
12886+++ b/arch/x86/boot/compressed/misc.c
12887@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12888 * Calculate the delta between where vmlinux was linked to load
12889 * and where it was actually loaded.
12890 */
12891- delta = min_addr - LOAD_PHYSICAL_ADDR;
12892+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12893 if (!delta) {
12894 debug_putstr("No relocation needed... ");
12895 return;
12896@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12897 Elf32_Ehdr ehdr;
12898 Elf32_Phdr *phdrs, *phdr;
12899 #endif
12900- void *dest;
12901+ void *dest, *prev;
12902 int i;
12903
12904 memcpy(&ehdr, output, sizeof(ehdr));
12905@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12906 case PT_LOAD:
12907 #ifdef CONFIG_RELOCATABLE
12908 dest = output;
12909- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12910+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12911 #else
12912 dest = (void *)(phdr->p_paddr);
12913 #endif
12914 memcpy(dest,
12915 output + phdr->p_offset,
12916 phdr->p_filesz);
12917+ if (i)
12918+ memset(prev, 0xff, dest - prev);
12919+ prev = dest + phdr->p_filesz;
12920 break;
12921 default: /* Ignore other PT_* */ break;
12922 }
12923@@ -419,7 +422,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12924 error("Destination address too large");
12925 #endif
12926 #ifndef CONFIG_RELOCATABLE
12927- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12928+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12929 error("Wrong destination address");
12930 #endif
12931
12932diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12933index 1fd7d57..0f7d096 100644
12934--- a/arch/x86/boot/cpucheck.c
12935+++ b/arch/x86/boot/cpucheck.c
12936@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12937 u32 ecx = MSR_K7_HWCR;
12938 u32 eax, edx;
12939
12940- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12941+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12942 eax &= ~(1 << 15);
12943- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12944+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12945
12946 get_cpuflags(); /* Make sure it really did something */
12947 err = check_cpuflags();
12948@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12949 u32 ecx = MSR_VIA_FCR;
12950 u32 eax, edx;
12951
12952- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12953+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12954 eax |= (1<<1)|(1<<7);
12955- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12956+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12957
12958 set_bit(X86_FEATURE_CX8, cpu.flags);
12959 err = check_cpuflags();
12960@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12961 u32 eax, edx;
12962 u32 level = 1;
12963
12964- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12965- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12966- asm("cpuid"
12967+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12968+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12969+ asm volatile("cpuid"
12970 : "+a" (level), "=d" (cpu.flags[0])
12971 : : "ecx", "ebx");
12972- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12973+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12974
12975 err = check_cpuflags();
12976 } else if (err == 0x01 &&
12977diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12978index 16ef025..91e033b 100644
12979--- a/arch/x86/boot/header.S
12980+++ b/arch/x86/boot/header.S
12981@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12982 # single linked list of
12983 # struct setup_data
12984
12985-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12986+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12987
12988 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12989+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12990+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12991+#else
12992 #define VO_INIT_SIZE (VO__end - VO__text)
12993+#endif
12994 #if ZO_INIT_SIZE > VO_INIT_SIZE
12995 #define INIT_SIZE ZO_INIT_SIZE
12996 #else
12997diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12998index db75d07..8e6d0af 100644
12999--- a/arch/x86/boot/memory.c
13000+++ b/arch/x86/boot/memory.c
13001@@ -19,7 +19,7 @@
13002
13003 static int detect_memory_e820(void)
13004 {
13005- int count = 0;
13006+ unsigned int count = 0;
13007 struct biosregs ireg, oreg;
13008 struct e820entry *desc = boot_params.e820_map;
13009 static struct e820entry buf; /* static so it is zeroed */
13010diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13011index ba3e100..6501b8f 100644
13012--- a/arch/x86/boot/video-vesa.c
13013+++ b/arch/x86/boot/video-vesa.c
13014@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13015
13016 boot_params.screen_info.vesapm_seg = oreg.es;
13017 boot_params.screen_info.vesapm_off = oreg.di;
13018+ boot_params.screen_info.vesapm_size = oreg.cx;
13019 }
13020
13021 /*
13022diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13023index 05111bb..a1ae1f0 100644
13024--- a/arch/x86/boot/video.c
13025+++ b/arch/x86/boot/video.c
13026@@ -98,7 +98,7 @@ static void store_mode_params(void)
13027 static unsigned int get_entry(void)
13028 {
13029 char entry_buf[4];
13030- int i, len = 0;
13031+ unsigned int i, len = 0;
13032 int key;
13033 unsigned int v;
13034
13035diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13036index 9105655..41779c1 100644
13037--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13038+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13039@@ -8,6 +8,8 @@
13040 * including this sentence is retained in full.
13041 */
13042
13043+#include <asm/alternative-asm.h>
13044+
13045 .extern crypto_ft_tab
13046 .extern crypto_it_tab
13047 .extern crypto_fl_tab
13048@@ -70,6 +72,8 @@
13049 je B192; \
13050 leaq 32(r9),r9;
13051
13052+#define ret pax_force_retaddr; ret
13053+
13054 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13055 movq r1,r2; \
13056 movq r3,r4; \
13057diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13058index 6bd2c6c..368c93e 100644
13059--- a/arch/x86/crypto/aesni-intel_asm.S
13060+++ b/arch/x86/crypto/aesni-intel_asm.S
13061@@ -31,6 +31,7 @@
13062
13063 #include <linux/linkage.h>
13064 #include <asm/inst.h>
13065+#include <asm/alternative-asm.h>
13066
13067 /*
13068 * The following macros are used to move an (un)aligned 16 byte value to/from
13069@@ -217,7 +218,7 @@ enc: .octa 0x2
13070 * num_initial_blocks = b mod 4
13071 * encrypt the initial num_initial_blocks blocks and apply ghash on
13072 * the ciphertext
13073-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13074+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13075 * are clobbered
13076 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13077 */
13078@@ -227,8 +228,8 @@ enc: .octa 0x2
13079 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13080 MOVADQ SHUF_MASK(%rip), %xmm14
13081 mov arg7, %r10 # %r10 = AAD
13082- mov arg8, %r12 # %r12 = aadLen
13083- mov %r12, %r11
13084+ mov arg8, %r15 # %r15 = aadLen
13085+ mov %r15, %r11
13086 pxor %xmm\i, %xmm\i
13087
13088 _get_AAD_loop\num_initial_blocks\operation:
13089@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13090 psrldq $4, %xmm\i
13091 pxor \TMP1, %xmm\i
13092 add $4, %r10
13093- sub $4, %r12
13094+ sub $4, %r15
13095 jne _get_AAD_loop\num_initial_blocks\operation
13096
13097 cmp $16, %r11
13098 je _get_AAD_loop2_done\num_initial_blocks\operation
13099
13100- mov $16, %r12
13101+ mov $16, %r15
13102 _get_AAD_loop2\num_initial_blocks\operation:
13103 psrldq $4, %xmm\i
13104- sub $4, %r12
13105- cmp %r11, %r12
13106+ sub $4, %r15
13107+ cmp %r11, %r15
13108 jne _get_AAD_loop2\num_initial_blocks\operation
13109
13110 _get_AAD_loop2_done\num_initial_blocks\operation:
13111@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13112 * num_initial_blocks = b mod 4
13113 * encrypt the initial num_initial_blocks blocks and apply ghash on
13114 * the ciphertext
13115-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13116+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13117 * are clobbered
13118 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13119 */
13120@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13121 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13122 MOVADQ SHUF_MASK(%rip), %xmm14
13123 mov arg7, %r10 # %r10 = AAD
13124- mov arg8, %r12 # %r12 = aadLen
13125- mov %r12, %r11
13126+ mov arg8, %r15 # %r15 = aadLen
13127+ mov %r15, %r11
13128 pxor %xmm\i, %xmm\i
13129 _get_AAD_loop\num_initial_blocks\operation:
13130 movd (%r10), \TMP1
13131@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13132 psrldq $4, %xmm\i
13133 pxor \TMP1, %xmm\i
13134 add $4, %r10
13135- sub $4, %r12
13136+ sub $4, %r15
13137 jne _get_AAD_loop\num_initial_blocks\operation
13138 cmp $16, %r11
13139 je _get_AAD_loop2_done\num_initial_blocks\operation
13140- mov $16, %r12
13141+ mov $16, %r15
13142 _get_AAD_loop2\num_initial_blocks\operation:
13143 psrldq $4, %xmm\i
13144- sub $4, %r12
13145- cmp %r11, %r12
13146+ sub $4, %r15
13147+ cmp %r11, %r15
13148 jne _get_AAD_loop2\num_initial_blocks\operation
13149 _get_AAD_loop2_done\num_initial_blocks\operation:
13150 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13151@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13152 *
13153 *****************************************************************************/
13154 ENTRY(aesni_gcm_dec)
13155- push %r12
13156+ push %r15
13157 push %r13
13158 push %r14
13159 mov %rsp, %r14
13160@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13161 */
13162 sub $VARIABLE_OFFSET, %rsp
13163 and $~63, %rsp # align rsp to 64 bytes
13164- mov %arg6, %r12
13165- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13166+ mov %arg6, %r15
13167+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13168 movdqa SHUF_MASK(%rip), %xmm2
13169 PSHUFB_XMM %xmm2, %xmm13
13170
13171@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13172 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13173 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13174 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13175- mov %r13, %r12
13176- and $(3<<4), %r12
13177+ mov %r13, %r15
13178+ and $(3<<4), %r15
13179 jz _initial_num_blocks_is_0_decrypt
13180- cmp $(2<<4), %r12
13181+ cmp $(2<<4), %r15
13182 jb _initial_num_blocks_is_1_decrypt
13183 je _initial_num_blocks_is_2_decrypt
13184 _initial_num_blocks_is_3_decrypt:
13185@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13186 sub $16, %r11
13187 add %r13, %r11
13188 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13189- lea SHIFT_MASK+16(%rip), %r12
13190- sub %r13, %r12
13191+ lea SHIFT_MASK+16(%rip), %r15
13192+ sub %r13, %r15
13193 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13194 # (%r13 is the number of bytes in plaintext mod 16)
13195- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13196+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13197 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13198
13199 movdqa %xmm1, %xmm2
13200 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13201- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13202+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13203 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13204 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13205 pand %xmm1, %xmm2
13206@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13207 sub $1, %r13
13208 jne _less_than_8_bytes_left_decrypt
13209 _multiple_of_16_bytes_decrypt:
13210- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13211- shl $3, %r12 # convert into number of bits
13212- movd %r12d, %xmm15 # len(A) in %xmm15
13213+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13214+ shl $3, %r15 # convert into number of bits
13215+ movd %r15d, %xmm15 # len(A) in %xmm15
13216 shl $3, %arg4 # len(C) in bits (*128)
13217 MOVQ_R64_XMM %arg4, %xmm1
13218 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13219@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13220 mov %r14, %rsp
13221 pop %r14
13222 pop %r13
13223- pop %r12
13224+ pop %r15
13225+ pax_force_retaddr
13226 ret
13227 ENDPROC(aesni_gcm_dec)
13228
13229@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13230 * poly = x^128 + x^127 + x^126 + x^121 + 1
13231 ***************************************************************************/
13232 ENTRY(aesni_gcm_enc)
13233- push %r12
13234+ push %r15
13235 push %r13
13236 push %r14
13237 mov %rsp, %r14
13238@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13239 #
13240 sub $VARIABLE_OFFSET, %rsp
13241 and $~63, %rsp
13242- mov %arg6, %r12
13243- movdqu (%r12), %xmm13
13244+ mov %arg6, %r15
13245+ movdqu (%r15), %xmm13
13246 movdqa SHUF_MASK(%rip), %xmm2
13247 PSHUFB_XMM %xmm2, %xmm13
13248
13249@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13250 movdqa %xmm13, HashKey(%rsp)
13251 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13252 and $-16, %r13
13253- mov %r13, %r12
13254+ mov %r13, %r15
13255
13256 # Encrypt first few blocks
13257
13258- and $(3<<4), %r12
13259+ and $(3<<4), %r15
13260 jz _initial_num_blocks_is_0_encrypt
13261- cmp $(2<<4), %r12
13262+ cmp $(2<<4), %r15
13263 jb _initial_num_blocks_is_1_encrypt
13264 je _initial_num_blocks_is_2_encrypt
13265 _initial_num_blocks_is_3_encrypt:
13266@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13267 sub $16, %r11
13268 add %r13, %r11
13269 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13270- lea SHIFT_MASK+16(%rip), %r12
13271- sub %r13, %r12
13272+ lea SHIFT_MASK+16(%rip), %r15
13273+ sub %r13, %r15
13274 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13275 # (%r13 is the number of bytes in plaintext mod 16)
13276- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13277+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13278 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13279 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13280- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13281+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13282 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13283 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13284 movdqa SHUF_MASK(%rip), %xmm10
13285@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13286 sub $1, %r13
13287 jne _less_than_8_bytes_left_encrypt
13288 _multiple_of_16_bytes_encrypt:
13289- mov arg8, %r12 # %r12 = addLen (number of bytes)
13290- shl $3, %r12
13291- movd %r12d, %xmm15 # len(A) in %xmm15
13292+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13293+ shl $3, %r15
13294+ movd %r15d, %xmm15 # len(A) in %xmm15
13295 shl $3, %arg4 # len(C) in bits (*128)
13296 MOVQ_R64_XMM %arg4, %xmm1
13297 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13298@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13299 mov %r14, %rsp
13300 pop %r14
13301 pop %r13
13302- pop %r12
13303+ pop %r15
13304+ pax_force_retaddr
13305 ret
13306 ENDPROC(aesni_gcm_enc)
13307
13308@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13309 pxor %xmm1, %xmm0
13310 movaps %xmm0, (TKEYP)
13311 add $0x10, TKEYP
13312+ pax_force_retaddr
13313 ret
13314 ENDPROC(_key_expansion_128)
13315 ENDPROC(_key_expansion_256a)
13316@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13317 shufps $0b01001110, %xmm2, %xmm1
13318 movaps %xmm1, 0x10(TKEYP)
13319 add $0x20, TKEYP
13320+ pax_force_retaddr
13321 ret
13322 ENDPROC(_key_expansion_192a)
13323
13324@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13325
13326 movaps %xmm0, (TKEYP)
13327 add $0x10, TKEYP
13328+ pax_force_retaddr
13329 ret
13330 ENDPROC(_key_expansion_192b)
13331
13332@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13333 pxor %xmm1, %xmm2
13334 movaps %xmm2, (TKEYP)
13335 add $0x10, TKEYP
13336+ pax_force_retaddr
13337 ret
13338 ENDPROC(_key_expansion_256b)
13339
13340@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13341 #ifndef __x86_64__
13342 popl KEYP
13343 #endif
13344+ pax_force_retaddr
13345 ret
13346 ENDPROC(aesni_set_key)
13347
13348@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13349 popl KLEN
13350 popl KEYP
13351 #endif
13352+ pax_force_retaddr
13353 ret
13354 ENDPROC(aesni_enc)
13355
13356@@ -1985,6 +1994,7 @@ _aesni_enc1:
13357 AESENC KEY STATE
13358 movaps 0x70(TKEYP), KEY
13359 AESENCLAST KEY STATE
13360+ pax_force_retaddr
13361 ret
13362 ENDPROC(_aesni_enc1)
13363
13364@@ -2094,6 +2104,7 @@ _aesni_enc4:
13365 AESENCLAST KEY STATE2
13366 AESENCLAST KEY STATE3
13367 AESENCLAST KEY STATE4
13368+ pax_force_retaddr
13369 ret
13370 ENDPROC(_aesni_enc4)
13371
13372@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13373 popl KLEN
13374 popl KEYP
13375 #endif
13376+ pax_force_retaddr
13377 ret
13378 ENDPROC(aesni_dec)
13379
13380@@ -2175,6 +2187,7 @@ _aesni_dec1:
13381 AESDEC KEY STATE
13382 movaps 0x70(TKEYP), KEY
13383 AESDECLAST KEY STATE
13384+ pax_force_retaddr
13385 ret
13386 ENDPROC(_aesni_dec1)
13387
13388@@ -2284,6 +2297,7 @@ _aesni_dec4:
13389 AESDECLAST KEY STATE2
13390 AESDECLAST KEY STATE3
13391 AESDECLAST KEY STATE4
13392+ pax_force_retaddr
13393 ret
13394 ENDPROC(_aesni_dec4)
13395
13396@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13397 popl KEYP
13398 popl LEN
13399 #endif
13400+ pax_force_retaddr
13401 ret
13402 ENDPROC(aesni_ecb_enc)
13403
13404@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13405 popl KEYP
13406 popl LEN
13407 #endif
13408+ pax_force_retaddr
13409 ret
13410 ENDPROC(aesni_ecb_dec)
13411
13412@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13413 popl LEN
13414 popl IVP
13415 #endif
13416+ pax_force_retaddr
13417 ret
13418 ENDPROC(aesni_cbc_enc)
13419
13420@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13421 popl LEN
13422 popl IVP
13423 #endif
13424+ pax_force_retaddr
13425 ret
13426 ENDPROC(aesni_cbc_dec)
13427
13428@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13429 mov $1, TCTR_LOW
13430 MOVQ_R64_XMM TCTR_LOW INC
13431 MOVQ_R64_XMM CTR TCTR_LOW
13432+ pax_force_retaddr
13433 ret
13434 ENDPROC(_aesni_inc_init)
13435
13436@@ -2590,6 +2609,7 @@ _aesni_inc:
13437 .Linc_low:
13438 movaps CTR, IV
13439 PSHUFB_XMM BSWAP_MASK IV
13440+ pax_force_retaddr
13441 ret
13442 ENDPROC(_aesni_inc)
13443
13444@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13445 .Lctr_enc_ret:
13446 movups IV, (IVP)
13447 .Lctr_enc_just_ret:
13448+ pax_force_retaddr
13449 ret
13450 ENDPROC(aesni_ctr_enc)
13451
13452@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13453 pxor INC, STATE4
13454 movdqu STATE4, 0x70(OUTP)
13455
13456+ pax_force_retaddr
13457 ret
13458 ENDPROC(aesni_xts_crypt8)
13459
13460diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13461index 246c670..466e2d6 100644
13462--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13463+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13464@@ -21,6 +21,7 @@
13465 */
13466
13467 #include <linux/linkage.h>
13468+#include <asm/alternative-asm.h>
13469
13470 .file "blowfish-x86_64-asm.S"
13471 .text
13472@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13473 jnz .L__enc_xor;
13474
13475 write_block();
13476+ pax_force_retaddr
13477 ret;
13478 .L__enc_xor:
13479 xor_block();
13480+ pax_force_retaddr
13481 ret;
13482 ENDPROC(__blowfish_enc_blk)
13483
13484@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13485
13486 movq %r11, %rbp;
13487
13488+ pax_force_retaddr
13489 ret;
13490 ENDPROC(blowfish_dec_blk)
13491
13492@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13493
13494 popq %rbx;
13495 popq %rbp;
13496+ pax_force_retaddr
13497 ret;
13498
13499 .L__enc_xor4:
13500@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13501
13502 popq %rbx;
13503 popq %rbp;
13504+ pax_force_retaddr
13505 ret;
13506 ENDPROC(__blowfish_enc_blk_4way)
13507
13508@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13509 popq %rbx;
13510 popq %rbp;
13511
13512+ pax_force_retaddr
13513 ret;
13514 ENDPROC(blowfish_dec_blk_4way)
13515diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13516index ce71f92..1dce7ec 100644
13517--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13518+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13519@@ -16,6 +16,7 @@
13520 */
13521
13522 #include <linux/linkage.h>
13523+#include <asm/alternative-asm.h>
13524
13525 #define CAMELLIA_TABLE_BYTE_LEN 272
13526
13527@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13528 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13529 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13530 %rcx, (%r9));
13531+ pax_force_retaddr
13532 ret;
13533 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13534
13535@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13536 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13537 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13538 %rax, (%r9));
13539+ pax_force_retaddr
13540 ret;
13541 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13542
13543@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13544 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13545 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13546
13547+ pax_force_retaddr
13548 ret;
13549
13550 .align 8
13551@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13552 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13553 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13554
13555+ pax_force_retaddr
13556 ret;
13557
13558 .align 8
13559@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13560 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13561 %xmm8, %rsi);
13562
13563+ pax_force_retaddr
13564 ret;
13565 ENDPROC(camellia_ecb_enc_16way)
13566
13567@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13568 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13569 %xmm8, %rsi);
13570
13571+ pax_force_retaddr
13572 ret;
13573 ENDPROC(camellia_ecb_dec_16way)
13574
13575@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13576 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13577 %xmm8, %rsi);
13578
13579+ pax_force_retaddr
13580 ret;
13581 ENDPROC(camellia_cbc_dec_16way)
13582
13583@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13584 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13585 %xmm8, %rsi);
13586
13587+ pax_force_retaddr
13588 ret;
13589 ENDPROC(camellia_ctr_16way)
13590
13591@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13592 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13593 %xmm8, %rsi);
13594
13595+ pax_force_retaddr
13596 ret;
13597 ENDPROC(camellia_xts_crypt_16way)
13598
13599diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13600index 0e0b886..5a3123c 100644
13601--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13602+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13603@@ -11,6 +11,7 @@
13604 */
13605
13606 #include <linux/linkage.h>
13607+#include <asm/alternative-asm.h>
13608
13609 #define CAMELLIA_TABLE_BYTE_LEN 272
13610
13611@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13612 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13613 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13614 %rcx, (%r9));
13615+ pax_force_retaddr
13616 ret;
13617 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13618
13619@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13620 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13621 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13622 %rax, (%r9));
13623+ pax_force_retaddr
13624 ret;
13625 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13626
13627@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13628 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13629 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13630
13631+ pax_force_retaddr
13632 ret;
13633
13634 .align 8
13635@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13636 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13637 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13638
13639+ pax_force_retaddr
13640 ret;
13641
13642 .align 8
13643@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13644
13645 vzeroupper;
13646
13647+ pax_force_retaddr
13648 ret;
13649 ENDPROC(camellia_ecb_enc_32way)
13650
13651@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13652
13653 vzeroupper;
13654
13655+ pax_force_retaddr
13656 ret;
13657 ENDPROC(camellia_ecb_dec_32way)
13658
13659@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13660
13661 vzeroupper;
13662
13663+ pax_force_retaddr
13664 ret;
13665 ENDPROC(camellia_cbc_dec_32way)
13666
13667@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13668
13669 vzeroupper;
13670
13671+ pax_force_retaddr
13672 ret;
13673 ENDPROC(camellia_ctr_32way)
13674
13675@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13676
13677 vzeroupper;
13678
13679+ pax_force_retaddr
13680 ret;
13681 ENDPROC(camellia_xts_crypt_32way)
13682
13683diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13684index 310319c..db3d7b5 100644
13685--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13686+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13687@@ -21,6 +21,7 @@
13688 */
13689
13690 #include <linux/linkage.h>
13691+#include <asm/alternative-asm.h>
13692
13693 .file "camellia-x86_64-asm_64.S"
13694 .text
13695@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13696 enc_outunpack(mov, RT1);
13697
13698 movq RRBP, %rbp;
13699+ pax_force_retaddr
13700 ret;
13701
13702 .L__enc_xor:
13703 enc_outunpack(xor, RT1);
13704
13705 movq RRBP, %rbp;
13706+ pax_force_retaddr
13707 ret;
13708 ENDPROC(__camellia_enc_blk)
13709
13710@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13711 dec_outunpack();
13712
13713 movq RRBP, %rbp;
13714+ pax_force_retaddr
13715 ret;
13716 ENDPROC(camellia_dec_blk)
13717
13718@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13719
13720 movq RRBP, %rbp;
13721 popq %rbx;
13722+ pax_force_retaddr
13723 ret;
13724
13725 .L__enc2_xor:
13726@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13727
13728 movq RRBP, %rbp;
13729 popq %rbx;
13730+ pax_force_retaddr
13731 ret;
13732 ENDPROC(__camellia_enc_blk_2way)
13733
13734@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13735
13736 movq RRBP, %rbp;
13737 movq RXOR, %rbx;
13738+ pax_force_retaddr
13739 ret;
13740 ENDPROC(camellia_dec_blk_2way)
13741diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13742index c35fd5d..2d8c7db 100644
13743--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13744+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13745@@ -24,6 +24,7 @@
13746 */
13747
13748 #include <linux/linkage.h>
13749+#include <asm/alternative-asm.h>
13750
13751 .file "cast5-avx-x86_64-asm_64.S"
13752
13753@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13754 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13755 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13756
13757+ pax_force_retaddr
13758 ret;
13759 ENDPROC(__cast5_enc_blk16)
13760
13761@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13762 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13763 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13764
13765+ pax_force_retaddr
13766 ret;
13767
13768 .L__skip_dec:
13769@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13770 vmovdqu RR4, (6*4*4)(%r11);
13771 vmovdqu RL4, (7*4*4)(%r11);
13772
13773+ pax_force_retaddr
13774 ret;
13775 ENDPROC(cast5_ecb_enc_16way)
13776
13777@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13778 vmovdqu RR4, (6*4*4)(%r11);
13779 vmovdqu RL4, (7*4*4)(%r11);
13780
13781+ pax_force_retaddr
13782 ret;
13783 ENDPROC(cast5_ecb_dec_16way)
13784
13785@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13786 * %rdx: src
13787 */
13788
13789- pushq %r12;
13790+ pushq %r14;
13791
13792 movq %rsi, %r11;
13793- movq %rdx, %r12;
13794+ movq %rdx, %r14;
13795
13796 vmovdqu (0*16)(%rdx), RL1;
13797 vmovdqu (1*16)(%rdx), RR1;
13798@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13799 call __cast5_dec_blk16;
13800
13801 /* xor with src */
13802- vmovq (%r12), RX;
13803+ vmovq (%r14), RX;
13804 vpshufd $0x4f, RX, RX;
13805 vpxor RX, RR1, RR1;
13806- vpxor 0*16+8(%r12), RL1, RL1;
13807- vpxor 1*16+8(%r12), RR2, RR2;
13808- vpxor 2*16+8(%r12), RL2, RL2;
13809- vpxor 3*16+8(%r12), RR3, RR3;
13810- vpxor 4*16+8(%r12), RL3, RL3;
13811- vpxor 5*16+8(%r12), RR4, RR4;
13812- vpxor 6*16+8(%r12), RL4, RL4;
13813+ vpxor 0*16+8(%r14), RL1, RL1;
13814+ vpxor 1*16+8(%r14), RR2, RR2;
13815+ vpxor 2*16+8(%r14), RL2, RL2;
13816+ vpxor 3*16+8(%r14), RR3, RR3;
13817+ vpxor 4*16+8(%r14), RL3, RL3;
13818+ vpxor 5*16+8(%r14), RR4, RR4;
13819+ vpxor 6*16+8(%r14), RL4, RL4;
13820
13821 vmovdqu RR1, (0*16)(%r11);
13822 vmovdqu RL1, (1*16)(%r11);
13823@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13824 vmovdqu RR4, (6*16)(%r11);
13825 vmovdqu RL4, (7*16)(%r11);
13826
13827- popq %r12;
13828+ popq %r14;
13829
13830+ pax_force_retaddr
13831 ret;
13832 ENDPROC(cast5_cbc_dec_16way)
13833
13834@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13835 * %rcx: iv (big endian, 64bit)
13836 */
13837
13838- pushq %r12;
13839+ pushq %r14;
13840
13841 movq %rsi, %r11;
13842- movq %rdx, %r12;
13843+ movq %rdx, %r14;
13844
13845 vpcmpeqd RTMP, RTMP, RTMP;
13846 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13847@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13848 call __cast5_enc_blk16;
13849
13850 /* dst = src ^ iv */
13851- vpxor (0*16)(%r12), RR1, RR1;
13852- vpxor (1*16)(%r12), RL1, RL1;
13853- vpxor (2*16)(%r12), RR2, RR2;
13854- vpxor (3*16)(%r12), RL2, RL2;
13855- vpxor (4*16)(%r12), RR3, RR3;
13856- vpxor (5*16)(%r12), RL3, RL3;
13857- vpxor (6*16)(%r12), RR4, RR4;
13858- vpxor (7*16)(%r12), RL4, RL4;
13859+ vpxor (0*16)(%r14), RR1, RR1;
13860+ vpxor (1*16)(%r14), RL1, RL1;
13861+ vpxor (2*16)(%r14), RR2, RR2;
13862+ vpxor (3*16)(%r14), RL2, RL2;
13863+ vpxor (4*16)(%r14), RR3, RR3;
13864+ vpxor (5*16)(%r14), RL3, RL3;
13865+ vpxor (6*16)(%r14), RR4, RR4;
13866+ vpxor (7*16)(%r14), RL4, RL4;
13867 vmovdqu RR1, (0*16)(%r11);
13868 vmovdqu RL1, (1*16)(%r11);
13869 vmovdqu RR2, (2*16)(%r11);
13870@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13871 vmovdqu RR4, (6*16)(%r11);
13872 vmovdqu RL4, (7*16)(%r11);
13873
13874- popq %r12;
13875+ popq %r14;
13876
13877+ pax_force_retaddr
13878 ret;
13879 ENDPROC(cast5_ctr_16way)
13880diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13881index e3531f8..e123f35 100644
13882--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13883+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13884@@ -24,6 +24,7 @@
13885 */
13886
13887 #include <linux/linkage.h>
13888+#include <asm/alternative-asm.h>
13889 #include "glue_helper-asm-avx.S"
13890
13891 .file "cast6-avx-x86_64-asm_64.S"
13892@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13893 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13894 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13895
13896+ pax_force_retaddr
13897 ret;
13898 ENDPROC(__cast6_enc_blk8)
13899
13900@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13901 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13902 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13903
13904+ pax_force_retaddr
13905 ret;
13906 ENDPROC(__cast6_dec_blk8)
13907
13908@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13909
13910 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13911
13912+ pax_force_retaddr
13913 ret;
13914 ENDPROC(cast6_ecb_enc_8way)
13915
13916@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13917
13918 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13919
13920+ pax_force_retaddr
13921 ret;
13922 ENDPROC(cast6_ecb_dec_8way)
13923
13924@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13925 * %rdx: src
13926 */
13927
13928- pushq %r12;
13929+ pushq %r14;
13930
13931 movq %rsi, %r11;
13932- movq %rdx, %r12;
13933+ movq %rdx, %r14;
13934
13935 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13936
13937 call __cast6_dec_blk8;
13938
13939- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13940+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13941
13942- popq %r12;
13943+ popq %r14;
13944
13945+ pax_force_retaddr
13946 ret;
13947 ENDPROC(cast6_cbc_dec_8way)
13948
13949@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13950 * %rcx: iv (little endian, 128bit)
13951 */
13952
13953- pushq %r12;
13954+ pushq %r14;
13955
13956 movq %rsi, %r11;
13957- movq %rdx, %r12;
13958+ movq %rdx, %r14;
13959
13960 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13961 RD2, RX, RKR, RKM);
13962
13963 call __cast6_enc_blk8;
13964
13965- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13966+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13967
13968- popq %r12;
13969+ popq %r14;
13970
13971+ pax_force_retaddr
13972 ret;
13973 ENDPROC(cast6_ctr_8way)
13974
13975@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13976 /* dst <= regs xor IVs(in dst) */
13977 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13978
13979+ pax_force_retaddr
13980 ret;
13981 ENDPROC(cast6_xts_enc_8way)
13982
13983@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13984 /* dst <= regs xor IVs(in dst) */
13985 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13986
13987+ pax_force_retaddr
13988 ret;
13989 ENDPROC(cast6_xts_dec_8way)
13990diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13991index 225be06..2885e731 100644
13992--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13993+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13994@@ -45,6 +45,7 @@
13995
13996 #include <asm/inst.h>
13997 #include <linux/linkage.h>
13998+#include <asm/alternative-asm.h>
13999
14000 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
14001
14002@@ -309,6 +310,7 @@ do_return:
14003 popq %rsi
14004 popq %rdi
14005 popq %rbx
14006+ pax_force_retaddr
14007 ret
14008
14009 ################################################################
14010@@ -330,7 +332,7 @@ ENDPROC(crc_pcl)
14011 ## PCLMULQDQ tables
14012 ## Table is 128 entries x 2 words (8 bytes) each
14013 ################################################################
14014-.section .rotata, "a", %progbits
14015+.section .rodata, "a", %progbits
14016 .align 8
14017 K_table:
14018 .long 0x493c7d27, 0x00000001
14019diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14020index 5d1e007..098cb4f 100644
14021--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14022+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14023@@ -18,6 +18,7 @@
14024
14025 #include <linux/linkage.h>
14026 #include <asm/inst.h>
14027+#include <asm/alternative-asm.h>
14028
14029 .data
14030
14031@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14032 psrlq $1, T2
14033 pxor T2, T1
14034 pxor T1, DATA
14035+ pax_force_retaddr
14036 ret
14037 ENDPROC(__clmul_gf128mul_ble)
14038
14039@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14040 call __clmul_gf128mul_ble
14041 PSHUFB_XMM BSWAP DATA
14042 movups DATA, (%rdi)
14043+ pax_force_retaddr
14044 ret
14045 ENDPROC(clmul_ghash_mul)
14046
14047@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14048 PSHUFB_XMM BSWAP DATA
14049 movups DATA, (%rdi)
14050 .Lupdate_just_ret:
14051+ pax_force_retaddr
14052 ret
14053 ENDPROC(clmul_ghash_update)
14054diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14055index 9279e0b..c4b3d2c 100644
14056--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14057+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14058@@ -1,4 +1,5 @@
14059 #include <linux/linkage.h>
14060+#include <asm/alternative-asm.h>
14061
14062 # enter salsa20_encrypt_bytes
14063 ENTRY(salsa20_encrypt_bytes)
14064@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14065 add %r11,%rsp
14066 mov %rdi,%rax
14067 mov %rsi,%rdx
14068+ pax_force_retaddr
14069 ret
14070 # bytesatleast65:
14071 ._bytesatleast65:
14072@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14073 add %r11,%rsp
14074 mov %rdi,%rax
14075 mov %rsi,%rdx
14076+ pax_force_retaddr
14077 ret
14078 ENDPROC(salsa20_keysetup)
14079
14080@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14081 add %r11,%rsp
14082 mov %rdi,%rax
14083 mov %rsi,%rdx
14084+ pax_force_retaddr
14085 ret
14086 ENDPROC(salsa20_ivsetup)
14087diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14088index 2f202f4..d9164d6 100644
14089--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14090+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14091@@ -24,6 +24,7 @@
14092 */
14093
14094 #include <linux/linkage.h>
14095+#include <asm/alternative-asm.h>
14096 #include "glue_helper-asm-avx.S"
14097
14098 .file "serpent-avx-x86_64-asm_64.S"
14099@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14100 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14101 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14102
14103+ pax_force_retaddr
14104 ret;
14105 ENDPROC(__serpent_enc_blk8_avx)
14106
14107@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14108 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14109 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14110
14111+ pax_force_retaddr
14112 ret;
14113 ENDPROC(__serpent_dec_blk8_avx)
14114
14115@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14116
14117 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14118
14119+ pax_force_retaddr
14120 ret;
14121 ENDPROC(serpent_ecb_enc_8way_avx)
14122
14123@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14124
14125 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14126
14127+ pax_force_retaddr
14128 ret;
14129 ENDPROC(serpent_ecb_dec_8way_avx)
14130
14131@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14132
14133 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14134
14135+ pax_force_retaddr
14136 ret;
14137 ENDPROC(serpent_cbc_dec_8way_avx)
14138
14139@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14140
14141 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14142
14143+ pax_force_retaddr
14144 ret;
14145 ENDPROC(serpent_ctr_8way_avx)
14146
14147@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14148 /* dst <= regs xor IVs(in dst) */
14149 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14150
14151+ pax_force_retaddr
14152 ret;
14153 ENDPROC(serpent_xts_enc_8way_avx)
14154
14155@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14156 /* dst <= regs xor IVs(in dst) */
14157 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14158
14159+ pax_force_retaddr
14160 ret;
14161 ENDPROC(serpent_xts_dec_8way_avx)
14162diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14163index b222085..abd483c 100644
14164--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14165+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14166@@ -15,6 +15,7 @@
14167 */
14168
14169 #include <linux/linkage.h>
14170+#include <asm/alternative-asm.h>
14171 #include "glue_helper-asm-avx2.S"
14172
14173 .file "serpent-avx2-asm_64.S"
14174@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14175 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14176 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14177
14178+ pax_force_retaddr
14179 ret;
14180 ENDPROC(__serpent_enc_blk16)
14181
14182@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14183 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14184 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14185
14186+ pax_force_retaddr
14187 ret;
14188 ENDPROC(__serpent_dec_blk16)
14189
14190@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14191
14192 vzeroupper;
14193
14194+ pax_force_retaddr
14195 ret;
14196 ENDPROC(serpent_ecb_enc_16way)
14197
14198@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14199
14200 vzeroupper;
14201
14202+ pax_force_retaddr
14203 ret;
14204 ENDPROC(serpent_ecb_dec_16way)
14205
14206@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14207
14208 vzeroupper;
14209
14210+ pax_force_retaddr
14211 ret;
14212 ENDPROC(serpent_cbc_dec_16way)
14213
14214@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14215
14216 vzeroupper;
14217
14218+ pax_force_retaddr
14219 ret;
14220 ENDPROC(serpent_ctr_16way)
14221
14222@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14223
14224 vzeroupper;
14225
14226+ pax_force_retaddr
14227 ret;
14228 ENDPROC(serpent_xts_enc_16way)
14229
14230@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14231
14232 vzeroupper;
14233
14234+ pax_force_retaddr
14235 ret;
14236 ENDPROC(serpent_xts_dec_16way)
14237diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14238index acc066c..1559cc4 100644
14239--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14240+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14241@@ -25,6 +25,7 @@
14242 */
14243
14244 #include <linux/linkage.h>
14245+#include <asm/alternative-asm.h>
14246
14247 .file "serpent-sse2-x86_64-asm_64.S"
14248 .text
14249@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14250 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14251 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14252
14253+ pax_force_retaddr
14254 ret;
14255
14256 .L__enc_xor8:
14257 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14258 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14259
14260+ pax_force_retaddr
14261 ret;
14262 ENDPROC(__serpent_enc_blk_8way)
14263
14264@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14265 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14266 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14267
14268+ pax_force_retaddr
14269 ret;
14270 ENDPROC(serpent_dec_blk_8way)
14271diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14272index a410950..9dfe7ad 100644
14273--- a/arch/x86/crypto/sha1_ssse3_asm.S
14274+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14275@@ -29,6 +29,7 @@
14276 */
14277
14278 #include <linux/linkage.h>
14279+#include <asm/alternative-asm.h>
14280
14281 #define CTX %rdi // arg1
14282 #define BUF %rsi // arg2
14283@@ -75,9 +76,9 @@
14284
14285 push %rbx
14286 push %rbp
14287- push %r12
14288+ push %r14
14289
14290- mov %rsp, %r12
14291+ mov %rsp, %r14
14292 sub $64, %rsp # allocate workspace
14293 and $~15, %rsp # align stack
14294
14295@@ -99,11 +100,12 @@
14296 xor %rax, %rax
14297 rep stosq
14298
14299- mov %r12, %rsp # deallocate workspace
14300+ mov %r14, %rsp # deallocate workspace
14301
14302- pop %r12
14303+ pop %r14
14304 pop %rbp
14305 pop %rbx
14306+ pax_force_retaddr
14307 ret
14308
14309 ENDPROC(\name)
14310diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14311index 92b3b5d..0dc1dcb 100644
14312--- a/arch/x86/crypto/sha256-avx-asm.S
14313+++ b/arch/x86/crypto/sha256-avx-asm.S
14314@@ -49,6 +49,7 @@
14315
14316 #ifdef CONFIG_AS_AVX
14317 #include <linux/linkage.h>
14318+#include <asm/alternative-asm.h>
14319
14320 ## assume buffers not aligned
14321 #define VMOVDQ vmovdqu
14322@@ -460,6 +461,7 @@ done_hash:
14323 popq %r13
14324 popq %rbp
14325 popq %rbx
14326+ pax_force_retaddr
14327 ret
14328 ENDPROC(sha256_transform_avx)
14329
14330diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14331index 570ec5e..cf2b625 100644
14332--- a/arch/x86/crypto/sha256-avx2-asm.S
14333+++ b/arch/x86/crypto/sha256-avx2-asm.S
14334@@ -50,6 +50,7 @@
14335
14336 #ifdef CONFIG_AS_AVX2
14337 #include <linux/linkage.h>
14338+#include <asm/alternative-asm.h>
14339
14340 ## assume buffers not aligned
14341 #define VMOVDQ vmovdqu
14342@@ -720,6 +721,7 @@ done_hash:
14343 popq %r12
14344 popq %rbp
14345 popq %rbx
14346+ pax_force_retaddr
14347 ret
14348 ENDPROC(sha256_transform_rorx)
14349
14350diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14351index 2cedc44..5144899 100644
14352--- a/arch/x86/crypto/sha256-ssse3-asm.S
14353+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14354@@ -47,6 +47,7 @@
14355 ########################################################################
14356
14357 #include <linux/linkage.h>
14358+#include <asm/alternative-asm.h>
14359
14360 ## assume buffers not aligned
14361 #define MOVDQ movdqu
14362@@ -471,6 +472,7 @@ done_hash:
14363 popq %rbp
14364 popq %rbx
14365
14366+ pax_force_retaddr
14367 ret
14368 ENDPROC(sha256_transform_ssse3)
14369
14370diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14371index 565274d..af6bc08 100644
14372--- a/arch/x86/crypto/sha512-avx-asm.S
14373+++ b/arch/x86/crypto/sha512-avx-asm.S
14374@@ -49,6 +49,7 @@
14375
14376 #ifdef CONFIG_AS_AVX
14377 #include <linux/linkage.h>
14378+#include <asm/alternative-asm.h>
14379
14380 .text
14381
14382@@ -364,6 +365,7 @@ updateblock:
14383 mov frame_RSPSAVE(%rsp), %rsp
14384
14385 nowork:
14386+ pax_force_retaddr
14387 ret
14388 ENDPROC(sha512_transform_avx)
14389
14390diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14391index 1f20b35..f25c8c1 100644
14392--- a/arch/x86/crypto/sha512-avx2-asm.S
14393+++ b/arch/x86/crypto/sha512-avx2-asm.S
14394@@ -51,6 +51,7 @@
14395
14396 #ifdef CONFIG_AS_AVX2
14397 #include <linux/linkage.h>
14398+#include <asm/alternative-asm.h>
14399
14400 .text
14401
14402@@ -678,6 +679,7 @@ done_hash:
14403
14404 # Restore Stack Pointer
14405 mov frame_RSPSAVE(%rsp), %rsp
14406+ pax_force_retaddr
14407 ret
14408 ENDPROC(sha512_transform_rorx)
14409
14410diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14411index e610e29..ffcb5ed 100644
14412--- a/arch/x86/crypto/sha512-ssse3-asm.S
14413+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14414@@ -48,6 +48,7 @@
14415 ########################################################################
14416
14417 #include <linux/linkage.h>
14418+#include <asm/alternative-asm.h>
14419
14420 .text
14421
14422@@ -363,6 +364,7 @@ updateblock:
14423 mov frame_RSPSAVE(%rsp), %rsp
14424
14425 nowork:
14426+ pax_force_retaddr
14427 ret
14428 ENDPROC(sha512_transform_ssse3)
14429
14430diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14431index 0505813..b067311 100644
14432--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14433+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14434@@ -24,6 +24,7 @@
14435 */
14436
14437 #include <linux/linkage.h>
14438+#include <asm/alternative-asm.h>
14439 #include "glue_helper-asm-avx.S"
14440
14441 .file "twofish-avx-x86_64-asm_64.S"
14442@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14443 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14444 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14445
14446+ pax_force_retaddr
14447 ret;
14448 ENDPROC(__twofish_enc_blk8)
14449
14450@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14451 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14452 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14453
14454+ pax_force_retaddr
14455 ret;
14456 ENDPROC(__twofish_dec_blk8)
14457
14458@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14459
14460 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14461
14462+ pax_force_retaddr
14463 ret;
14464 ENDPROC(twofish_ecb_enc_8way)
14465
14466@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14467
14468 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14469
14470+ pax_force_retaddr
14471 ret;
14472 ENDPROC(twofish_ecb_dec_8way)
14473
14474@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14475 * %rdx: src
14476 */
14477
14478- pushq %r12;
14479+ pushq %r14;
14480
14481 movq %rsi, %r11;
14482- movq %rdx, %r12;
14483+ movq %rdx, %r14;
14484
14485 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14486
14487 call __twofish_dec_blk8;
14488
14489- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14490+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14491
14492- popq %r12;
14493+ popq %r14;
14494
14495+ pax_force_retaddr
14496 ret;
14497 ENDPROC(twofish_cbc_dec_8way)
14498
14499@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14500 * %rcx: iv (little endian, 128bit)
14501 */
14502
14503- pushq %r12;
14504+ pushq %r14;
14505
14506 movq %rsi, %r11;
14507- movq %rdx, %r12;
14508+ movq %rdx, %r14;
14509
14510 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14511 RD2, RX0, RX1, RY0);
14512
14513 call __twofish_enc_blk8;
14514
14515- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14516+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14517
14518- popq %r12;
14519+ popq %r14;
14520
14521+ pax_force_retaddr
14522 ret;
14523 ENDPROC(twofish_ctr_8way)
14524
14525@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14526 /* dst <= regs xor IVs(in dst) */
14527 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14528
14529+ pax_force_retaddr
14530 ret;
14531 ENDPROC(twofish_xts_enc_8way)
14532
14533@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14534 /* dst <= regs xor IVs(in dst) */
14535 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14536
14537+ pax_force_retaddr
14538 ret;
14539 ENDPROC(twofish_xts_dec_8way)
14540diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14541index 1c3b7ce..02f578d 100644
14542--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14543+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14544@@ -21,6 +21,7 @@
14545 */
14546
14547 #include <linux/linkage.h>
14548+#include <asm/alternative-asm.h>
14549
14550 .file "twofish-x86_64-asm-3way.S"
14551 .text
14552@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14553 popq %r13;
14554 popq %r14;
14555 popq %r15;
14556+ pax_force_retaddr
14557 ret;
14558
14559 .L__enc_xor3:
14560@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14561 popq %r13;
14562 popq %r14;
14563 popq %r15;
14564+ pax_force_retaddr
14565 ret;
14566 ENDPROC(__twofish_enc_blk_3way)
14567
14568@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14569 popq %r13;
14570 popq %r14;
14571 popq %r15;
14572+ pax_force_retaddr
14573 ret;
14574 ENDPROC(twofish_dec_blk_3way)
14575diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14576index a350c99..c1bac24 100644
14577--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14578+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14579@@ -22,6 +22,7 @@
14580
14581 #include <linux/linkage.h>
14582 #include <asm/asm-offsets.h>
14583+#include <asm/alternative-asm.h>
14584
14585 #define a_offset 0
14586 #define b_offset 4
14587@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14588
14589 popq R1
14590 movl $1,%eax
14591+ pax_force_retaddr
14592 ret
14593 ENDPROC(twofish_enc_blk)
14594
14595@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14596
14597 popq R1
14598 movl $1,%eax
14599+ pax_force_retaddr
14600 ret
14601 ENDPROC(twofish_dec_blk)
14602diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14603index ae6aad1..719d6d9 100644
14604--- a/arch/x86/ia32/ia32_aout.c
14605+++ b/arch/x86/ia32/ia32_aout.c
14606@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14607 unsigned long dump_start, dump_size;
14608 struct user32 dump;
14609
14610+ memset(&dump, 0, sizeof(dump));
14611+
14612 fs = get_fs();
14613 set_fs(KERNEL_DS);
14614 has_dumped = 1;
14615diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14616index c81d35e6..3500144 100644
14617--- a/arch/x86/ia32/ia32_signal.c
14618+++ b/arch/x86/ia32/ia32_signal.c
14619@@ -216,7 +216,7 @@ asmlinkage long sys32_sigreturn(void)
14620 if (__get_user(set.sig[0], &frame->sc.oldmask)
14621 || (_COMPAT_NSIG_WORDS > 1
14622 && __copy_from_user((((char *) &set.sig) + 4),
14623- &frame->extramask,
14624+ frame->extramask,
14625 sizeof(frame->extramask))))
14626 goto badframe;
14627
14628@@ -335,7 +335,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14629 sp -= frame_size;
14630 /* Align the stack pointer according to the i386 ABI,
14631 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14632- sp = ((sp + 4) & -16ul) - 4;
14633+ sp = ((sp - 12) & -16ul) - 4;
14634 return (void __user *) sp;
14635 }
14636
14637@@ -380,10 +380,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14638 } else {
14639 /* Return stub is in 32bit vsyscall page */
14640 if (current->mm->context.vdso)
14641- restorer = current->mm->context.vdso +
14642- selected_vdso32->sym___kernel_sigreturn;
14643+ restorer = (void __force_user *)(current->mm->context.vdso +
14644+ selected_vdso32->sym___kernel_sigreturn);
14645 else
14646- restorer = &frame->retcode;
14647+ restorer = frame->retcode;
14648 }
14649
14650 put_user_try {
14651@@ -393,7 +393,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14652 * These are actually not used anymore, but left because some
14653 * gdb versions depend on them as a marker.
14654 */
14655- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14656+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14657 } put_user_catch(err);
14658
14659 if (err)
14660@@ -435,7 +435,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14661 0xb8,
14662 __NR_ia32_rt_sigreturn,
14663 0x80cd,
14664- 0,
14665+ 0
14666 };
14667
14668 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14669@@ -458,16 +458,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14670
14671 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14672 restorer = ksig->ka.sa.sa_restorer;
14673+ else if (current->mm->context.vdso)
14674+ /* Return stub is in 32bit vsyscall page */
14675+ restorer = (void __force_user *)(current->mm->context.vdso +
14676+ selected_vdso32->sym___kernel_rt_sigreturn);
14677 else
14678- restorer = current->mm->context.vdso +
14679- selected_vdso32->sym___kernel_rt_sigreturn;
14680+ restorer = frame->retcode;
14681 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14682
14683 /*
14684 * Not actually used anymore, but left because some gdb
14685 * versions need it.
14686 */
14687- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14688+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14689 } put_user_catch(err);
14690
14691 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14692diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14693index 72bf268..127572a 100644
14694--- a/arch/x86/ia32/ia32entry.S
14695+++ b/arch/x86/ia32/ia32entry.S
14696@@ -15,8 +15,10 @@
14697 #include <asm/irqflags.h>
14698 #include <asm/asm.h>
14699 #include <asm/smap.h>
14700+#include <asm/pgtable.h>
14701 #include <linux/linkage.h>
14702 #include <linux/err.h>
14703+#include <asm/alternative-asm.h>
14704
14705 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14706 #include <linux/elf-em.h>
14707@@ -85,6 +87,32 @@ ENTRY(native_irq_enable_sysexit)
14708 ENDPROC(native_irq_enable_sysexit)
14709 #endif
14710
14711+ .macro pax_enter_kernel_user
14712+ pax_set_fptr_mask
14713+#ifdef CONFIG_PAX_MEMORY_UDEREF
14714+ call pax_enter_kernel_user
14715+#endif
14716+ .endm
14717+
14718+ .macro pax_exit_kernel_user
14719+#ifdef CONFIG_PAX_MEMORY_UDEREF
14720+ call pax_exit_kernel_user
14721+#endif
14722+#ifdef CONFIG_PAX_RANDKSTACK
14723+ pushq %rax
14724+ pushq %r11
14725+ call pax_randomize_kstack
14726+ popq %r11
14727+ popq %rax
14728+#endif
14729+ .endm
14730+
14731+ .macro pax_erase_kstack
14732+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14733+ call pax_erase_kstack
14734+#endif
14735+ .endm
14736+
14737 /*
14738 * 32bit SYSENTER instruction entry.
14739 *
14740@@ -119,23 +147,24 @@ ENTRY(ia32_sysenter_target)
14741 * it is too small to ever cause noticeable irq latency.
14742 */
14743 SWAPGS_UNSAFE_STACK
14744- movq PER_CPU_VAR(cpu_tss + TSS_sp0), %rsp
14745- ENABLE_INTERRUPTS(CLBR_NONE)
14746+ movq PER_CPU_VAR(kernel_stack), %rsp
14747
14748 /* Zero-extending 32-bit regs, do not remove */
14749 movl %ebp, %ebp
14750 movl %eax, %eax
14751
14752- movl ASM_THREAD_INFO(TI_sysenter_return, %rsp, 0), %r10d
14753- CFI_REGISTER rip,r10
14754+ GET_THREAD_INFO(%r11)
14755+ movl TI_sysenter_return(%r11), %r11d
14756+ CFI_REGISTER rip,r11
14757
14758 /* Construct struct pt_regs on stack */
14759 pushq_cfi $__USER32_DS /* pt_regs->ss */
14760 pushq_cfi %rbp /* pt_regs->sp */
14761 CFI_REL_OFFSET rsp,0
14762 pushfq_cfi /* pt_regs->flags */
14763+ orl $X86_EFLAGS_IF,(%rsp)
14764 pushq_cfi $__USER32_CS /* pt_regs->cs */
14765- pushq_cfi %r10 /* pt_regs->ip = thread_info->sysenter_return */
14766+ pushq_cfi %r11 /* pt_regs->ip = thread_info->sysenter_return */
14767 CFI_REL_OFFSET rip,0
14768 pushq_cfi_reg rax /* pt_regs->orig_ax */
14769 pushq_cfi_reg rdi /* pt_regs->di */
14770@@ -147,15 +176,37 @@ ENTRY(ia32_sysenter_target)
14771 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14772 CFI_ADJUST_CFA_OFFSET 10*8
14773
14774+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14775+ movq_cfi r12, R12
14776+#endif
14777+
14778+ pax_enter_kernel_user
14779+
14780+#ifdef CONFIG_PAX_RANDKSTACK
14781+ pax_erase_kstack
14782+#endif
14783+
14784+ ENABLE_INTERRUPTS(CLBR_NONE)
14785+
14786 /*
14787 * no need to do an access_ok check here because rbp has been
14788 * 32bit zero extended
14789 */
14790+
14791+#ifdef CONFIG_PAX_MEMORY_UDEREF
14792+ addq pax_user_shadow_base,%rbp
14793+ ASM_PAX_OPEN_USERLAND
14794+#endif
14795+
14796 ASM_STAC
14797 1: movl (%rbp),%ebp
14798 _ASM_EXTABLE(1b,ia32_badarg)
14799 ASM_CLAC
14800
14801+#ifdef CONFIG_PAX_MEMORY_UDEREF
14802+ ASM_PAX_CLOSE_USERLAND
14803+#endif
14804+
14805 /*
14806 * Sysenter doesn't filter flags, so we need to clear NT
14807 * ourselves. To save a few cycles, we can check whether
14808@@ -165,8 +216,9 @@ ENTRY(ia32_sysenter_target)
14809 jnz sysenter_fix_flags
14810 sysenter_flags_fixed:
14811
14812- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14813- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14814+ GET_THREAD_INFO(%r11)
14815+ orl $TS_COMPAT,TI_status(%r11)
14816+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14817 CFI_REMEMBER_STATE
14818 jnz sysenter_tracesys
14819 cmpq $(IA32_NR_syscalls-1),%rax
14820@@ -181,9 +233,10 @@ sysenter_do_call:
14821 sysenter_dispatch:
14822 call *ia32_sys_call_table(,%rax,8)
14823 movq %rax,RAX(%rsp)
14824+ GET_THREAD_INFO(%r11)
14825 DISABLE_INTERRUPTS(CLBR_NONE)
14826 TRACE_IRQS_OFF
14827- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14828+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14829 jnz sysexit_audit
14830 sysexit_from_sys_call:
14831 /*
14832@@ -196,7 +249,9 @@ sysexit_from_sys_call:
14833 * This code path is still called 'sysexit' because it pairs
14834 * with 'sysenter' and it uses the SYSENTER calling convention.
14835 */
14836- andl $~TS_COMPAT,ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14837+ pax_exit_kernel_user
14838+ pax_erase_kstack
14839+ andl $~TS_COMPAT,TI_status(%r11)
14840 movl RIP(%rsp),%ecx /* User %eip */
14841 CFI_REGISTER rip,rcx
14842 RESTORE_RSI_RDI
14843@@ -247,6 +302,9 @@ sysexit_from_sys_call:
14844 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14845 movl %eax,%edi /* 1st arg: syscall number */
14846 call __audit_syscall_entry
14847+
14848+ pax_erase_kstack
14849+
14850 movl RAX(%rsp),%eax /* reload syscall number */
14851 cmpq $(IA32_NR_syscalls-1),%rax
14852 ja ia32_badsys
14853@@ -258,7 +316,7 @@ sysexit_from_sys_call:
14854 .endm
14855
14856 .macro auditsys_exit exit
14857- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14858+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14859 jnz ia32_ret_from_sys_call
14860 TRACE_IRQS_ON
14861 ENABLE_INTERRUPTS(CLBR_NONE)
14862@@ -269,11 +327,12 @@ sysexit_from_sys_call:
14863 1: setbe %al /* 1 if error, 0 if not */
14864 movzbl %al,%edi /* zero-extend that into %edi */
14865 call __audit_syscall_exit
14866+ GET_THREAD_INFO(%r11)
14867 movq RAX(%rsp),%rax /* reload syscall return value */
14868 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14869 DISABLE_INTERRUPTS(CLBR_NONE)
14870 TRACE_IRQS_OFF
14871- testl %edi, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14872+ testl %edi,TI_flags(%r11)
14873 jz \exit
14874 CLEAR_RREGS
14875 jmp int_with_check
14876@@ -295,7 +354,7 @@ sysenter_fix_flags:
14877
14878 sysenter_tracesys:
14879 #ifdef CONFIG_AUDITSYSCALL
14880- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14881+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14882 jz sysenter_auditsys
14883 #endif
14884 SAVE_EXTRA_REGS
14885@@ -307,6 +366,9 @@ sysenter_tracesys:
14886 RESTORE_EXTRA_REGS
14887 cmpq $(IA32_NR_syscalls-1),%rax
14888 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14889+
14890+ pax_erase_kstack
14891+
14892 jmp sysenter_do_call
14893 CFI_ENDPROC
14894 ENDPROC(ia32_sysenter_target)
14895@@ -357,7 +419,6 @@ ENTRY(ia32_cstar_target)
14896 movl %esp,%r8d
14897 CFI_REGISTER rsp,r8
14898 movq PER_CPU_VAR(kernel_stack),%rsp
14899- ENABLE_INTERRUPTS(CLBR_NONE)
14900
14901 /* Zero-extending 32-bit regs, do not remove */
14902 movl %eax,%eax
14903@@ -380,16 +441,41 @@ ENTRY(ia32_cstar_target)
14904 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
14905 CFI_ADJUST_CFA_OFFSET 10*8
14906
14907+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
14908+ movq_cfi r12, R12
14909+#endif
14910+
14911+ pax_enter_kernel_user
14912+
14913+#ifdef CONFIG_PAX_RANDKSTACK
14914+ pax_erase_kstack
14915+#endif
14916+
14917+ ENABLE_INTERRUPTS(CLBR_NONE)
14918+
14919 /*
14920 * no need to do an access_ok check here because r8 has been
14921 * 32bit zero extended
14922 */
14923+
14924+#ifdef CONFIG_PAX_MEMORY_UDEREF
14925+ ASM_PAX_OPEN_USERLAND
14926+ movq pax_user_shadow_base,%r8
14927+ addq RSP(%rsp),%r8
14928+#endif
14929+
14930 ASM_STAC
14931 1: movl (%r8),%r9d
14932 _ASM_EXTABLE(1b,ia32_badarg)
14933 ASM_CLAC
14934- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14935- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14936+
14937+#ifdef CONFIG_PAX_MEMORY_UDEREF
14938+ ASM_PAX_CLOSE_USERLAND
14939+#endif
14940+
14941+ GET_THREAD_INFO(%r11)
14942+ orl $TS_COMPAT,TI_status(%r11)
14943+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14944 CFI_REMEMBER_STATE
14945 jnz cstar_tracesys
14946 cmpq $IA32_NR_syscalls-1,%rax
14947@@ -404,12 +490,15 @@ cstar_do_call:
14948 cstar_dispatch:
14949 call *ia32_sys_call_table(,%rax,8)
14950 movq %rax,RAX(%rsp)
14951+ GET_THREAD_INFO(%r11)
14952 DISABLE_INTERRUPTS(CLBR_NONE)
14953 TRACE_IRQS_OFF
14954- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14955+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14956 jnz sysretl_audit
14957 sysretl_from_sys_call:
14958- andl $~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
14959+ pax_exit_kernel_user
14960+ pax_erase_kstack
14961+ andl $~TS_COMPAT,TI_status(%r11)
14962 RESTORE_RSI_RDI_RDX
14963 movl RIP(%rsp),%ecx
14964 CFI_REGISTER rip,rcx
14965@@ -451,7 +540,7 @@ sysretl_audit:
14966
14967 cstar_tracesys:
14968 #ifdef CONFIG_AUDITSYSCALL
14969- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT), ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
14970+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14971 jz cstar_auditsys
14972 #endif
14973 xchgl %r9d,%ebp
14974@@ -465,11 +554,19 @@ cstar_tracesys:
14975 xchgl %ebp,%r9d
14976 cmpq $(IA32_NR_syscalls-1),%rax
14977 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14978+
14979+ pax_erase_kstack
14980+
14981 jmp cstar_do_call
14982 END(ia32_cstar_target)
14983
14984 ia32_badarg:
14985 ASM_CLAC
14986+
14987+#ifdef CONFIG_PAX_MEMORY_UDEREF
14988+ ASM_PAX_CLOSE_USERLAND
14989+#endif
14990+
14991 movq $-EFAULT,%rax
14992 jmp ia32_sysret
14993 CFI_ENDPROC
14994@@ -505,14 +602,8 @@ ENTRY(ia32_syscall)
14995 /*CFI_REL_OFFSET cs,1*8 */
14996 CFI_REL_OFFSET rip,0*8
14997
14998- /*
14999- * Interrupts are off on entry.
15000- * We do not frame this tiny irq-off block with TRACE_IRQS_OFF/ON,
15001- * it is too small to ever cause noticeable irq latency.
15002- */
15003 PARAVIRT_ADJUST_EXCEPTION_FRAME
15004 SWAPGS
15005- ENABLE_INTERRUPTS(CLBR_NONE)
15006
15007 /* Zero-extending 32-bit regs, do not remove */
15008 movl %eax,%eax
15009@@ -528,8 +619,26 @@ ENTRY(ia32_syscall)
15010 sub $(10*8),%rsp /* pt_regs->r8-11,bp,bx,r12-15 not saved */
15011 CFI_ADJUST_CFA_OFFSET 10*8
15012
15013- orl $TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
15014- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
15015+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15016+ movq_cfi r12, R12
15017+#endif
15018+
15019+ pax_enter_kernel_user
15020+
15021+#ifdef CONFIG_PAX_RANDKSTACK
15022+ pax_erase_kstack
15023+#endif
15024+
15025+ /*
15026+ * Interrupts are off on entry.
15027+ * We do not frame this tiny irq-off block with TRACE_IRQS_OFF/ON,
15028+ * it is too small to ever cause noticeable irq latency.
15029+ */
15030+ ENABLE_INTERRUPTS(CLBR_NONE)
15031+
15032+ GET_THREAD_INFO(%r11)
15033+ orl $TS_COMPAT,TI_status(%r11)
15034+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15035 jnz ia32_tracesys
15036 cmpq $(IA32_NR_syscalls-1),%rax
15037 ja ia32_badsys
15038@@ -557,6 +666,9 @@ ia32_tracesys:
15039 RESTORE_EXTRA_REGS
15040 cmpq $(IA32_NR_syscalls-1),%rax
15041 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15042+
15043+ pax_erase_kstack
15044+
15045 jmp ia32_do_call
15046 END(ia32_syscall)
15047
15048diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15049index 719cd70..69d576b 100644
15050--- a/arch/x86/ia32/sys_ia32.c
15051+++ b/arch/x86/ia32/sys_ia32.c
15052@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15053 */
15054 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15055 {
15056- typeof(ubuf->st_uid) uid = 0;
15057- typeof(ubuf->st_gid) gid = 0;
15058+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15059+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15060 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15061 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15062 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15063diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15064index bdf02ee..51a4656 100644
15065--- a/arch/x86/include/asm/alternative-asm.h
15066+++ b/arch/x86/include/asm/alternative-asm.h
15067@@ -18,6 +18,45 @@
15068 .endm
15069 #endif
15070
15071+#ifdef KERNEXEC_PLUGIN
15072+ .macro pax_force_retaddr_bts rip=0
15073+ btsq $63,\rip(%rsp)
15074+ .endm
15075+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15076+ .macro pax_force_retaddr rip=0, reload=0
15077+ btsq $63,\rip(%rsp)
15078+ .endm
15079+ .macro pax_force_fptr ptr
15080+ btsq $63,\ptr
15081+ .endm
15082+ .macro pax_set_fptr_mask
15083+ .endm
15084+#endif
15085+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15086+ .macro pax_force_retaddr rip=0, reload=0
15087+ .if \reload
15088+ pax_set_fptr_mask
15089+ .endif
15090+ orq %r12,\rip(%rsp)
15091+ .endm
15092+ .macro pax_force_fptr ptr
15093+ orq %r12,\ptr
15094+ .endm
15095+ .macro pax_set_fptr_mask
15096+ movabs $0x8000000000000000,%r12
15097+ .endm
15098+#endif
15099+#else
15100+ .macro pax_force_retaddr rip=0, reload=0
15101+ .endm
15102+ .macro pax_force_fptr ptr
15103+ .endm
15104+ .macro pax_force_retaddr_bts rip=0
15105+ .endm
15106+ .macro pax_set_fptr_mask
15107+ .endm
15108+#endif
15109+
15110 .macro altinstruction_entry orig alt feature orig_len alt_len pad_len
15111 .long \orig - .
15112 .long \alt - .
15113@@ -38,7 +77,7 @@
15114 altinstruction_entry 140b,143f,\feature,142b-140b,144f-143f,142b-141b
15115 .popsection
15116
15117- .pushsection .altinstr_replacement,"ax"
15118+ .pushsection .altinstr_replacement,"a"
15119 143:
15120 \newinstr
15121 144:
15122@@ -68,7 +107,7 @@
15123 altinstruction_entry 140b,144f,\feature2,142b-140b,145f-144f,142b-141b
15124 .popsection
15125
15126- .pushsection .altinstr_replacement,"ax"
15127+ .pushsection .altinstr_replacement,"a"
15128 143:
15129 \newinstr1
15130 144:
15131diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15132index ba32af0..ff42fc0 100644
15133--- a/arch/x86/include/asm/alternative.h
15134+++ b/arch/x86/include/asm/alternative.h
15135@@ -130,7 +130,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15136 ".pushsection .altinstructions,\"a\"\n" \
15137 ALTINSTR_ENTRY(feature, 1) \
15138 ".popsection\n" \
15139- ".pushsection .altinstr_replacement, \"ax\"\n" \
15140+ ".pushsection .altinstr_replacement, \"a\"\n" \
15141 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15142 ".popsection"
15143
15144@@ -140,7 +140,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15145 ALTINSTR_ENTRY(feature1, 1) \
15146 ALTINSTR_ENTRY(feature2, 2) \
15147 ".popsection\n" \
15148- ".pushsection .altinstr_replacement, \"ax\"\n" \
15149+ ".pushsection .altinstr_replacement, \"a\"\n" \
15150 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15151 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15152 ".popsection"
15153diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15154index 976b86a..f3bc83a 100644
15155--- a/arch/x86/include/asm/apic.h
15156+++ b/arch/x86/include/asm/apic.h
15157@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15158
15159 #ifdef CONFIG_X86_LOCAL_APIC
15160
15161-extern unsigned int apic_verbosity;
15162+extern int apic_verbosity;
15163 extern int local_apic_timer_c2_ok;
15164
15165 extern int disable_apic;
15166diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15167index 20370c6..a2eb9b0 100644
15168--- a/arch/x86/include/asm/apm.h
15169+++ b/arch/x86/include/asm/apm.h
15170@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15171 __asm__ __volatile__(APM_DO_ZERO_SEGS
15172 "pushl %%edi\n\t"
15173 "pushl %%ebp\n\t"
15174- "lcall *%%cs:apm_bios_entry\n\t"
15175+ "lcall *%%ss:apm_bios_entry\n\t"
15176 "setc %%al\n\t"
15177 "popl %%ebp\n\t"
15178 "popl %%edi\n\t"
15179@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15180 __asm__ __volatile__(APM_DO_ZERO_SEGS
15181 "pushl %%edi\n\t"
15182 "pushl %%ebp\n\t"
15183- "lcall *%%cs:apm_bios_entry\n\t"
15184+ "lcall *%%ss:apm_bios_entry\n\t"
15185 "setc %%bl\n\t"
15186 "popl %%ebp\n\t"
15187 "popl %%edi\n\t"
15188diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15189index 5e5cd12..51cdc93 100644
15190--- a/arch/x86/include/asm/atomic.h
15191+++ b/arch/x86/include/asm/atomic.h
15192@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15193 }
15194
15195 /**
15196+ * atomic_read_unchecked - read atomic variable
15197+ * @v: pointer of type atomic_unchecked_t
15198+ *
15199+ * Atomically reads the value of @v.
15200+ */
15201+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15202+{
15203+ return ACCESS_ONCE((v)->counter);
15204+}
15205+
15206+/**
15207 * atomic_set - set atomic variable
15208 * @v: pointer of type atomic_t
15209 * @i: required value
15210@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15211 }
15212
15213 /**
15214+ * atomic_set_unchecked - set atomic variable
15215+ * @v: pointer of type atomic_unchecked_t
15216+ * @i: required value
15217+ *
15218+ * Atomically sets the value of @v to @i.
15219+ */
15220+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15221+{
15222+ v->counter = i;
15223+}
15224+
15225+/**
15226 * atomic_add - add integer to atomic variable
15227 * @i: integer value to add
15228 * @v: pointer of type atomic_t
15229@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15230 */
15231 static inline void atomic_add(int i, atomic_t *v)
15232 {
15233- asm volatile(LOCK_PREFIX "addl %1,%0"
15234+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15235+
15236+#ifdef CONFIG_PAX_REFCOUNT
15237+ "jno 0f\n"
15238+ LOCK_PREFIX "subl %1,%0\n"
15239+ "int $4\n0:\n"
15240+ _ASM_EXTABLE(0b, 0b)
15241+#endif
15242+
15243+ : "+m" (v->counter)
15244+ : "ir" (i));
15245+}
15246+
15247+/**
15248+ * atomic_add_unchecked - add integer to atomic variable
15249+ * @i: integer value to add
15250+ * @v: pointer of type atomic_unchecked_t
15251+ *
15252+ * Atomically adds @i to @v.
15253+ */
15254+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15255+{
15256+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15257 : "+m" (v->counter)
15258 : "ir" (i));
15259 }
15260@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15261 */
15262 static inline void atomic_sub(int i, atomic_t *v)
15263 {
15264- asm volatile(LOCK_PREFIX "subl %1,%0"
15265+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15266+
15267+#ifdef CONFIG_PAX_REFCOUNT
15268+ "jno 0f\n"
15269+ LOCK_PREFIX "addl %1,%0\n"
15270+ "int $4\n0:\n"
15271+ _ASM_EXTABLE(0b, 0b)
15272+#endif
15273+
15274+ : "+m" (v->counter)
15275+ : "ir" (i));
15276+}
15277+
15278+/**
15279+ * atomic_sub_unchecked - subtract integer from atomic variable
15280+ * @i: integer value to subtract
15281+ * @v: pointer of type atomic_unchecked_t
15282+ *
15283+ * Atomically subtracts @i from @v.
15284+ */
15285+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15286+{
15287+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15288 : "+m" (v->counter)
15289 : "ir" (i));
15290 }
15291@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15292 */
15293 static inline int atomic_sub_and_test(int i, atomic_t *v)
15294 {
15295- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15296+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15297 }
15298
15299 /**
15300@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15301 */
15302 static inline void atomic_inc(atomic_t *v)
15303 {
15304- asm volatile(LOCK_PREFIX "incl %0"
15305+ asm volatile(LOCK_PREFIX "incl %0\n"
15306+
15307+#ifdef CONFIG_PAX_REFCOUNT
15308+ "jno 0f\n"
15309+ LOCK_PREFIX "decl %0\n"
15310+ "int $4\n0:\n"
15311+ _ASM_EXTABLE(0b, 0b)
15312+#endif
15313+
15314+ : "+m" (v->counter));
15315+}
15316+
15317+/**
15318+ * atomic_inc_unchecked - increment atomic variable
15319+ * @v: pointer of type atomic_unchecked_t
15320+ *
15321+ * Atomically increments @v by 1.
15322+ */
15323+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15324+{
15325+ asm volatile(LOCK_PREFIX "incl %0\n"
15326 : "+m" (v->counter));
15327 }
15328
15329@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15330 */
15331 static inline void atomic_dec(atomic_t *v)
15332 {
15333- asm volatile(LOCK_PREFIX "decl %0"
15334+ asm volatile(LOCK_PREFIX "decl %0\n"
15335+
15336+#ifdef CONFIG_PAX_REFCOUNT
15337+ "jno 0f\n"
15338+ LOCK_PREFIX "incl %0\n"
15339+ "int $4\n0:\n"
15340+ _ASM_EXTABLE(0b, 0b)
15341+#endif
15342+
15343+ : "+m" (v->counter));
15344+}
15345+
15346+/**
15347+ * atomic_dec_unchecked - decrement atomic variable
15348+ * @v: pointer of type atomic_unchecked_t
15349+ *
15350+ * Atomically decrements @v by 1.
15351+ */
15352+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15353+{
15354+ asm volatile(LOCK_PREFIX "decl %0\n"
15355 : "+m" (v->counter));
15356 }
15357
15358@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15359 */
15360 static inline int atomic_dec_and_test(atomic_t *v)
15361 {
15362- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15363+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15364 }
15365
15366 /**
15367@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15368 */
15369 static inline int atomic_inc_and_test(atomic_t *v)
15370 {
15371- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15372+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15373+}
15374+
15375+/**
15376+ * atomic_inc_and_test_unchecked - increment and test
15377+ * @v: pointer of type atomic_unchecked_t
15378+ *
15379+ * Atomically increments @v by 1
15380+ * and returns true if the result is zero, or false for all
15381+ * other cases.
15382+ */
15383+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15384+{
15385+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15386 }
15387
15388 /**
15389@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15390 */
15391 static inline int atomic_add_negative(int i, atomic_t *v)
15392 {
15393- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15394+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15395 }
15396
15397 /**
15398@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15399 *
15400 * Atomically adds @i to @v and returns @i + @v
15401 */
15402-static inline int atomic_add_return(int i, atomic_t *v)
15403+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15404+{
15405+ return i + xadd_check_overflow(&v->counter, i);
15406+}
15407+
15408+/**
15409+ * atomic_add_return_unchecked - add integer and return
15410+ * @i: integer value to add
15411+ * @v: pointer of type atomic_unchecked_t
15412+ *
15413+ * Atomically adds @i to @v and returns @i + @v
15414+ */
15415+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15416 {
15417 return i + xadd(&v->counter, i);
15418 }
15419@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15420 *
15421 * Atomically subtracts @i from @v and returns @v - @i
15422 */
15423-static inline int atomic_sub_return(int i, atomic_t *v)
15424+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15425 {
15426 return atomic_add_return(-i, v);
15427 }
15428
15429 #define atomic_inc_return(v) (atomic_add_return(1, v))
15430+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15431+{
15432+ return atomic_add_return_unchecked(1, v);
15433+}
15434 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15435
15436-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15437+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15438+{
15439+ return cmpxchg(&v->counter, old, new);
15440+}
15441+
15442+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15443 {
15444 return cmpxchg(&v->counter, old, new);
15445 }
15446@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15447 return xchg(&v->counter, new);
15448 }
15449
15450+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15451+{
15452+ return xchg(&v->counter, new);
15453+}
15454+
15455 /**
15456 * __atomic_add_unless - add unless the number is already a given value
15457 * @v: pointer of type atomic_t
15458@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15459 */
15460 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15461 {
15462- int c, old;
15463+ int c, old, new;
15464 c = atomic_read(v);
15465 for (;;) {
15466- if (unlikely(c == (u)))
15467+ if (unlikely(c == u))
15468 break;
15469- old = atomic_cmpxchg((v), c, c + (a));
15470+
15471+ asm volatile("addl %2,%0\n"
15472+
15473+#ifdef CONFIG_PAX_REFCOUNT
15474+ "jno 0f\n"
15475+ "subl %2,%0\n"
15476+ "int $4\n0:\n"
15477+ _ASM_EXTABLE(0b, 0b)
15478+#endif
15479+
15480+ : "=r" (new)
15481+ : "0" (c), "ir" (a));
15482+
15483+ old = atomic_cmpxchg(v, c, new);
15484 if (likely(old == c))
15485 break;
15486 c = old;
15487@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15488 }
15489
15490 /**
15491+ * atomic_inc_not_zero_hint - increment if not null
15492+ * @v: pointer of type atomic_t
15493+ * @hint: probable value of the atomic before the increment
15494+ *
15495+ * This version of atomic_inc_not_zero() gives a hint of probable
15496+ * value of the atomic. This helps processor to not read the memory
15497+ * before doing the atomic read/modify/write cycle, lowering
15498+ * number of bus transactions on some arches.
15499+ *
15500+ * Returns: 0 if increment was not done, 1 otherwise.
15501+ */
15502+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15503+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15504+{
15505+ int val, c = hint, new;
15506+
15507+ /* sanity test, should be removed by compiler if hint is a constant */
15508+ if (!hint)
15509+ return __atomic_add_unless(v, 1, 0);
15510+
15511+ do {
15512+ asm volatile("incl %0\n"
15513+
15514+#ifdef CONFIG_PAX_REFCOUNT
15515+ "jno 0f\n"
15516+ "decl %0\n"
15517+ "int $4\n0:\n"
15518+ _ASM_EXTABLE(0b, 0b)
15519+#endif
15520+
15521+ : "=r" (new)
15522+ : "0" (c));
15523+
15524+ val = atomic_cmpxchg(v, c, new);
15525+ if (val == c)
15526+ return 1;
15527+ c = val;
15528+ } while (c);
15529+
15530+ return 0;
15531+}
15532+
15533+/**
15534 * atomic_inc_short - increment of a short integer
15535 * @v: pointer to type int
15536 *
15537@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15538 }
15539
15540 /* These are x86-specific, used by some header files */
15541-#define atomic_clear_mask(mask, addr) \
15542- asm volatile(LOCK_PREFIX "andl %0,%1" \
15543- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15544+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15545+{
15546+ asm volatile(LOCK_PREFIX "andl %1,%0"
15547+ : "+m" (v->counter)
15548+ : "r" (~(mask))
15549+ : "memory");
15550+}
15551
15552-#define atomic_set_mask(mask, addr) \
15553- asm volatile(LOCK_PREFIX "orl %0,%1" \
15554- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15555- : "memory")
15556+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15557+{
15558+ asm volatile(LOCK_PREFIX "andl %1,%0"
15559+ : "+m" (v->counter)
15560+ : "r" (~(mask))
15561+ : "memory");
15562+}
15563+
15564+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15565+{
15566+ asm volatile(LOCK_PREFIX "orl %1,%0"
15567+ : "+m" (v->counter)
15568+ : "r" (mask)
15569+ : "memory");
15570+}
15571+
15572+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15573+{
15574+ asm volatile(LOCK_PREFIX "orl %1,%0"
15575+ : "+m" (v->counter)
15576+ : "r" (mask)
15577+ : "memory");
15578+}
15579
15580 #ifdef CONFIG_X86_32
15581 # include <asm/atomic64_32.h>
15582diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15583index b154de7..bf18a5a 100644
15584--- a/arch/x86/include/asm/atomic64_32.h
15585+++ b/arch/x86/include/asm/atomic64_32.h
15586@@ -12,6 +12,14 @@ typedef struct {
15587 u64 __aligned(8) counter;
15588 } atomic64_t;
15589
15590+#ifdef CONFIG_PAX_REFCOUNT
15591+typedef struct {
15592+ u64 __aligned(8) counter;
15593+} atomic64_unchecked_t;
15594+#else
15595+typedef atomic64_t atomic64_unchecked_t;
15596+#endif
15597+
15598 #define ATOMIC64_INIT(val) { (val) }
15599
15600 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15601@@ -37,21 +45,31 @@ typedef struct {
15602 ATOMIC64_DECL_ONE(sym##_386)
15603
15604 ATOMIC64_DECL_ONE(add_386);
15605+ATOMIC64_DECL_ONE(add_unchecked_386);
15606 ATOMIC64_DECL_ONE(sub_386);
15607+ATOMIC64_DECL_ONE(sub_unchecked_386);
15608 ATOMIC64_DECL_ONE(inc_386);
15609+ATOMIC64_DECL_ONE(inc_unchecked_386);
15610 ATOMIC64_DECL_ONE(dec_386);
15611+ATOMIC64_DECL_ONE(dec_unchecked_386);
15612 #endif
15613
15614 #define alternative_atomic64(f, out, in...) \
15615 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15616
15617 ATOMIC64_DECL(read);
15618+ATOMIC64_DECL(read_unchecked);
15619 ATOMIC64_DECL(set);
15620+ATOMIC64_DECL(set_unchecked);
15621 ATOMIC64_DECL(xchg);
15622 ATOMIC64_DECL(add_return);
15623+ATOMIC64_DECL(add_return_unchecked);
15624 ATOMIC64_DECL(sub_return);
15625+ATOMIC64_DECL(sub_return_unchecked);
15626 ATOMIC64_DECL(inc_return);
15627+ATOMIC64_DECL(inc_return_unchecked);
15628 ATOMIC64_DECL(dec_return);
15629+ATOMIC64_DECL(dec_return_unchecked);
15630 ATOMIC64_DECL(dec_if_positive);
15631 ATOMIC64_DECL(inc_not_zero);
15632 ATOMIC64_DECL(add_unless);
15633@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15634 }
15635
15636 /**
15637+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15638+ * @p: pointer to type atomic64_unchecked_t
15639+ * @o: expected value
15640+ * @n: new value
15641+ *
15642+ * Atomically sets @v to @n if it was equal to @o and returns
15643+ * the old value.
15644+ */
15645+
15646+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15647+{
15648+ return cmpxchg64(&v->counter, o, n);
15649+}
15650+
15651+/**
15652 * atomic64_xchg - xchg atomic64 variable
15653 * @v: pointer to type atomic64_t
15654 * @n: value to assign
15655@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15656 }
15657
15658 /**
15659+ * atomic64_set_unchecked - set atomic64 variable
15660+ * @v: pointer to type atomic64_unchecked_t
15661+ * @n: value to assign
15662+ *
15663+ * Atomically sets the value of @v to @n.
15664+ */
15665+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15666+{
15667+ unsigned high = (unsigned)(i >> 32);
15668+ unsigned low = (unsigned)i;
15669+ alternative_atomic64(set, /* no output */,
15670+ "S" (v), "b" (low), "c" (high)
15671+ : "eax", "edx", "memory");
15672+}
15673+
15674+/**
15675 * atomic64_read - read atomic64 variable
15676 * @v: pointer to type atomic64_t
15677 *
15678@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15679 }
15680
15681 /**
15682+ * atomic64_read_unchecked - read atomic64 variable
15683+ * @v: pointer to type atomic64_unchecked_t
15684+ *
15685+ * Atomically reads the value of @v and returns it.
15686+ */
15687+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15688+{
15689+ long long r;
15690+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15691+ return r;
15692+ }
15693+
15694+/**
15695 * atomic64_add_return - add and return
15696 * @i: integer value to add
15697 * @v: pointer to type atomic64_t
15698@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15699 return i;
15700 }
15701
15702+/**
15703+ * atomic64_add_return_unchecked - add and return
15704+ * @i: integer value to add
15705+ * @v: pointer to type atomic64_unchecked_t
15706+ *
15707+ * Atomically adds @i to @v and returns @i + *@v
15708+ */
15709+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15710+{
15711+ alternative_atomic64(add_return_unchecked,
15712+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15713+ ASM_NO_INPUT_CLOBBER("memory"));
15714+ return i;
15715+}
15716+
15717 /*
15718 * Other variants with different arithmetic operators:
15719 */
15720@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15721 return a;
15722 }
15723
15724+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15725+{
15726+ long long a;
15727+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15728+ "S" (v) : "memory", "ecx");
15729+ return a;
15730+}
15731+
15732 static inline long long atomic64_dec_return(atomic64_t *v)
15733 {
15734 long long a;
15735@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15736 }
15737
15738 /**
15739+ * atomic64_add_unchecked - add integer to atomic64 variable
15740+ * @i: integer value to add
15741+ * @v: pointer to type atomic64_unchecked_t
15742+ *
15743+ * Atomically adds @i to @v.
15744+ */
15745+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15746+{
15747+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15748+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15749+ ASM_NO_INPUT_CLOBBER("memory"));
15750+ return i;
15751+}
15752+
15753+/**
15754 * atomic64_sub - subtract the atomic64 variable
15755 * @i: integer value to subtract
15756 * @v: pointer to type atomic64_t
15757diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15758index f8d273e..02f39f3 100644
15759--- a/arch/x86/include/asm/atomic64_64.h
15760+++ b/arch/x86/include/asm/atomic64_64.h
15761@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15762 }
15763
15764 /**
15765+ * atomic64_read_unchecked - read atomic64 variable
15766+ * @v: pointer of type atomic64_unchecked_t
15767+ *
15768+ * Atomically reads the value of @v.
15769+ * Doesn't imply a read memory barrier.
15770+ */
15771+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15772+{
15773+ return ACCESS_ONCE((v)->counter);
15774+}
15775+
15776+/**
15777 * atomic64_set - set atomic64 variable
15778 * @v: pointer to type atomic64_t
15779 * @i: required value
15780@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15781 }
15782
15783 /**
15784+ * atomic64_set_unchecked - set atomic64 variable
15785+ * @v: pointer to type atomic64_unchecked_t
15786+ * @i: required value
15787+ *
15788+ * Atomically sets the value of @v to @i.
15789+ */
15790+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15791+{
15792+ v->counter = i;
15793+}
15794+
15795+/**
15796 * atomic64_add - add integer to atomic64 variable
15797 * @i: integer value to add
15798 * @v: pointer to type atomic64_t
15799@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15800 */
15801 static inline void atomic64_add(long i, atomic64_t *v)
15802 {
15803+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15804+
15805+#ifdef CONFIG_PAX_REFCOUNT
15806+ "jno 0f\n"
15807+ LOCK_PREFIX "subq %1,%0\n"
15808+ "int $4\n0:\n"
15809+ _ASM_EXTABLE(0b, 0b)
15810+#endif
15811+
15812+ : "=m" (v->counter)
15813+ : "er" (i), "m" (v->counter));
15814+}
15815+
15816+/**
15817+ * atomic64_add_unchecked - add integer to atomic64 variable
15818+ * @i: integer value to add
15819+ * @v: pointer to type atomic64_unchecked_t
15820+ *
15821+ * Atomically adds @i to @v.
15822+ */
15823+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15824+{
15825 asm volatile(LOCK_PREFIX "addq %1,%0"
15826 : "=m" (v->counter)
15827 : "er" (i), "m" (v->counter));
15828@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15829 */
15830 static inline void atomic64_sub(long i, atomic64_t *v)
15831 {
15832- asm volatile(LOCK_PREFIX "subq %1,%0"
15833+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15834+
15835+#ifdef CONFIG_PAX_REFCOUNT
15836+ "jno 0f\n"
15837+ LOCK_PREFIX "addq %1,%0\n"
15838+ "int $4\n0:\n"
15839+ _ASM_EXTABLE(0b, 0b)
15840+#endif
15841+
15842+ : "=m" (v->counter)
15843+ : "er" (i), "m" (v->counter));
15844+}
15845+
15846+/**
15847+ * atomic64_sub_unchecked - subtract the atomic64 variable
15848+ * @i: integer value to subtract
15849+ * @v: pointer to type atomic64_unchecked_t
15850+ *
15851+ * Atomically subtracts @i from @v.
15852+ */
15853+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15854+{
15855+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15856 : "=m" (v->counter)
15857 : "er" (i), "m" (v->counter));
15858 }
15859@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15860 */
15861 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15862 {
15863- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15864+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15865 }
15866
15867 /**
15868@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15869 */
15870 static inline void atomic64_inc(atomic64_t *v)
15871 {
15872+ asm volatile(LOCK_PREFIX "incq %0\n"
15873+
15874+#ifdef CONFIG_PAX_REFCOUNT
15875+ "jno 0f\n"
15876+ LOCK_PREFIX "decq %0\n"
15877+ "int $4\n0:\n"
15878+ _ASM_EXTABLE(0b, 0b)
15879+#endif
15880+
15881+ : "=m" (v->counter)
15882+ : "m" (v->counter));
15883+}
15884+
15885+/**
15886+ * atomic64_inc_unchecked - increment atomic64 variable
15887+ * @v: pointer to type atomic64_unchecked_t
15888+ *
15889+ * Atomically increments @v by 1.
15890+ */
15891+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15892+{
15893 asm volatile(LOCK_PREFIX "incq %0"
15894 : "=m" (v->counter)
15895 : "m" (v->counter));
15896@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15897 */
15898 static inline void atomic64_dec(atomic64_t *v)
15899 {
15900- asm volatile(LOCK_PREFIX "decq %0"
15901+ asm volatile(LOCK_PREFIX "decq %0\n"
15902+
15903+#ifdef CONFIG_PAX_REFCOUNT
15904+ "jno 0f\n"
15905+ LOCK_PREFIX "incq %0\n"
15906+ "int $4\n0:\n"
15907+ _ASM_EXTABLE(0b, 0b)
15908+#endif
15909+
15910+ : "=m" (v->counter)
15911+ : "m" (v->counter));
15912+}
15913+
15914+/**
15915+ * atomic64_dec_unchecked - decrement atomic64 variable
15916+ * @v: pointer to type atomic64_t
15917+ *
15918+ * Atomically decrements @v by 1.
15919+ */
15920+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15921+{
15922+ asm volatile(LOCK_PREFIX "decq %0\n"
15923 : "=m" (v->counter)
15924 : "m" (v->counter));
15925 }
15926@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15927 */
15928 static inline int atomic64_dec_and_test(atomic64_t *v)
15929 {
15930- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15931+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15932 }
15933
15934 /**
15935@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15936 */
15937 static inline int atomic64_inc_and_test(atomic64_t *v)
15938 {
15939- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15940+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15941 }
15942
15943 /**
15944@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15945 */
15946 static inline int atomic64_add_negative(long i, atomic64_t *v)
15947 {
15948- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15949+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15950 }
15951
15952 /**
15953@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15954 */
15955 static inline long atomic64_add_return(long i, atomic64_t *v)
15956 {
15957+ return i + xadd_check_overflow(&v->counter, i);
15958+}
15959+
15960+/**
15961+ * atomic64_add_return_unchecked - add and return
15962+ * @i: integer value to add
15963+ * @v: pointer to type atomic64_unchecked_t
15964+ *
15965+ * Atomically adds @i to @v and returns @i + @v
15966+ */
15967+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15968+{
15969 return i + xadd(&v->counter, i);
15970 }
15971
15972@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15973 }
15974
15975 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15976+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15977+{
15978+ return atomic64_add_return_unchecked(1, v);
15979+}
15980 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15981
15982 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15983@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15984 return cmpxchg(&v->counter, old, new);
15985 }
15986
15987+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15988+{
15989+ return cmpxchg(&v->counter, old, new);
15990+}
15991+
15992 static inline long atomic64_xchg(atomic64_t *v, long new)
15993 {
15994 return xchg(&v->counter, new);
15995@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15996 */
15997 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15998 {
15999- long c, old;
16000+ long c, old, new;
16001 c = atomic64_read(v);
16002 for (;;) {
16003- if (unlikely(c == (u)))
16004+ if (unlikely(c == u))
16005 break;
16006- old = atomic64_cmpxchg((v), c, c + (a));
16007+
16008+ asm volatile("add %2,%0\n"
16009+
16010+#ifdef CONFIG_PAX_REFCOUNT
16011+ "jno 0f\n"
16012+ "sub %2,%0\n"
16013+ "int $4\n0:\n"
16014+ _ASM_EXTABLE(0b, 0b)
16015+#endif
16016+
16017+ : "=r" (new)
16018+ : "0" (c), "ir" (a));
16019+
16020+ old = atomic64_cmpxchg(v, c, new);
16021 if (likely(old == c))
16022 break;
16023 c = old;
16024 }
16025- return c != (u);
16026+ return c != u;
16027 }
16028
16029 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16030diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16031index 959e45b..6ea9bf6 100644
16032--- a/arch/x86/include/asm/barrier.h
16033+++ b/arch/x86/include/asm/barrier.h
16034@@ -57,7 +57,7 @@
16035 do { \
16036 compiletime_assert_atomic_type(*p); \
16037 smp_mb(); \
16038- ACCESS_ONCE(*p) = (v); \
16039+ ACCESS_ONCE_RW(*p) = (v); \
16040 } while (0)
16041
16042 #define smp_load_acquire(p) \
16043@@ -74,7 +74,7 @@ do { \
16044 do { \
16045 compiletime_assert_atomic_type(*p); \
16046 barrier(); \
16047- ACCESS_ONCE(*p) = (v); \
16048+ ACCESS_ONCE_RW(*p) = (v); \
16049 } while (0)
16050
16051 #define smp_load_acquire(p) \
16052diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16053index cfe3b95..d01b118 100644
16054--- a/arch/x86/include/asm/bitops.h
16055+++ b/arch/x86/include/asm/bitops.h
16056@@ -50,7 +50,7 @@
16057 * a mask operation on a byte.
16058 */
16059 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16060-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16061+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16062 #define CONST_MASK(nr) (1 << ((nr) & 7))
16063
16064 /**
16065@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16066 */
16067 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16068 {
16069- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16070+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16071 }
16072
16073 /**
16074@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16075 */
16076 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16077 {
16078- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16079+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16080 }
16081
16082 /**
16083@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16084 */
16085 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16086 {
16087- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16088+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16089 }
16090
16091 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16092@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16093 *
16094 * Undefined if no bit exists, so code should check against 0 first.
16095 */
16096-static inline unsigned long __ffs(unsigned long word)
16097+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16098 {
16099 asm("rep; bsf %1,%0"
16100 : "=r" (word)
16101@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16102 *
16103 * Undefined if no zero exists, so code should check against ~0UL first.
16104 */
16105-static inline unsigned long ffz(unsigned long word)
16106+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16107 {
16108 asm("rep; bsf %1,%0"
16109 : "=r" (word)
16110@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16111 *
16112 * Undefined if no set bit exists, so code should check against 0 first.
16113 */
16114-static inline unsigned long __fls(unsigned long word)
16115+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16116 {
16117 asm("bsr %1,%0"
16118 : "=r" (word)
16119@@ -434,7 +434,7 @@ static inline int ffs(int x)
16120 * set bit if value is nonzero. The last (most significant) bit is
16121 * at position 32.
16122 */
16123-static inline int fls(int x)
16124+static inline int __intentional_overflow(-1) fls(int x)
16125 {
16126 int r;
16127
16128@@ -476,7 +476,7 @@ static inline int fls(int x)
16129 * at position 64.
16130 */
16131 #ifdef CONFIG_X86_64
16132-static __always_inline int fls64(__u64 x)
16133+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16134 {
16135 int bitpos = -1;
16136 /*
16137diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16138index 4fa687a..60f2d39 100644
16139--- a/arch/x86/include/asm/boot.h
16140+++ b/arch/x86/include/asm/boot.h
16141@@ -6,10 +6,15 @@
16142 #include <uapi/asm/boot.h>
16143
16144 /* Physical address where kernel should be loaded. */
16145-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16146+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16147 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16148 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16149
16150+#ifndef __ASSEMBLY__
16151+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16152+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16153+#endif
16154+
16155 /* Minimum kernel alignment, as a power of two */
16156 #ifdef CONFIG_X86_64
16157 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16158diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16159index 48f99f1..d78ebf9 100644
16160--- a/arch/x86/include/asm/cache.h
16161+++ b/arch/x86/include/asm/cache.h
16162@@ -5,12 +5,13 @@
16163
16164 /* L1 cache line size */
16165 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16166-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16167+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16168
16169 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16170+#define __read_only __attribute__((__section__(".data..read_only")))
16171
16172 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16173-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16174+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16175
16176 #ifdef CONFIG_X86_VSMP
16177 #ifdef CONFIG_SMP
16178diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16179index 1c8b50e..166bcaa 100644
16180--- a/arch/x86/include/asm/calling.h
16181+++ b/arch/x86/include/asm/calling.h
16182@@ -96,23 +96,26 @@ For 32-bit we have the following conventions - kernel is built with
16183 .endm
16184
16185 .macro SAVE_C_REGS_HELPER offset=0 rax=1 rcx=1 r8910=1 r11=1
16186+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16187+ movq_cfi r12, R12+\offset
16188+#endif
16189 .if \r11
16190- movq_cfi r11, 6*8+\offset
16191+ movq_cfi r11, R11+\offset
16192 .endif
16193 .if \r8910
16194- movq_cfi r10, 7*8+\offset
16195- movq_cfi r9, 8*8+\offset
16196- movq_cfi r8, 9*8+\offset
16197+ movq_cfi r10, R10+\offset
16198+ movq_cfi r9, R9+\offset
16199+ movq_cfi r8, R8+\offset
16200 .endif
16201 .if \rax
16202- movq_cfi rax, 10*8+\offset
16203+ movq_cfi rax, RAX+\offset
16204 .endif
16205 .if \rcx
16206- movq_cfi rcx, 11*8+\offset
16207+ movq_cfi rcx, RCX+\offset
16208 .endif
16209- movq_cfi rdx, 12*8+\offset
16210- movq_cfi rsi, 13*8+\offset
16211- movq_cfi rdi, 14*8+\offset
16212+ movq_cfi rdx, RDX+\offset
16213+ movq_cfi rsi, RSI+\offset
16214+ movq_cfi rdi, RDI+\offset
16215 .endm
16216 .macro SAVE_C_REGS offset=0
16217 SAVE_C_REGS_HELPER \offset, 1, 1, 1, 1
16218@@ -131,76 +134,87 @@ For 32-bit we have the following conventions - kernel is built with
16219 .endm
16220
16221 .macro SAVE_EXTRA_REGS offset=0
16222- movq_cfi r15, 0*8+\offset
16223- movq_cfi r14, 1*8+\offset
16224- movq_cfi r13, 2*8+\offset
16225- movq_cfi r12, 3*8+\offset
16226- movq_cfi rbp, 4*8+\offset
16227- movq_cfi rbx, 5*8+\offset
16228+ movq_cfi r15, R15+\offset
16229+ movq_cfi r14, R14+\offset
16230+ movq_cfi r13, R13+\offset
16231+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16232+ movq_cfi r12, R12+\offset
16233+#endif
16234+ movq_cfi rbp, RBP+\offset
16235+ movq_cfi rbx, RBX+\offset
16236 .endm
16237 .macro SAVE_EXTRA_REGS_RBP offset=0
16238- movq_cfi rbp, 4*8+\offset
16239+ movq_cfi rbp, RBP+\offset
16240 .endm
16241
16242 .macro RESTORE_EXTRA_REGS offset=0
16243- movq_cfi_restore 0*8+\offset, r15
16244- movq_cfi_restore 1*8+\offset, r14
16245- movq_cfi_restore 2*8+\offset, r13
16246- movq_cfi_restore 3*8+\offset, r12
16247- movq_cfi_restore 4*8+\offset, rbp
16248- movq_cfi_restore 5*8+\offset, rbx
16249+ movq_cfi_restore R15+\offset, r15
16250+ movq_cfi_restore R14+\offset, r14
16251+ movq_cfi_restore R13+\offset, r13
16252+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16253+ movq_cfi_restore R12+\offset, r12
16254+#endif
16255+ movq_cfi_restore RBP+\offset, rbp
16256+ movq_cfi_restore RBX+\offset, rbx
16257 .endm
16258
16259 .macro ZERO_EXTRA_REGS
16260 xorl %r15d, %r15d
16261 xorl %r14d, %r14d
16262 xorl %r13d, %r13d
16263+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16264 xorl %r12d, %r12d
16265+#endif
16266 xorl %ebp, %ebp
16267 xorl %ebx, %ebx
16268 .endm
16269
16270- .macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1
16271+ .macro RESTORE_C_REGS_HELPER rstor_rax=1, rstor_rcx=1, rstor_r11=1, rstor_r8910=1, rstor_rdx=1, rstor_r12=1
16272+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16273+ .if \rstor_r12
16274+ movq_cfi_restore R12, r12
16275+ .endif
16276+#endif
16277 .if \rstor_r11
16278- movq_cfi_restore 6*8, r11
16279+ movq_cfi_restore R11, r11
16280 .endif
16281 .if \rstor_r8910
16282- movq_cfi_restore 7*8, r10
16283- movq_cfi_restore 8*8, r9
16284- movq_cfi_restore 9*8, r8
16285+ movq_cfi_restore R10, r10
16286+ movq_cfi_restore R9, r9
16287+ movq_cfi_restore R8, r8
16288 .endif
16289 .if \rstor_rax
16290- movq_cfi_restore 10*8, rax
16291+ movq_cfi_restore RAX, rax
16292 .endif
16293 .if \rstor_rcx
16294- movq_cfi_restore 11*8, rcx
16295+ movq_cfi_restore RCX, rcx
16296 .endif
16297 .if \rstor_rdx
16298- movq_cfi_restore 12*8, rdx
16299+ movq_cfi_restore RDX, rdx
16300 .endif
16301- movq_cfi_restore 13*8, rsi
16302- movq_cfi_restore 14*8, rdi
16303+ movq_cfi_restore RSI, rsi
16304+ movq_cfi_restore RDI, rdi
16305 .endm
16306 .macro RESTORE_C_REGS
16307- RESTORE_C_REGS_HELPER 1,1,1,1,1
16308+ RESTORE_C_REGS_HELPER 1,1,1,1,1,1
16309 .endm
16310 .macro RESTORE_C_REGS_EXCEPT_RAX
16311- RESTORE_C_REGS_HELPER 0,1,1,1,1
16312+ RESTORE_C_REGS_HELPER 0,1,1,1,1,0
16313 .endm
16314 .macro RESTORE_C_REGS_EXCEPT_RCX
16315- RESTORE_C_REGS_HELPER 1,0,1,1,1
16316+ RESTORE_C_REGS_HELPER 1,0,1,1,1,0
16317 .endm
16318 .macro RESTORE_C_REGS_EXCEPT_R11
16319- RESTORE_C_REGS_HELPER 1,1,0,1,1
16320+ RESTORE_C_REGS_HELPER 1,1,0,1,1,1
16321 .endm
16322 .macro RESTORE_C_REGS_EXCEPT_RCX_R11
16323- RESTORE_C_REGS_HELPER 1,0,0,1,1
16324+ RESTORE_C_REGS_HELPER 1,0,0,1,1,1
16325 .endm
16326 .macro RESTORE_RSI_RDI
16327- RESTORE_C_REGS_HELPER 0,0,0,0,0
16328+ RESTORE_C_REGS_HELPER 0,0,0,0,0,1
16329 .endm
16330 .macro RESTORE_RSI_RDI_RDX
16331- RESTORE_C_REGS_HELPER 0,0,0,0,1
16332+ RESTORE_C_REGS_HELPER 0,0,0,0,1,1
16333 .endm
16334
16335 .macro REMOVE_PT_GPREGS_FROM_STACK addskip=0
16336diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16337index f50de69..2b0a458 100644
16338--- a/arch/x86/include/asm/checksum_32.h
16339+++ b/arch/x86/include/asm/checksum_32.h
16340@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16341 int len, __wsum sum,
16342 int *src_err_ptr, int *dst_err_ptr);
16343
16344+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16345+ int len, __wsum sum,
16346+ int *src_err_ptr, int *dst_err_ptr);
16347+
16348+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16349+ int len, __wsum sum,
16350+ int *src_err_ptr, int *dst_err_ptr);
16351+
16352 /*
16353 * Note: when you get a NULL pointer exception here this means someone
16354 * passed in an incorrect kernel address to one of these functions.
16355@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16356
16357 might_sleep();
16358 stac();
16359- ret = csum_partial_copy_generic((__force void *)src, dst,
16360+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16361 len, sum, err_ptr, NULL);
16362 clac();
16363
16364@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16365 might_sleep();
16366 if (access_ok(VERIFY_WRITE, dst, len)) {
16367 stac();
16368- ret = csum_partial_copy_generic(src, (__force void *)dst,
16369+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16370 len, sum, NULL, err_ptr);
16371 clac();
16372 return ret;
16373diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16374index 99c105d7..2f667ac 100644
16375--- a/arch/x86/include/asm/cmpxchg.h
16376+++ b/arch/x86/include/asm/cmpxchg.h
16377@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16378 __compiletime_error("Bad argument size for cmpxchg");
16379 extern void __xadd_wrong_size(void)
16380 __compiletime_error("Bad argument size for xadd");
16381+extern void __xadd_check_overflow_wrong_size(void)
16382+ __compiletime_error("Bad argument size for xadd_check_overflow");
16383 extern void __add_wrong_size(void)
16384 __compiletime_error("Bad argument size for add");
16385+extern void __add_check_overflow_wrong_size(void)
16386+ __compiletime_error("Bad argument size for add_check_overflow");
16387
16388 /*
16389 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16390@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16391 __ret; \
16392 })
16393
16394+#ifdef CONFIG_PAX_REFCOUNT
16395+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16396+ ({ \
16397+ __typeof__ (*(ptr)) __ret = (arg); \
16398+ switch (sizeof(*(ptr))) { \
16399+ case __X86_CASE_L: \
16400+ asm volatile (lock #op "l %0, %1\n" \
16401+ "jno 0f\n" \
16402+ "mov %0,%1\n" \
16403+ "int $4\n0:\n" \
16404+ _ASM_EXTABLE(0b, 0b) \
16405+ : "+r" (__ret), "+m" (*(ptr)) \
16406+ : : "memory", "cc"); \
16407+ break; \
16408+ case __X86_CASE_Q: \
16409+ asm volatile (lock #op "q %q0, %1\n" \
16410+ "jno 0f\n" \
16411+ "mov %0,%1\n" \
16412+ "int $4\n0:\n" \
16413+ _ASM_EXTABLE(0b, 0b) \
16414+ : "+r" (__ret), "+m" (*(ptr)) \
16415+ : : "memory", "cc"); \
16416+ break; \
16417+ default: \
16418+ __ ## op ## _check_overflow_wrong_size(); \
16419+ } \
16420+ __ret; \
16421+ })
16422+#else
16423+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16424+#endif
16425+
16426 /*
16427 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16428 * Since this is generally used to protect other memory information, we
16429@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16430 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16431 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16432
16433+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16434+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16435+
16436 #define __add(ptr, inc, lock) \
16437 ({ \
16438 __typeof__ (*(ptr)) __ret = (inc); \
16439diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16440index acdee09..a553db3 100644
16441--- a/arch/x86/include/asm/compat.h
16442+++ b/arch/x86/include/asm/compat.h
16443@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16444 typedef u32 compat_uint_t;
16445 typedef u32 compat_ulong_t;
16446 typedef u64 __attribute__((aligned(4))) compat_u64;
16447-typedef u32 compat_uptr_t;
16448+typedef u32 __user compat_uptr_t;
16449
16450 struct compat_timespec {
16451 compat_time_t tv_sec;
16452diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16453index 3d6606f..300641d 100644
16454--- a/arch/x86/include/asm/cpufeature.h
16455+++ b/arch/x86/include/asm/cpufeature.h
16456@@ -214,7 +214,8 @@
16457 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16458 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16459 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16460-
16461+#define X86_FEATURE_PCIDUDEREF ( 8*32+30) /* PaX PCID based UDEREF */
16462+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16463
16464 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16465 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16466@@ -222,7 +223,7 @@
16467 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16468 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16469 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16470-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16471+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16472 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16473 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16474 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16475@@ -401,6 +402,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16476 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16477 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16478 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16479+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16480
16481 #if __GNUC__ >= 4
16482 extern void warn_pre_alternatives(void);
16483@@ -454,7 +456,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16484
16485 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16486 t_warn:
16487- warn_pre_alternatives();
16488+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID && bit != X86_FEATURE_PCIDUDEREF)
16489+ warn_pre_alternatives();
16490 return false;
16491 #endif
16492
16493@@ -475,7 +478,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16494 ".section .discard,\"aw\",@progbits\n"
16495 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16496 ".previous\n"
16497- ".section .altinstr_replacement,\"ax\"\n"
16498+ ".section .altinstr_replacement,\"a\"\n"
16499 "3: movb $1,%0\n"
16500 "4:\n"
16501 ".previous\n"
16502@@ -510,7 +513,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16503 " .byte 5f - 4f\n" /* repl len */
16504 " .byte 3b - 2b\n" /* pad len */
16505 ".previous\n"
16506- ".section .altinstr_replacement,\"ax\"\n"
16507+ ".section .altinstr_replacement,\"a\"\n"
16508 "4: jmp %l[t_no]\n"
16509 "5:\n"
16510 ".previous\n"
16511@@ -545,7 +548,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16512 ".section .discard,\"aw\",@progbits\n"
16513 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16514 ".previous\n"
16515- ".section .altinstr_replacement,\"ax\"\n"
16516+ ".section .altinstr_replacement,\"a\"\n"
16517 "3: movb $0,%0\n"
16518 "4:\n"
16519 ".previous\n"
16520@@ -560,7 +563,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16521 ".section .discard,\"aw\",@progbits\n"
16522 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16523 ".previous\n"
16524- ".section .altinstr_replacement,\"ax\"\n"
16525+ ".section .altinstr_replacement,\"a\"\n"
16526 "5: movb $1,%0\n"
16527 "6:\n"
16528 ".previous\n"
16529diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16530index a0bf89f..56f0b2a 100644
16531--- a/arch/x86/include/asm/desc.h
16532+++ b/arch/x86/include/asm/desc.h
16533@@ -4,6 +4,7 @@
16534 #include <asm/desc_defs.h>
16535 #include <asm/ldt.h>
16536 #include <asm/mmu.h>
16537+#include <asm/pgtable.h>
16538
16539 #include <linux/smp.h>
16540 #include <linux/percpu.h>
16541@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16542
16543 desc->type = (info->read_exec_only ^ 1) << 1;
16544 desc->type |= info->contents << 2;
16545+ desc->type |= info->seg_not_present ^ 1;
16546
16547 desc->s = 1;
16548 desc->dpl = 0x3;
16549@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16550 }
16551
16552 extern struct desc_ptr idt_descr;
16553-extern gate_desc idt_table[];
16554-extern struct desc_ptr debug_idt_descr;
16555-extern gate_desc debug_idt_table[];
16556-
16557-struct gdt_page {
16558- struct desc_struct gdt[GDT_ENTRIES];
16559-} __attribute__((aligned(PAGE_SIZE)));
16560-
16561-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16562+extern gate_desc idt_table[IDT_ENTRIES];
16563+extern const struct desc_ptr debug_idt_descr;
16564+extern gate_desc debug_idt_table[IDT_ENTRIES];
16565
16566+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16567 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16568 {
16569- return per_cpu(gdt_page, cpu).gdt;
16570+ return cpu_gdt_table[cpu];
16571 }
16572
16573 #ifdef CONFIG_X86_64
16574@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16575 unsigned long base, unsigned dpl, unsigned flags,
16576 unsigned short seg)
16577 {
16578- gate->a = (seg << 16) | (base & 0xffff);
16579- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16580+ gate->gate.offset_low = base;
16581+ gate->gate.seg = seg;
16582+ gate->gate.reserved = 0;
16583+ gate->gate.type = type;
16584+ gate->gate.s = 0;
16585+ gate->gate.dpl = dpl;
16586+ gate->gate.p = 1;
16587+ gate->gate.offset_high = base >> 16;
16588 }
16589
16590 #endif
16591@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16592
16593 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16594 {
16595+ pax_open_kernel();
16596 memcpy(&idt[entry], gate, sizeof(*gate));
16597+ pax_close_kernel();
16598 }
16599
16600 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16601 {
16602+ pax_open_kernel();
16603 memcpy(&ldt[entry], desc, 8);
16604+ pax_close_kernel();
16605 }
16606
16607 static inline void
16608@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16609 default: size = sizeof(*gdt); break;
16610 }
16611
16612+ pax_open_kernel();
16613 memcpy(&gdt[entry], desc, size);
16614+ pax_close_kernel();
16615 }
16616
16617 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16618@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16619
16620 static inline void native_load_tr_desc(void)
16621 {
16622+ pax_open_kernel();
16623 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16624+ pax_close_kernel();
16625 }
16626
16627 static inline void native_load_gdt(const struct desc_ptr *dtr)
16628@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16629 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16630 unsigned int i;
16631
16632+ pax_open_kernel();
16633 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16634 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16635+ pax_close_kernel();
16636 }
16637
16638 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16639@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16640 preempt_enable();
16641 }
16642
16643-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16644+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16645 {
16646 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16647 }
16648@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16649 }
16650
16651 #ifdef CONFIG_X86_64
16652-static inline void set_nmi_gate(int gate, void *addr)
16653+static inline void set_nmi_gate(int gate, const void *addr)
16654 {
16655 gate_desc s;
16656
16657@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16658 #endif
16659
16660 #ifdef CONFIG_TRACING
16661-extern struct desc_ptr trace_idt_descr;
16662-extern gate_desc trace_idt_table[];
16663+extern const struct desc_ptr trace_idt_descr;
16664+extern gate_desc trace_idt_table[IDT_ENTRIES];
16665 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16666 {
16667 write_idt_entry(trace_idt_table, entry, gate);
16668 }
16669
16670-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16671+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16672 unsigned dpl, unsigned ist, unsigned seg)
16673 {
16674 gate_desc s;
16675@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16676 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16677 #endif
16678
16679-static inline void _set_gate(int gate, unsigned type, void *addr,
16680+static inline void _set_gate(int gate, unsigned type, const void *addr,
16681 unsigned dpl, unsigned ist, unsigned seg)
16682 {
16683 gate_desc s;
16684@@ -379,14 +392,14 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16685 #define set_intr_gate_notrace(n, addr) \
16686 do { \
16687 BUG_ON((unsigned)n > 0xFF); \
16688- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16689+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16690 __KERNEL_CS); \
16691 } while (0)
16692
16693 #define set_intr_gate(n, addr) \
16694 do { \
16695 set_intr_gate_notrace(n, addr); \
16696- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16697+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16698 0, 0, __KERNEL_CS); \
16699 } while (0)
16700
16701@@ -414,19 +427,19 @@ static inline void alloc_system_vector(int vector)
16702 /*
16703 * This routine sets up an interrupt gate at directory privilege level 3.
16704 */
16705-static inline void set_system_intr_gate(unsigned int n, void *addr)
16706+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16707 {
16708 BUG_ON((unsigned)n > 0xFF);
16709 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16710 }
16711
16712-static inline void set_system_trap_gate(unsigned int n, void *addr)
16713+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16714 {
16715 BUG_ON((unsigned)n > 0xFF);
16716 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16717 }
16718
16719-static inline void set_trap_gate(unsigned int n, void *addr)
16720+static inline void set_trap_gate(unsigned int n, const void *addr)
16721 {
16722 BUG_ON((unsigned)n > 0xFF);
16723 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16724@@ -435,16 +448,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16725 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16726 {
16727 BUG_ON((unsigned)n > 0xFF);
16728- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16729+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16730 }
16731
16732-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16733+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16734 {
16735 BUG_ON((unsigned)n > 0xFF);
16736 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16737 }
16738
16739-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16740+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16741 {
16742 BUG_ON((unsigned)n > 0xFF);
16743 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16744@@ -516,4 +529,17 @@ static inline void load_current_idt(void)
16745 else
16746 load_idt((const struct desc_ptr *)&idt_descr);
16747 }
16748+
16749+#ifdef CONFIG_X86_32
16750+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16751+{
16752+ struct desc_struct d;
16753+
16754+ if (likely(limit))
16755+ limit = (limit - 1UL) >> PAGE_SHIFT;
16756+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16757+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16758+}
16759+#endif
16760+
16761 #endif /* _ASM_X86_DESC_H */
16762diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16763index 278441f..b95a174 100644
16764--- a/arch/x86/include/asm/desc_defs.h
16765+++ b/arch/x86/include/asm/desc_defs.h
16766@@ -31,6 +31,12 @@ struct desc_struct {
16767 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16768 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16769 };
16770+ struct {
16771+ u16 offset_low;
16772+ u16 seg;
16773+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16774+ unsigned offset_high: 16;
16775+ } gate;
16776 };
16777 } __attribute__((packed));
16778
16779diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16780index ced283a..ffe04cc 100644
16781--- a/arch/x86/include/asm/div64.h
16782+++ b/arch/x86/include/asm/div64.h
16783@@ -39,7 +39,7 @@
16784 __mod; \
16785 })
16786
16787-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16788+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16789 {
16790 union {
16791 u64 v64;
16792diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16793index f161c18..97d43e8 100644
16794--- a/arch/x86/include/asm/elf.h
16795+++ b/arch/x86/include/asm/elf.h
16796@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16797
16798 #include <asm/vdso.h>
16799
16800-#ifdef CONFIG_X86_64
16801-extern unsigned int vdso64_enabled;
16802-#endif
16803 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16804 extern unsigned int vdso32_enabled;
16805 #endif
16806@@ -250,7 +247,25 @@ extern int force_personality32;
16807 the loader. We need to make sure that it is out of the way of the program
16808 that it will "exec", and that there is sufficient room for the brk. */
16809
16810+#ifdef CONFIG_PAX_SEGMEXEC
16811+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16812+#else
16813 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16814+#endif
16815+
16816+#ifdef CONFIG_PAX_ASLR
16817+#ifdef CONFIG_X86_32
16818+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16819+
16820+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16821+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16822+#else
16823+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16824+
16825+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16826+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16827+#endif
16828+#endif
16829
16830 /* This yields a mask that user programs can use to figure out what
16831 instruction set this CPU supports. This could be done in user space,
16832@@ -299,17 +314,13 @@ do { \
16833
16834 #define ARCH_DLINFO \
16835 do { \
16836- if (vdso64_enabled) \
16837- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16838- (unsigned long __force)current->mm->context.vdso); \
16839+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16840 } while (0)
16841
16842 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16843 #define ARCH_DLINFO_X32 \
16844 do { \
16845- if (vdso64_enabled) \
16846- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16847- (unsigned long __force)current->mm->context.vdso); \
16848+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16849 } while (0)
16850
16851 #define AT_SYSINFO 32
16852@@ -324,10 +335,10 @@ else \
16853
16854 #endif /* !CONFIG_X86_32 */
16855
16856-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16857+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16858
16859 #define VDSO_ENTRY \
16860- ((unsigned long)current->mm->context.vdso + \
16861+ (current->mm->context.vdso + \
16862 selected_vdso32->sym___kernel_vsyscall)
16863
16864 struct linux_binprm;
16865diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16866index 77a99ac..39ff7f5 100644
16867--- a/arch/x86/include/asm/emergency-restart.h
16868+++ b/arch/x86/include/asm/emergency-restart.h
16869@@ -1,6 +1,6 @@
16870 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16871 #define _ASM_X86_EMERGENCY_RESTART_H
16872
16873-extern void machine_emergency_restart(void);
16874+extern void machine_emergency_restart(void) __noreturn;
16875
16876 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16877diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16878index 1c7eefe..d0e4702 100644
16879--- a/arch/x86/include/asm/floppy.h
16880+++ b/arch/x86/include/asm/floppy.h
16881@@ -229,18 +229,18 @@ static struct fd_routine_l {
16882 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16883 } fd_routine[] = {
16884 {
16885- request_dma,
16886- free_dma,
16887- get_dma_residue,
16888- dma_mem_alloc,
16889- hard_dma_setup
16890+ ._request_dma = request_dma,
16891+ ._free_dma = free_dma,
16892+ ._get_dma_residue = get_dma_residue,
16893+ ._dma_mem_alloc = dma_mem_alloc,
16894+ ._dma_setup = hard_dma_setup
16895 },
16896 {
16897- vdma_request_dma,
16898- vdma_nop,
16899- vdma_get_dma_residue,
16900- vdma_mem_alloc,
16901- vdma_dma_setup
16902+ ._request_dma = vdma_request_dma,
16903+ ._free_dma = vdma_nop,
16904+ ._get_dma_residue = vdma_get_dma_residue,
16905+ ._dma_mem_alloc = vdma_mem_alloc,
16906+ ._dma_setup = vdma_dma_setup
16907 }
16908 };
16909
16910diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16911index da5e967..ab07eec 100644
16912--- a/arch/x86/include/asm/fpu-internal.h
16913+++ b/arch/x86/include/asm/fpu-internal.h
16914@@ -151,8 +151,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16915 #define user_insn(insn, output, input...) \
16916 ({ \
16917 int err; \
16918+ pax_open_userland(); \
16919 asm volatile(ASM_STAC "\n" \
16920- "1:" #insn "\n\t" \
16921+ "1:" \
16922+ __copyuser_seg \
16923+ #insn "\n\t" \
16924 "2: " ASM_CLAC "\n" \
16925 ".section .fixup,\"ax\"\n" \
16926 "3: movl $-1,%[err]\n" \
16927@@ -161,6 +164,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16928 _ASM_EXTABLE(1b, 3b) \
16929 : [err] "=r" (err), output \
16930 : "0"(0), input); \
16931+ pax_close_userland(); \
16932 err; \
16933 })
16934
16935@@ -327,7 +331,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16936 "fnclex\n\t"
16937 "emms\n\t"
16938 "fildl %P[addr]" /* set F?P to defined value */
16939- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16940+ : : [addr] "m" (cpu_tss[raw_smp_processor_id()].x86_tss.sp0));
16941 }
16942
16943 return fpu_restore_checking(&tsk->thread.fpu);
16944diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16945index b4c1f54..e290c08 100644
16946--- a/arch/x86/include/asm/futex.h
16947+++ b/arch/x86/include/asm/futex.h
16948@@ -12,6 +12,7 @@
16949 #include <asm/smap.h>
16950
16951 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16952+ typecheck(u32 __user *, uaddr); \
16953 asm volatile("\t" ASM_STAC "\n" \
16954 "1:\t" insn "\n" \
16955 "2:\t" ASM_CLAC "\n" \
16956@@ -20,15 +21,16 @@
16957 "\tjmp\t2b\n" \
16958 "\t.previous\n" \
16959 _ASM_EXTABLE(1b, 3b) \
16960- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16961+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16962 : "i" (-EFAULT), "0" (oparg), "1" (0))
16963
16964 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16965+ typecheck(u32 __user *, uaddr); \
16966 asm volatile("\t" ASM_STAC "\n" \
16967 "1:\tmovl %2, %0\n" \
16968 "\tmovl\t%0, %3\n" \
16969 "\t" insn "\n" \
16970- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16971+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16972 "\tjnz\t1b\n" \
16973 "3:\t" ASM_CLAC "\n" \
16974 "\t.section .fixup,\"ax\"\n" \
16975@@ -38,7 +40,7 @@
16976 _ASM_EXTABLE(1b, 4b) \
16977 _ASM_EXTABLE(2b, 4b) \
16978 : "=&a" (oldval), "=&r" (ret), \
16979- "+m" (*uaddr), "=&r" (tem) \
16980+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16981 : "r" (oparg), "i" (-EFAULT), "1" (0))
16982
16983 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16984@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16985
16986 pagefault_disable();
16987
16988+ pax_open_userland();
16989 switch (op) {
16990 case FUTEX_OP_SET:
16991- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16992+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16993 break;
16994 case FUTEX_OP_ADD:
16995- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16996+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16997 uaddr, oparg);
16998 break;
16999 case FUTEX_OP_OR:
17000@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17001 default:
17002 ret = -ENOSYS;
17003 }
17004+ pax_close_userland();
17005
17006 pagefault_enable();
17007
17008diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17009index e9571dd..df5f542 100644
17010--- a/arch/x86/include/asm/hw_irq.h
17011+++ b/arch/x86/include/asm/hw_irq.h
17012@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
17013 #endif /* CONFIG_X86_LOCAL_APIC */
17014
17015 /* Statistics */
17016-extern atomic_t irq_err_count;
17017-extern atomic_t irq_mis_count;
17018+extern atomic_unchecked_t irq_err_count;
17019+extern atomic_unchecked_t irq_mis_count;
17020
17021 /* EISA */
17022 extern void eisa_set_level_irq(unsigned int irq);
17023diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17024index ccffa53..3c90c87 100644
17025--- a/arch/x86/include/asm/i8259.h
17026+++ b/arch/x86/include/asm/i8259.h
17027@@ -62,7 +62,7 @@ struct legacy_pic {
17028 void (*init)(int auto_eoi);
17029 int (*irq_pending)(unsigned int irq);
17030 void (*make_irq)(unsigned int irq);
17031-};
17032+} __do_const;
17033
17034 extern struct legacy_pic *legacy_pic;
17035 extern struct legacy_pic null_legacy_pic;
17036diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17037index 34a5b93..27e40a6 100644
17038--- a/arch/x86/include/asm/io.h
17039+++ b/arch/x86/include/asm/io.h
17040@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17041 "m" (*(volatile type __force *)addr) barrier); }
17042
17043 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17044-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17045-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17046+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17047+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17048
17049 build_mmio_read(__readb, "b", unsigned char, "=q", )
17050-build_mmio_read(__readw, "w", unsigned short, "=r", )
17051-build_mmio_read(__readl, "l", unsigned int, "=r", )
17052+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17053+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17054
17055 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17056 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17057@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17058 * this function
17059 */
17060
17061-static inline phys_addr_t virt_to_phys(volatile void *address)
17062+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17063 {
17064 return __pa(address);
17065 }
17066@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17067 return ioremap_nocache(offset, size);
17068 }
17069
17070-extern void iounmap(volatile void __iomem *addr);
17071+extern void iounmap(const volatile void __iomem *addr);
17072
17073 extern void set_iounmap_nonlazy(void);
17074
17075@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17076
17077 #include <linux/vmalloc.h>
17078
17079+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17080+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17081+{
17082+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17083+}
17084+
17085+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17086+{
17087+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17088+}
17089+
17090 /*
17091 * Convert a virtual cached pointer to an uncached pointer
17092 */
17093diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17094index b77f5ed..a2f791e 100644
17095--- a/arch/x86/include/asm/irqflags.h
17096+++ b/arch/x86/include/asm/irqflags.h
17097@@ -137,6 +137,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17098 swapgs; \
17099 sysretl
17100
17101+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17102+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17103+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17104+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17105+
17106 #else
17107 #define INTERRUPT_RETURN iret
17108 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17109diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17110index 4421b5d..8543006 100644
17111--- a/arch/x86/include/asm/kprobes.h
17112+++ b/arch/x86/include/asm/kprobes.h
17113@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17114 #define RELATIVEJUMP_SIZE 5
17115 #define RELATIVECALL_OPCODE 0xe8
17116 #define RELATIVE_ADDR_SIZE 4
17117-#define MAX_STACK_SIZE 64
17118-#define MIN_STACK_SIZE(ADDR) \
17119- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17120- THREAD_SIZE - (unsigned long)(ADDR))) \
17121- ? (MAX_STACK_SIZE) \
17122- : (((unsigned long)current_thread_info()) + \
17123- THREAD_SIZE - (unsigned long)(ADDR)))
17124+#define MAX_STACK_SIZE 64UL
17125+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17126
17127 #define flush_insn_slot(p) do { } while (0)
17128
17129diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17130index 4ad6560..75c7bdd 100644
17131--- a/arch/x86/include/asm/local.h
17132+++ b/arch/x86/include/asm/local.h
17133@@ -10,33 +10,97 @@ typedef struct {
17134 atomic_long_t a;
17135 } local_t;
17136
17137+typedef struct {
17138+ atomic_long_unchecked_t a;
17139+} local_unchecked_t;
17140+
17141 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17142
17143 #define local_read(l) atomic_long_read(&(l)->a)
17144+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17145 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17146+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17147
17148 static inline void local_inc(local_t *l)
17149 {
17150- asm volatile(_ASM_INC "%0"
17151+ asm volatile(_ASM_INC "%0\n"
17152+
17153+#ifdef CONFIG_PAX_REFCOUNT
17154+ "jno 0f\n"
17155+ _ASM_DEC "%0\n"
17156+ "int $4\n0:\n"
17157+ _ASM_EXTABLE(0b, 0b)
17158+#endif
17159+
17160+ : "+m" (l->a.counter));
17161+}
17162+
17163+static inline void local_inc_unchecked(local_unchecked_t *l)
17164+{
17165+ asm volatile(_ASM_INC "%0\n"
17166 : "+m" (l->a.counter));
17167 }
17168
17169 static inline void local_dec(local_t *l)
17170 {
17171- asm volatile(_ASM_DEC "%0"
17172+ asm volatile(_ASM_DEC "%0\n"
17173+
17174+#ifdef CONFIG_PAX_REFCOUNT
17175+ "jno 0f\n"
17176+ _ASM_INC "%0\n"
17177+ "int $4\n0:\n"
17178+ _ASM_EXTABLE(0b, 0b)
17179+#endif
17180+
17181+ : "+m" (l->a.counter));
17182+}
17183+
17184+static inline void local_dec_unchecked(local_unchecked_t *l)
17185+{
17186+ asm volatile(_ASM_DEC "%0\n"
17187 : "+m" (l->a.counter));
17188 }
17189
17190 static inline void local_add(long i, local_t *l)
17191 {
17192- asm volatile(_ASM_ADD "%1,%0"
17193+ asm volatile(_ASM_ADD "%1,%0\n"
17194+
17195+#ifdef CONFIG_PAX_REFCOUNT
17196+ "jno 0f\n"
17197+ _ASM_SUB "%1,%0\n"
17198+ "int $4\n0:\n"
17199+ _ASM_EXTABLE(0b, 0b)
17200+#endif
17201+
17202+ : "+m" (l->a.counter)
17203+ : "ir" (i));
17204+}
17205+
17206+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17207+{
17208+ asm volatile(_ASM_ADD "%1,%0\n"
17209 : "+m" (l->a.counter)
17210 : "ir" (i));
17211 }
17212
17213 static inline void local_sub(long i, local_t *l)
17214 {
17215- asm volatile(_ASM_SUB "%1,%0"
17216+ asm volatile(_ASM_SUB "%1,%0\n"
17217+
17218+#ifdef CONFIG_PAX_REFCOUNT
17219+ "jno 0f\n"
17220+ _ASM_ADD "%1,%0\n"
17221+ "int $4\n0:\n"
17222+ _ASM_EXTABLE(0b, 0b)
17223+#endif
17224+
17225+ : "+m" (l->a.counter)
17226+ : "ir" (i));
17227+}
17228+
17229+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17230+{
17231+ asm volatile(_ASM_SUB "%1,%0\n"
17232 : "+m" (l->a.counter)
17233 : "ir" (i));
17234 }
17235@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17236 */
17237 static inline int local_sub_and_test(long i, local_t *l)
17238 {
17239- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17240+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17241 }
17242
17243 /**
17244@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17245 */
17246 static inline int local_dec_and_test(local_t *l)
17247 {
17248- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17249+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17250 }
17251
17252 /**
17253@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17254 */
17255 static inline int local_inc_and_test(local_t *l)
17256 {
17257- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17258+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17259 }
17260
17261 /**
17262@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17263 */
17264 static inline int local_add_negative(long i, local_t *l)
17265 {
17266- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17267+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17268 }
17269
17270 /**
17271@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17272 static inline long local_add_return(long i, local_t *l)
17273 {
17274 long __i = i;
17275+ asm volatile(_ASM_XADD "%0, %1\n"
17276+
17277+#ifdef CONFIG_PAX_REFCOUNT
17278+ "jno 0f\n"
17279+ _ASM_MOV "%0,%1\n"
17280+ "int $4\n0:\n"
17281+ _ASM_EXTABLE(0b, 0b)
17282+#endif
17283+
17284+ : "+r" (i), "+m" (l->a.counter)
17285+ : : "memory");
17286+ return i + __i;
17287+}
17288+
17289+/**
17290+ * local_add_return_unchecked - add and return
17291+ * @i: integer value to add
17292+ * @l: pointer to type local_unchecked_t
17293+ *
17294+ * Atomically adds @i to @l and returns @i + @l
17295+ */
17296+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17297+{
17298+ long __i = i;
17299 asm volatile(_ASM_XADD "%0, %1;"
17300 : "+r" (i), "+m" (l->a.counter)
17301 : : "memory");
17302@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17303
17304 #define local_cmpxchg(l, o, n) \
17305 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17306+#define local_cmpxchg_unchecked(l, o, n) \
17307+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17308 /* Always has a lock prefix */
17309 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17310
17311diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17312new file mode 100644
17313index 0000000..2bfd3ba
17314--- /dev/null
17315+++ b/arch/x86/include/asm/mman.h
17316@@ -0,0 +1,15 @@
17317+#ifndef _X86_MMAN_H
17318+#define _X86_MMAN_H
17319+
17320+#include <uapi/asm/mman.h>
17321+
17322+#ifdef __KERNEL__
17323+#ifndef __ASSEMBLY__
17324+#ifdef CONFIG_X86_32
17325+#define arch_mmap_check i386_mmap_check
17326+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17327+#endif
17328+#endif
17329+#endif
17330+
17331+#endif /* X86_MMAN_H */
17332diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17333index 09b9620..923aecd 100644
17334--- a/arch/x86/include/asm/mmu.h
17335+++ b/arch/x86/include/asm/mmu.h
17336@@ -9,7 +9,7 @@
17337 * we put the segment information here.
17338 */
17339 typedef struct {
17340- void *ldt;
17341+ struct desc_struct *ldt;
17342 int size;
17343
17344 #ifdef CONFIG_X86_64
17345@@ -18,7 +18,19 @@ typedef struct {
17346 #endif
17347
17348 struct mutex lock;
17349- void __user *vdso;
17350+ unsigned long vdso;
17351+
17352+#ifdef CONFIG_X86_32
17353+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17354+ unsigned long user_cs_base;
17355+ unsigned long user_cs_limit;
17356+
17357+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17358+ cpumask_t cpu_user_cs_mask;
17359+#endif
17360+
17361+#endif
17362+#endif
17363
17364 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17365 } mm_context_t;
17366diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17367index e997f70..5d819f7 100644
17368--- a/arch/x86/include/asm/mmu_context.h
17369+++ b/arch/x86/include/asm/mmu_context.h
17370@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17371
17372 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17373 {
17374+
17375+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17376+ if (!(static_cpu_has(X86_FEATURE_PCIDUDEREF))) {
17377+ unsigned int i;
17378+ pgd_t *pgd;
17379+
17380+ pax_open_kernel();
17381+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17382+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17383+ set_pgd_batched(pgd+i, native_make_pgd(0));
17384+ pax_close_kernel();
17385+ }
17386+#endif
17387+
17388 #ifdef CONFIG_SMP
17389 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17390 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17391@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17392 struct task_struct *tsk)
17393 {
17394 unsigned cpu = smp_processor_id();
17395+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17396+ int tlbstate = TLBSTATE_OK;
17397+#endif
17398
17399 if (likely(prev != next)) {
17400 #ifdef CONFIG_SMP
17401+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17402+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17403+#endif
17404 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17405 this_cpu_write(cpu_tlbstate.active_mm, next);
17406 #endif
17407 cpumask_set_cpu(cpu, mm_cpumask(next));
17408
17409 /* Re-load page tables */
17410+#ifdef CONFIG_PAX_PER_CPU_PGD
17411+ pax_open_kernel();
17412+
17413+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17414+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF))
17415+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17416+ else
17417+#endif
17418+
17419+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17420+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17421+ pax_close_kernel();
17422+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
17423+
17424+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17425+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
17426+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17427+ u64 descriptor[2];
17428+ descriptor[0] = PCID_USER;
17429+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17430+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17431+ descriptor[0] = PCID_KERNEL;
17432+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17433+ }
17434+ } else {
17435+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17436+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17437+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17438+ else
17439+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17440+ }
17441+ } else
17442+#endif
17443+
17444+ load_cr3(get_cpu_pgd(cpu, kernel));
17445+#else
17446 load_cr3(next->pgd);
17447+#endif
17448 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17449
17450 /* Stop flush ipis for the previous mm */
17451@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17452 */
17453 if (unlikely(prev->context.ldt != next->context.ldt))
17454 load_LDT_nolock(&next->context);
17455+
17456+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17457+ if (!(__supported_pte_mask & _PAGE_NX)) {
17458+ smp_mb__before_atomic();
17459+ cpumask_clear_cpu(cpu, &prev->context.cpu_user_cs_mask);
17460+ smp_mb__after_atomic();
17461+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17462+ }
17463+#endif
17464+
17465+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17466+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17467+ prev->context.user_cs_limit != next->context.user_cs_limit))
17468+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17469+#ifdef CONFIG_SMP
17470+ else if (unlikely(tlbstate != TLBSTATE_OK))
17471+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17472+#endif
17473+#endif
17474+
17475 }
17476+ else {
17477+
17478+#ifdef CONFIG_PAX_PER_CPU_PGD
17479+ pax_open_kernel();
17480+
17481+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17482+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF))
17483+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17484+ else
17485+#endif
17486+
17487+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17488+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17489+ pax_close_kernel();
17490+ BUG_ON((__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL) != (read_cr3() & __PHYSICAL_MASK) && (__pa(get_cpu_pgd(cpu, user)) | PCID_USER) != (read_cr3() & __PHYSICAL_MASK));
17491+
17492+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17493+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
17494+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17495+ u64 descriptor[2];
17496+ descriptor[0] = PCID_USER;
17497+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17498+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17499+ descriptor[0] = PCID_KERNEL;
17500+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17501+ }
17502+ } else {
17503+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17504+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17505+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17506+ else
17507+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17508+ }
17509+ } else
17510+#endif
17511+
17512+ load_cr3(get_cpu_pgd(cpu, kernel));
17513+#endif
17514+
17515 #ifdef CONFIG_SMP
17516- else {
17517 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17518 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17519
17520@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17521 * tlb flush IPI delivery. We must reload CR3
17522 * to make sure to use no freed page tables.
17523 */
17524+
17525+#ifndef CONFIG_PAX_PER_CPU_PGD
17526 load_cr3(next->pgd);
17527 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17528+#endif
17529+
17530 load_mm_cr4(next);
17531 load_LDT_nolock(&next->context);
17532+
17533+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17534+ if (!(__supported_pte_mask & _PAGE_NX))
17535+ cpumask_set_cpu(cpu, &next->context.cpu_user_cs_mask);
17536+#endif
17537+
17538+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17539+#ifdef CONFIG_PAX_PAGEEXEC
17540+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17541+#endif
17542+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17543+#endif
17544+
17545 }
17546+#endif
17547 }
17548-#endif
17549 }
17550
17551 #define activate_mm(prev, next) \
17552diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17553index e3b7819..b257c64 100644
17554--- a/arch/x86/include/asm/module.h
17555+++ b/arch/x86/include/asm/module.h
17556@@ -5,6 +5,7 @@
17557
17558 #ifdef CONFIG_X86_64
17559 /* X86_64 does not define MODULE_PROC_FAMILY */
17560+#define MODULE_PROC_FAMILY ""
17561 #elif defined CONFIG_M486
17562 #define MODULE_PROC_FAMILY "486 "
17563 #elif defined CONFIG_M586
17564@@ -57,8 +58,20 @@
17565 #error unknown processor family
17566 #endif
17567
17568-#ifdef CONFIG_X86_32
17569-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17570+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17571+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17572+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17573+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17574+#else
17575+#define MODULE_PAX_KERNEXEC ""
17576 #endif
17577
17578+#ifdef CONFIG_PAX_MEMORY_UDEREF
17579+#define MODULE_PAX_UDEREF "UDEREF "
17580+#else
17581+#define MODULE_PAX_UDEREF ""
17582+#endif
17583+
17584+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17585+
17586 #endif /* _ASM_X86_MODULE_H */
17587diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17588index 5f2fc44..106caa6 100644
17589--- a/arch/x86/include/asm/nmi.h
17590+++ b/arch/x86/include/asm/nmi.h
17591@@ -36,26 +36,35 @@ enum {
17592
17593 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17594
17595+struct nmiaction;
17596+
17597+struct nmiwork {
17598+ const struct nmiaction *action;
17599+ u64 max_duration;
17600+ struct irq_work irq_work;
17601+};
17602+
17603 struct nmiaction {
17604 struct list_head list;
17605 nmi_handler_t handler;
17606- u64 max_duration;
17607- struct irq_work irq_work;
17608 unsigned long flags;
17609 const char *name;
17610-};
17611+ struct nmiwork *work;
17612+} __do_const;
17613
17614 #define register_nmi_handler(t, fn, fg, n, init...) \
17615 ({ \
17616- static struct nmiaction init fn##_na = { \
17617+ static struct nmiwork fn##_nw; \
17618+ static const struct nmiaction init fn##_na = { \
17619 .handler = (fn), \
17620 .name = (n), \
17621 .flags = (fg), \
17622+ .work = &fn##_nw, \
17623 }; \
17624 __register_nmi_handler((t), &fn##_na); \
17625 })
17626
17627-int __register_nmi_handler(unsigned int, struct nmiaction *);
17628+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17629
17630 void unregister_nmi_handler(unsigned int, const char *);
17631
17632diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17633index 802dde3..9183e68 100644
17634--- a/arch/x86/include/asm/page.h
17635+++ b/arch/x86/include/asm/page.h
17636@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17637 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17638
17639 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17640+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17641
17642 #define __boot_va(x) __va(x)
17643 #define __boot_pa(x) __pa(x)
17644@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17645 * virt_to_page(kaddr) returns a valid pointer if and only if
17646 * virt_addr_valid(kaddr) returns true.
17647 */
17648-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17649 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17650 extern bool __virt_addr_valid(unsigned long kaddr);
17651 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17652
17653+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17654+#define virt_to_page(kaddr) \
17655+ ({ \
17656+ const void *__kaddr = (const void *)(kaddr); \
17657+ BUG_ON(!virt_addr_valid(__kaddr)); \
17658+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17659+ })
17660+#else
17661+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17662+#endif
17663+
17664 #endif /* __ASSEMBLY__ */
17665
17666 #include <asm-generic/memory_model.h>
17667diff --git a/arch/x86/include/asm/page_32.h b/arch/x86/include/asm/page_32.h
17668index 904f528..b4d0d24 100644
17669--- a/arch/x86/include/asm/page_32.h
17670+++ b/arch/x86/include/asm/page_32.h
17671@@ -7,11 +7,17 @@
17672
17673 #define __phys_addr_nodebug(x) ((x) - PAGE_OFFSET)
17674 #ifdef CONFIG_DEBUG_VIRTUAL
17675-extern unsigned long __phys_addr(unsigned long);
17676+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17677 #else
17678-#define __phys_addr(x) __phys_addr_nodebug(x)
17679+static inline unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
17680+{
17681+ return __phys_addr_nodebug(x);
17682+}
17683 #endif
17684-#define __phys_addr_symbol(x) __phys_addr(x)
17685+static inline unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long x)
17686+{
17687+ return __phys_addr(x);
17688+}
17689 #define __phys_reloc_hide(x) RELOC_HIDE((x), 0)
17690
17691 #ifdef CONFIG_FLATMEM
17692diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17693index b3bebf9..cb419e7 100644
17694--- a/arch/x86/include/asm/page_64.h
17695+++ b/arch/x86/include/asm/page_64.h
17696@@ -7,9 +7,9 @@
17697
17698 /* duplicated to the one in bootmem.h */
17699 extern unsigned long max_pfn;
17700-extern unsigned long phys_base;
17701+extern const unsigned long phys_base;
17702
17703-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17704+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17705 {
17706 unsigned long y = x - __START_KERNEL_map;
17707
17708@@ -20,12 +20,14 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17709 }
17710
17711 #ifdef CONFIG_DEBUG_VIRTUAL
17712-extern unsigned long __phys_addr(unsigned long);
17713-extern unsigned long __phys_addr_symbol(unsigned long);
17714+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17715+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17716 #else
17717 #define __phys_addr(x) __phys_addr_nodebug(x)
17718-#define __phys_addr_symbol(x) \
17719- ((unsigned long)(x) - __START_KERNEL_map + phys_base)
17720+static inline unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long x)
17721+{
17722+ return x - __START_KERNEL_map + phys_base;
17723+}
17724 #endif
17725
17726 #define __phys_reloc_hide(x) (x)
17727diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17728index 8957810..f34efb4 100644
17729--- a/arch/x86/include/asm/paravirt.h
17730+++ b/arch/x86/include/asm/paravirt.h
17731@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17732 return (pmd_t) { ret };
17733 }
17734
17735-static inline pmdval_t pmd_val(pmd_t pmd)
17736+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17737 {
17738 pmdval_t ret;
17739
17740@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17741 val);
17742 }
17743
17744+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17745+{
17746+ pgdval_t val = native_pgd_val(pgd);
17747+
17748+ if (sizeof(pgdval_t) > sizeof(long))
17749+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17750+ val, (u64)val >> 32);
17751+ else
17752+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17753+ val);
17754+}
17755+
17756 static inline void pgd_clear(pgd_t *pgdp)
17757 {
17758 set_pgd(pgdp, __pgd(0));
17759@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17760 pv_mmu_ops.set_fixmap(idx, phys, flags);
17761 }
17762
17763+#ifdef CONFIG_PAX_KERNEXEC
17764+static inline unsigned long pax_open_kernel(void)
17765+{
17766+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17767+}
17768+
17769+static inline unsigned long pax_close_kernel(void)
17770+{
17771+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17772+}
17773+#else
17774+static inline unsigned long pax_open_kernel(void) { return 0; }
17775+static inline unsigned long pax_close_kernel(void) { return 0; }
17776+#endif
17777+
17778 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17779
17780 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17781@@ -906,7 +933,7 @@ extern void default_banner(void);
17782
17783 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17784 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17785-#define PARA_INDIRECT(addr) *%cs:addr
17786+#define PARA_INDIRECT(addr) *%ss:addr
17787 #endif
17788
17789 #define INTERRUPT_RETURN \
17790@@ -976,6 +1003,21 @@ extern void default_banner(void);
17791 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_usergs_sysret64), \
17792 CLBR_NONE, \
17793 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_usergs_sysret64))
17794+
17795+#define GET_CR0_INTO_RDI \
17796+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17797+ mov %rax,%rdi
17798+
17799+#define SET_RDI_INTO_CR0 \
17800+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17801+
17802+#define GET_CR3_INTO_RDI \
17803+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17804+ mov %rax,%rdi
17805+
17806+#define SET_RDI_INTO_CR3 \
17807+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17808+
17809 #endif /* CONFIG_X86_32 */
17810
17811 #endif /* __ASSEMBLY__ */
17812diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17813index f7b0b5c..cdd33f9 100644
17814--- a/arch/x86/include/asm/paravirt_types.h
17815+++ b/arch/x86/include/asm/paravirt_types.h
17816@@ -84,7 +84,7 @@ struct pv_init_ops {
17817 */
17818 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17819 unsigned long addr, unsigned len);
17820-};
17821+} __no_const __no_randomize_layout;
17822
17823
17824 struct pv_lazy_ops {
17825@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17826 void (*enter)(void);
17827 void (*leave)(void);
17828 void (*flush)(void);
17829-};
17830+} __no_randomize_layout;
17831
17832 struct pv_time_ops {
17833 unsigned long long (*sched_clock)(void);
17834 unsigned long long (*steal_clock)(int cpu);
17835 unsigned long (*get_tsc_khz)(void);
17836-};
17837+} __no_const __no_randomize_layout;
17838
17839 struct pv_cpu_ops {
17840 /* hooks for various privileged instructions */
17841@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17842
17843 void (*start_context_switch)(struct task_struct *prev);
17844 void (*end_context_switch)(struct task_struct *next);
17845-};
17846+} __no_const __no_randomize_layout;
17847
17848 struct pv_irq_ops {
17849 /*
17850@@ -215,7 +215,7 @@ struct pv_irq_ops {
17851 #ifdef CONFIG_X86_64
17852 void (*adjust_exception_frame)(void);
17853 #endif
17854-};
17855+} __no_randomize_layout;
17856
17857 struct pv_apic_ops {
17858 #ifdef CONFIG_X86_LOCAL_APIC
17859@@ -223,7 +223,7 @@ struct pv_apic_ops {
17860 unsigned long start_eip,
17861 unsigned long start_esp);
17862 #endif
17863-};
17864+} __no_const __no_randomize_layout;
17865
17866 struct pv_mmu_ops {
17867 unsigned long (*read_cr2)(void);
17868@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17869 struct paravirt_callee_save make_pud;
17870
17871 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17872+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17873 #endif /* CONFIG_PGTABLE_LEVELS == 4 */
17874 #endif /* CONFIG_PGTABLE_LEVELS >= 3 */
17875
17876@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17877 an mfn. We can tell which is which from the index. */
17878 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17879 phys_addr_t phys, pgprot_t flags);
17880-};
17881+
17882+#ifdef CONFIG_PAX_KERNEXEC
17883+ unsigned long (*pax_open_kernel)(void);
17884+ unsigned long (*pax_close_kernel)(void);
17885+#endif
17886+
17887+} __no_randomize_layout;
17888
17889 struct arch_spinlock;
17890 #ifdef CONFIG_SMP
17891@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17892 struct pv_lock_ops {
17893 struct paravirt_callee_save lock_spinning;
17894 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17895-};
17896+} __no_randomize_layout;
17897
17898 /* This contains all the paravirt structures: we get a convenient
17899 * number for each function using the offset which we use to indicate
17900- * what to patch. */
17901+ * what to patch.
17902+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17903+ */
17904+
17905 struct paravirt_patch_template {
17906 struct pv_init_ops pv_init_ops;
17907 struct pv_time_ops pv_time_ops;
17908@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17909 struct pv_apic_ops pv_apic_ops;
17910 struct pv_mmu_ops pv_mmu_ops;
17911 struct pv_lock_ops pv_lock_ops;
17912-};
17913+} __no_randomize_layout;
17914
17915 extern struct pv_info pv_info;
17916 extern struct pv_init_ops pv_init_ops;
17917diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17918index bf7f8b5..ca5799d 100644
17919--- a/arch/x86/include/asm/pgalloc.h
17920+++ b/arch/x86/include/asm/pgalloc.h
17921@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17922 pmd_t *pmd, pte_t *pte)
17923 {
17924 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17925+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17926+}
17927+
17928+static inline void pmd_populate_user(struct mm_struct *mm,
17929+ pmd_t *pmd, pte_t *pte)
17930+{
17931+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17932 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17933 }
17934
17935@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17936
17937 #ifdef CONFIG_X86_PAE
17938 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17939+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17940+{
17941+ pud_populate(mm, pudp, pmd);
17942+}
17943 #else /* !CONFIG_X86_PAE */
17944 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17945 {
17946 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17947 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17948 }
17949+
17950+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17951+{
17952+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17953+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17954+}
17955 #endif /* CONFIG_X86_PAE */
17956
17957 #if CONFIG_PGTABLE_LEVELS > 3
17958@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17959 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17960 }
17961
17962+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17963+{
17964+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17965+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17966+}
17967+
17968 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17969 {
17970 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17971diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17972index fd74a11..35fd5af 100644
17973--- a/arch/x86/include/asm/pgtable-2level.h
17974+++ b/arch/x86/include/asm/pgtable-2level.h
17975@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17976
17977 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17978 {
17979+ pax_open_kernel();
17980 *pmdp = pmd;
17981+ pax_close_kernel();
17982 }
17983
17984 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17985diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17986index cdaa58c..e61122b 100644
17987--- a/arch/x86/include/asm/pgtable-3level.h
17988+++ b/arch/x86/include/asm/pgtable-3level.h
17989@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17990
17991 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17992 {
17993+ pax_open_kernel();
17994 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17995+ pax_close_kernel();
17996 }
17997
17998 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17999 {
18000+ pax_open_kernel();
18001 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
18002+ pax_close_kernel();
18003 }
18004
18005 /*
18006diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
18007index fe57e7a..0573d42 100644
18008--- a/arch/x86/include/asm/pgtable.h
18009+++ b/arch/x86/include/asm/pgtable.h
18010@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18011
18012 #ifndef __PAGETABLE_PUD_FOLDED
18013 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
18014+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
18015 #define pgd_clear(pgd) native_pgd_clear(pgd)
18016 #endif
18017
18018@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18019
18020 #define arch_end_context_switch(prev) do {} while(0)
18021
18022+#define pax_open_kernel() native_pax_open_kernel()
18023+#define pax_close_kernel() native_pax_close_kernel()
18024 #endif /* CONFIG_PARAVIRT */
18025
18026+#define __HAVE_ARCH_PAX_OPEN_KERNEL
18027+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18028+
18029+#ifdef CONFIG_PAX_KERNEXEC
18030+static inline unsigned long native_pax_open_kernel(void)
18031+{
18032+ unsigned long cr0;
18033+
18034+ preempt_disable();
18035+ barrier();
18036+ cr0 = read_cr0() ^ X86_CR0_WP;
18037+ BUG_ON(cr0 & X86_CR0_WP);
18038+ write_cr0(cr0);
18039+ barrier();
18040+ return cr0 ^ X86_CR0_WP;
18041+}
18042+
18043+static inline unsigned long native_pax_close_kernel(void)
18044+{
18045+ unsigned long cr0;
18046+
18047+ barrier();
18048+ cr0 = read_cr0() ^ X86_CR0_WP;
18049+ BUG_ON(!(cr0 & X86_CR0_WP));
18050+ write_cr0(cr0);
18051+ barrier();
18052+ preempt_enable_no_resched();
18053+ return cr0 ^ X86_CR0_WP;
18054+}
18055+#else
18056+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18057+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18058+#endif
18059+
18060 /*
18061 * The following only work if pte_present() is true.
18062 * Undefined behaviour if not..
18063 */
18064+static inline int pte_user(pte_t pte)
18065+{
18066+ return pte_val(pte) & _PAGE_USER;
18067+}
18068+
18069 static inline int pte_dirty(pte_t pte)
18070 {
18071 return pte_flags(pte) & _PAGE_DIRTY;
18072@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18073 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18074 }
18075
18076+static inline unsigned long pgd_pfn(pgd_t pgd)
18077+{
18078+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18079+}
18080+
18081 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18082
18083 static inline int pmd_large(pmd_t pte)
18084@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18085 return pte_clear_flags(pte, _PAGE_RW);
18086 }
18087
18088+static inline pte_t pte_mkread(pte_t pte)
18089+{
18090+ return __pte(pte_val(pte) | _PAGE_USER);
18091+}
18092+
18093 static inline pte_t pte_mkexec(pte_t pte)
18094 {
18095- return pte_clear_flags(pte, _PAGE_NX);
18096+#ifdef CONFIG_X86_PAE
18097+ if (__supported_pte_mask & _PAGE_NX)
18098+ return pte_clear_flags(pte, _PAGE_NX);
18099+ else
18100+#endif
18101+ return pte_set_flags(pte, _PAGE_USER);
18102+}
18103+
18104+static inline pte_t pte_exprotect(pte_t pte)
18105+{
18106+#ifdef CONFIG_X86_PAE
18107+ if (__supported_pte_mask & _PAGE_NX)
18108+ return pte_set_flags(pte, _PAGE_NX);
18109+ else
18110+#endif
18111+ return pte_clear_flags(pte, _PAGE_USER);
18112 }
18113
18114 static inline pte_t pte_mkdirty(pte_t pte)
18115@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18116 #endif
18117
18118 #ifndef __ASSEMBLY__
18119+
18120+#ifdef CONFIG_PAX_PER_CPU_PGD
18121+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18122+enum cpu_pgd_type {kernel = 0, user = 1};
18123+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18124+{
18125+ return cpu_pgd[cpu][type];
18126+}
18127+#endif
18128+
18129 #include <linux/mm_types.h>
18130 #include <linux/mmdebug.h>
18131 #include <linux/log2.h>
18132@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18133 * Currently stuck as a macro due to indirect forward reference to
18134 * linux/mmzone.h's __section_mem_map_addr() definition:
18135 */
18136-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18137+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18138
18139 /* Find an entry in the second-level page table.. */
18140 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18141@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18142 * Currently stuck as a macro due to indirect forward reference to
18143 * linux/mmzone.h's __section_mem_map_addr() definition:
18144 */
18145-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18146+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18147
18148 /* to find an entry in a page-table-directory. */
18149 static inline unsigned long pud_index(unsigned long address)
18150@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18151
18152 static inline int pgd_bad(pgd_t pgd)
18153 {
18154- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18155+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18156 }
18157
18158 static inline int pgd_none(pgd_t pgd)
18159@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18160 * pgd_offset() returns a (pgd_t *)
18161 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18162 */
18163-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18164+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18165+
18166+#ifdef CONFIG_PAX_PER_CPU_PGD
18167+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18168+#endif
18169+
18170 /*
18171 * a shortcut which implies the use of the kernel's pgd, instead
18172 * of a process's
18173@@ -660,6 +742,25 @@ static inline int pgd_none(pgd_t pgd)
18174 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18175 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18176
18177+#ifdef CONFIG_X86_32
18178+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18179+#else
18180+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18181+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18182+
18183+#ifdef CONFIG_PAX_MEMORY_UDEREF
18184+#ifdef __ASSEMBLY__
18185+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18186+#else
18187+extern unsigned long pax_user_shadow_base;
18188+extern pgdval_t clone_pgd_mask;
18189+#endif
18190+#else
18191+#define pax_user_shadow_base (0UL)
18192+#endif
18193+
18194+#endif
18195+
18196 #ifndef __ASSEMBLY__
18197
18198 extern int direct_gbpages;
18199@@ -826,11 +927,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18200 * dst and src can be on the same page, but the range must not overlap,
18201 * and must not cross a page boundary.
18202 */
18203-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18204+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18205 {
18206- memcpy(dst, src, count * sizeof(pgd_t));
18207+ pax_open_kernel();
18208+ while (count--)
18209+ *dst++ = *src++;
18210+ pax_close_kernel();
18211 }
18212
18213+#ifdef CONFIG_PAX_PER_CPU_PGD
18214+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18215+#endif
18216+
18217+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18218+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18219+#else
18220+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18221+#endif
18222+
18223 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18224 static inline int page_level_shift(enum pg_level level)
18225 {
18226diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18227index b6c0b40..3535d47 100644
18228--- a/arch/x86/include/asm/pgtable_32.h
18229+++ b/arch/x86/include/asm/pgtable_32.h
18230@@ -25,9 +25,6 @@
18231 struct mm_struct;
18232 struct vm_area_struct;
18233
18234-extern pgd_t swapper_pg_dir[1024];
18235-extern pgd_t initial_page_table[1024];
18236-
18237 static inline void pgtable_cache_init(void) { }
18238 static inline void check_pgt_cache(void) { }
18239 void paging_init(void);
18240@@ -45,6 +42,12 @@ void paging_init(void);
18241 # include <asm/pgtable-2level.h>
18242 #endif
18243
18244+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18245+extern pgd_t initial_page_table[PTRS_PER_PGD];
18246+#ifdef CONFIG_X86_PAE
18247+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18248+#endif
18249+
18250 #if defined(CONFIG_HIGHPTE)
18251 #define pte_offset_map(dir, address) \
18252 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18253@@ -59,12 +62,17 @@ void paging_init(void);
18254 /* Clear a kernel PTE and flush it from the TLB */
18255 #define kpte_clear_flush(ptep, vaddr) \
18256 do { \
18257+ pax_open_kernel(); \
18258 pte_clear(&init_mm, (vaddr), (ptep)); \
18259+ pax_close_kernel(); \
18260 __flush_tlb_one((vaddr)); \
18261 } while (0)
18262
18263 #endif /* !__ASSEMBLY__ */
18264
18265+#define HAVE_ARCH_UNMAPPED_AREA
18266+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18267+
18268 /*
18269 * kern_addr_valid() is (1) for FLATMEM and (0) for
18270 * SPARSEMEM and DISCONTIGMEM
18271diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18272index 9fb2f2b..b04b4bf 100644
18273--- a/arch/x86/include/asm/pgtable_32_types.h
18274+++ b/arch/x86/include/asm/pgtable_32_types.h
18275@@ -8,7 +8,7 @@
18276 */
18277 #ifdef CONFIG_X86_PAE
18278 # include <asm/pgtable-3level_types.h>
18279-# define PMD_SIZE (1UL << PMD_SHIFT)
18280+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18281 # define PMD_MASK (~(PMD_SIZE - 1))
18282 #else
18283 # include <asm/pgtable-2level_types.h>
18284@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18285 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18286 #endif
18287
18288+#ifdef CONFIG_PAX_KERNEXEC
18289+#ifndef __ASSEMBLY__
18290+extern unsigned char MODULES_EXEC_VADDR[];
18291+extern unsigned char MODULES_EXEC_END[];
18292+#endif
18293+#include <asm/boot.h>
18294+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18295+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18296+#else
18297+#define ktla_ktva(addr) (addr)
18298+#define ktva_ktla(addr) (addr)
18299+#endif
18300+
18301 #define MODULES_VADDR VMALLOC_START
18302 #define MODULES_END VMALLOC_END
18303 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18304diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18305index 2ee7811..55aca24 100644
18306--- a/arch/x86/include/asm/pgtable_64.h
18307+++ b/arch/x86/include/asm/pgtable_64.h
18308@@ -16,11 +16,16 @@
18309
18310 extern pud_t level3_kernel_pgt[512];
18311 extern pud_t level3_ident_pgt[512];
18312+extern pud_t level3_vmalloc_start_pgt[512];
18313+extern pud_t level3_vmalloc_end_pgt[512];
18314+extern pud_t level3_vmemmap_pgt[512];
18315+extern pud_t level2_vmemmap_pgt[512];
18316 extern pmd_t level2_kernel_pgt[512];
18317 extern pmd_t level2_fixmap_pgt[512];
18318-extern pmd_t level2_ident_pgt[512];
18319-extern pte_t level1_fixmap_pgt[512];
18320-extern pgd_t init_level4_pgt[];
18321+extern pmd_t level2_ident_pgt[2][512];
18322+extern pte_t level1_fixmap_pgt[3][512];
18323+extern pte_t level1_vsyscall_pgt[512];
18324+extern pgd_t init_level4_pgt[512];
18325
18326 #define swapper_pg_dir init_level4_pgt
18327
18328@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18329
18330 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18331 {
18332+ pax_open_kernel();
18333 *pmdp = pmd;
18334+ pax_close_kernel();
18335 }
18336
18337 static inline void native_pmd_clear(pmd_t *pmd)
18338@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18339
18340 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18341 {
18342+ pax_open_kernel();
18343 *pudp = pud;
18344+ pax_close_kernel();
18345 }
18346
18347 static inline void native_pud_clear(pud_t *pud)
18348@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18349
18350 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18351 {
18352+ pax_open_kernel();
18353+ *pgdp = pgd;
18354+ pax_close_kernel();
18355+}
18356+
18357+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18358+{
18359 *pgdp = pgd;
18360 }
18361
18362diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18363index e6844df..432b56e 100644
18364--- a/arch/x86/include/asm/pgtable_64_types.h
18365+++ b/arch/x86/include/asm/pgtable_64_types.h
18366@@ -60,11 +60,16 @@ typedef struct { pteval_t pte; } pte_t;
18367 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18368 #define MODULES_END _AC(0xffffffffff000000, UL)
18369 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18370+#define MODULES_EXEC_VADDR MODULES_VADDR
18371+#define MODULES_EXEC_END MODULES_END
18372 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18373 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18374 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18375 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18376
18377+#define ktla_ktva(addr) (addr)
18378+#define ktva_ktla(addr) (addr)
18379+
18380 #define EARLY_DYNAMIC_PAGE_TABLES 64
18381
18382 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18383diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18384index 78f0c8c..4424bb0 100644
18385--- a/arch/x86/include/asm/pgtable_types.h
18386+++ b/arch/x86/include/asm/pgtable_types.h
18387@@ -85,8 +85,10 @@
18388
18389 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18390 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18391-#else
18392+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18393 #define _PAGE_NX (_AT(pteval_t, 0))
18394+#else
18395+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18396 #endif
18397
18398 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18399@@ -141,6 +143,9 @@ enum page_cache_mode {
18400 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18401 _PAGE_ACCESSED)
18402
18403+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18404+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18405+
18406 #define __PAGE_KERNEL_EXEC \
18407 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18408 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18409@@ -148,7 +153,7 @@ enum page_cache_mode {
18410 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18411 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18412 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18413-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18414+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18415 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18416 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18417 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18418@@ -194,7 +199,7 @@ enum page_cache_mode {
18419 #ifdef CONFIG_X86_64
18420 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18421 #else
18422-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18423+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18424 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18425 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18426 #endif
18427@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18428 {
18429 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18430 }
18431+#endif
18432
18433+#if CONFIG_PGTABLE_LEVELS == 3
18434+#include <asm-generic/pgtable-nopud.h>
18435+#endif
18436+
18437+#if CONFIG_PGTABLE_LEVELS == 2
18438+#include <asm-generic/pgtable-nopmd.h>
18439+#endif
18440+
18441+#ifndef __ASSEMBLY__
18442 #if CONFIG_PGTABLE_LEVELS > 3
18443 typedef struct { pudval_t pud; } pud_t;
18444
18445@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18446 return pud.pud;
18447 }
18448 #else
18449-#include <asm-generic/pgtable-nopud.h>
18450-
18451 static inline pudval_t native_pud_val(pud_t pud)
18452 {
18453 return native_pgd_val(pud.pgd);
18454@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18455 return pmd.pmd;
18456 }
18457 #else
18458-#include <asm-generic/pgtable-nopmd.h>
18459-
18460 static inline pmdval_t native_pmd_val(pmd_t pmd)
18461 {
18462 return native_pgd_val(pmd.pud.pgd);
18463@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18464
18465 extern pteval_t __supported_pte_mask;
18466 extern void set_nx(void);
18467-extern int nx_enabled;
18468
18469 #define pgprot_writecombine pgprot_writecombine
18470 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18471diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18472index 8f327184..368fb29 100644
18473--- a/arch/x86/include/asm/preempt.h
18474+++ b/arch/x86/include/asm/preempt.h
18475@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18476 */
18477 static __always_inline bool __preempt_count_dec_and_test(void)
18478 {
18479- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18480+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18481 }
18482
18483 /*
18484diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18485index 23ba676..6584489 100644
18486--- a/arch/x86/include/asm/processor.h
18487+++ b/arch/x86/include/asm/processor.h
18488@@ -130,7 +130,7 @@ struct cpuinfo_x86 {
18489 /* Index into per_cpu list: */
18490 u16 cpu_index;
18491 u32 microcode;
18492-};
18493+} __randomize_layout;
18494
18495 #define X86_VENDOR_INTEL 0
18496 #define X86_VENDOR_CYRIX 1
18497@@ -201,9 +201,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18498 : "memory");
18499 }
18500
18501+/* invpcid (%rdx),%rax */
18502+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18503+
18504+#define INVPCID_SINGLE_ADDRESS 0UL
18505+#define INVPCID_SINGLE_CONTEXT 1UL
18506+#define INVPCID_ALL_GLOBAL 2UL
18507+#define INVPCID_ALL_NONGLOBAL 3UL
18508+
18509+#define PCID_KERNEL 0UL
18510+#define PCID_USER 1UL
18511+#define PCID_NOFLUSH (1UL << 63)
18512+
18513 static inline void load_cr3(pgd_t *pgdir)
18514 {
18515- write_cr3(__pa(pgdir));
18516+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18517 }
18518
18519 #ifdef CONFIG_X86_32
18520@@ -300,7 +312,7 @@ struct tss_struct {
18521
18522 } ____cacheline_aligned;
18523
18524-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss);
18525+extern struct tss_struct cpu_tss[NR_CPUS];
18526
18527 #ifdef CONFIG_X86_32
18528 DECLARE_PER_CPU(unsigned long, cpu_current_top_of_stack);
18529@@ -500,6 +512,7 @@ struct thread_struct {
18530 unsigned short ds;
18531 unsigned short fsindex;
18532 unsigned short gsindex;
18533+ unsigned short ss;
18534 #endif
18535 #ifdef CONFIG_X86_32
18536 unsigned long ip;
18537@@ -585,10 +598,10 @@ static inline void native_swapgs(void)
18538 #endif
18539 }
18540
18541-static inline unsigned long current_top_of_stack(void)
18542+static inline unsigned long current_top_of_stack(unsigned int cpu)
18543 {
18544 #ifdef CONFIG_X86_64
18545- return this_cpu_read_stable(cpu_tss.x86_tss.sp0);
18546+ return cpu_tss[cpu].x86_tss.sp0;
18547 #else
18548 /* sp0 on x86_32 is special in and around vm86 mode. */
18549 return this_cpu_read_stable(cpu_current_top_of_stack);
18550@@ -837,8 +850,15 @@ static inline void spin_lock_prefetch(const void *x)
18551 */
18552 #define TASK_SIZE PAGE_OFFSET
18553 #define TASK_SIZE_MAX TASK_SIZE
18554+
18555+#ifdef CONFIG_PAX_SEGMEXEC
18556+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18557+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18558+#else
18559 #define STACK_TOP TASK_SIZE
18560-#define STACK_TOP_MAX STACK_TOP
18561+#endif
18562+
18563+#define STACK_TOP_MAX TASK_SIZE
18564
18565 #define INIT_THREAD { \
18566 .sp0 = TOP_OF_INIT_STACK, \
18567@@ -859,12 +879,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18568 * "struct pt_regs" is possible, but they may contain the
18569 * completely wrong values.
18570 */
18571-#define task_pt_regs(task) \
18572-({ \
18573- unsigned long __ptr = (unsigned long)task_stack_page(task); \
18574- __ptr += THREAD_SIZE - TOP_OF_KERNEL_STACK_PADDING; \
18575- ((struct pt_regs *)__ptr) - 1; \
18576-})
18577+#define task_pt_regs(tsk) ((struct pt_regs *)(tsk)->thread.sp0 - 1)
18578
18579 #define KSTK_ESP(task) (task_pt_regs(task)->sp)
18580
18581@@ -878,13 +893,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18582 * particular problem by preventing anything from being mapped
18583 * at the maximum canonical address.
18584 */
18585-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18586+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18587
18588 /* This decides where the kernel will search for a free chunk of vm
18589 * space during mmap's.
18590 */
18591 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18592- 0xc0000000 : 0xFFFFe000)
18593+ 0xc0000000 : 0xFFFFf000)
18594
18595 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18596 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18597@@ -918,6 +933,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18598 */
18599 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18600
18601+#ifdef CONFIG_PAX_SEGMEXEC
18602+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18603+#endif
18604+
18605 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18606
18607 /* Get/set a process' ability to use the timestamp counter instruction */
18608@@ -962,7 +981,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18609 return 0;
18610 }
18611
18612-extern unsigned long arch_align_stack(unsigned long sp);
18613+#define arch_align_stack(x) ((x) & ~0xfUL)
18614 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18615
18616 void default_idle(void);
18617@@ -972,6 +991,6 @@ bool xen_set_default_idle(void);
18618 #define xen_set_default_idle 0
18619 #endif
18620
18621-void stop_this_cpu(void *dummy);
18622+void stop_this_cpu(void *dummy) __noreturn;
18623 void df_debug(struct pt_regs *regs, long error_code);
18624 #endif /* _ASM_X86_PROCESSOR_H */
18625diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18626index 5fabf13..7388158 100644
18627--- a/arch/x86/include/asm/ptrace.h
18628+++ b/arch/x86/include/asm/ptrace.h
18629@@ -125,15 +125,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18630 #ifdef CONFIG_X86_64
18631 static inline bool user_64bit_mode(struct pt_regs *regs)
18632 {
18633+ unsigned long cs = regs->cs & 0xffff;
18634 #ifndef CONFIG_PARAVIRT
18635 /*
18636 * On non-paravirt systems, this is the only long mode CPL 3
18637 * selector. We do not allow long mode selectors in the LDT.
18638 */
18639- return regs->cs == __USER_CS;
18640+ return cs == __USER_CS;
18641 #else
18642 /* Headers are too twisted for this to go in paravirt.h. */
18643- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18644+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18645 #endif
18646 }
18647
18648@@ -180,9 +181,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18649 * Traps from the kernel do not save sp and ss.
18650 * Use the helper function to retrieve sp.
18651 */
18652- if (offset == offsetof(struct pt_regs, sp) &&
18653- regs->cs == __KERNEL_CS)
18654- return kernel_stack_pointer(regs);
18655+ if (offset == offsetof(struct pt_regs, sp)) {
18656+ unsigned long cs = regs->cs & 0xffff;
18657+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18658+ return kernel_stack_pointer(regs);
18659+ }
18660 #endif
18661 return *(unsigned long *)((unsigned long)regs + offset);
18662 }
18663diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18664index ae0e241..e80b10b 100644
18665--- a/arch/x86/include/asm/qrwlock.h
18666+++ b/arch/x86/include/asm/qrwlock.h
18667@@ -7,8 +7,8 @@
18668 #define queue_write_unlock queue_write_unlock
18669 static inline void queue_write_unlock(struct qrwlock *lock)
18670 {
18671- barrier();
18672- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18673+ barrier();
18674+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18675 }
18676 #endif
18677
18678diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18679index 9c6b890..5305f53 100644
18680--- a/arch/x86/include/asm/realmode.h
18681+++ b/arch/x86/include/asm/realmode.h
18682@@ -22,16 +22,14 @@ struct real_mode_header {
18683 #endif
18684 /* APM/BIOS reboot */
18685 u32 machine_real_restart_asm;
18686-#ifdef CONFIG_X86_64
18687 u32 machine_real_restart_seg;
18688-#endif
18689 };
18690
18691 /* This must match data at trampoline_32/64.S */
18692 struct trampoline_header {
18693 #ifdef CONFIG_X86_32
18694 u32 start;
18695- u16 gdt_pad;
18696+ u16 boot_cs;
18697 u16 gdt_limit;
18698 u32 gdt_base;
18699 #else
18700diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18701index a82c4f1..ac45053 100644
18702--- a/arch/x86/include/asm/reboot.h
18703+++ b/arch/x86/include/asm/reboot.h
18704@@ -6,13 +6,13 @@
18705 struct pt_regs;
18706
18707 struct machine_ops {
18708- void (*restart)(char *cmd);
18709- void (*halt)(void);
18710- void (*power_off)(void);
18711+ void (* __noreturn restart)(char *cmd);
18712+ void (* __noreturn halt)(void);
18713+ void (* __noreturn power_off)(void);
18714 void (*shutdown)(void);
18715 void (*crash_shutdown)(struct pt_regs *);
18716- void (*emergency_restart)(void);
18717-};
18718+ void (* __noreturn emergency_restart)(void);
18719+} __no_const;
18720
18721 extern struct machine_ops machine_ops;
18722
18723diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18724index 8f7866a..e442f20 100644
18725--- a/arch/x86/include/asm/rmwcc.h
18726+++ b/arch/x86/include/asm/rmwcc.h
18727@@ -3,7 +3,34 @@
18728
18729 #ifdef CC_HAVE_ASM_GOTO
18730
18731-#define __GEN_RMWcc(fullop, var, cc, ...) \
18732+#ifdef CONFIG_PAX_REFCOUNT
18733+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18734+do { \
18735+ asm_volatile_goto (fullop \
18736+ ";jno 0f\n" \
18737+ fullantiop \
18738+ ";int $4\n0:\n" \
18739+ _ASM_EXTABLE(0b, 0b) \
18740+ ";j" cc " %l[cc_label]" \
18741+ : : "m" (var), ## __VA_ARGS__ \
18742+ : "memory" : cc_label); \
18743+ return 0; \
18744+cc_label: \
18745+ return 1; \
18746+} while (0)
18747+#else
18748+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18749+do { \
18750+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18751+ : : "m" (var), ## __VA_ARGS__ \
18752+ : "memory" : cc_label); \
18753+ return 0; \
18754+cc_label: \
18755+ return 1; \
18756+} while (0)
18757+#endif
18758+
18759+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18760 do { \
18761 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18762 : : "m" (var), ## __VA_ARGS__ \
18763@@ -13,15 +40,46 @@ cc_label: \
18764 return 1; \
18765 } while (0)
18766
18767-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18768- __GEN_RMWcc(op " " arg0, var, cc)
18769+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18770+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18771
18772-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18773- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18774+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18775+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18776+
18777+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18778+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18779+
18780+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18781+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18782
18783 #else /* !CC_HAVE_ASM_GOTO */
18784
18785-#define __GEN_RMWcc(fullop, var, cc, ...) \
18786+#ifdef CONFIG_PAX_REFCOUNT
18787+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18788+do { \
18789+ char c; \
18790+ asm volatile (fullop \
18791+ ";jno 0f\n" \
18792+ fullantiop \
18793+ ";int $4\n0:\n" \
18794+ _ASM_EXTABLE(0b, 0b) \
18795+ "; set" cc " %1" \
18796+ : "+m" (var), "=qm" (c) \
18797+ : __VA_ARGS__ : "memory"); \
18798+ return c != 0; \
18799+} while (0)
18800+#else
18801+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18802+do { \
18803+ char c; \
18804+ asm volatile (fullop "; set" cc " %1" \
18805+ : "+m" (var), "=qm" (c) \
18806+ : __VA_ARGS__ : "memory"); \
18807+ return c != 0; \
18808+} while (0)
18809+#endif
18810+
18811+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18812 do { \
18813 char c; \
18814 asm volatile (fullop "; set" cc " %1" \
18815@@ -30,11 +88,17 @@ do { \
18816 return c != 0; \
18817 } while (0)
18818
18819-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18820- __GEN_RMWcc(op " " arg0, var, cc)
18821+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18822+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18823+
18824+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18825+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18826+
18827+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18828+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18829
18830-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18831- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18832+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18833+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18834
18835 #endif /* CC_HAVE_ASM_GOTO */
18836
18837diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18838index cad82c9..2e5c5c1 100644
18839--- a/arch/x86/include/asm/rwsem.h
18840+++ b/arch/x86/include/asm/rwsem.h
18841@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18842 {
18843 asm volatile("# beginning down_read\n\t"
18844 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18845+
18846+#ifdef CONFIG_PAX_REFCOUNT
18847+ "jno 0f\n"
18848+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18849+ "int $4\n0:\n"
18850+ _ASM_EXTABLE(0b, 0b)
18851+#endif
18852+
18853 /* adds 0x00000001 */
18854 " jns 1f\n"
18855 " call call_rwsem_down_read_failed\n"
18856@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18857 "1:\n\t"
18858 " mov %1,%2\n\t"
18859 " add %3,%2\n\t"
18860+
18861+#ifdef CONFIG_PAX_REFCOUNT
18862+ "jno 0f\n"
18863+ "sub %3,%2\n"
18864+ "int $4\n0:\n"
18865+ _ASM_EXTABLE(0b, 0b)
18866+#endif
18867+
18868 " jle 2f\n\t"
18869 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18870 " jnz 1b\n\t"
18871@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18872 long tmp;
18873 asm volatile("# beginning down_write\n\t"
18874 LOCK_PREFIX " xadd %1,(%2)\n\t"
18875+
18876+#ifdef CONFIG_PAX_REFCOUNT
18877+ "jno 0f\n"
18878+ "mov %1,(%2)\n"
18879+ "int $4\n0:\n"
18880+ _ASM_EXTABLE(0b, 0b)
18881+#endif
18882+
18883 /* adds 0xffff0001, returns the old value */
18884 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18885 /* was the active mask 0 before? */
18886@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18887 long tmp;
18888 asm volatile("# beginning __up_read\n\t"
18889 LOCK_PREFIX " xadd %1,(%2)\n\t"
18890+
18891+#ifdef CONFIG_PAX_REFCOUNT
18892+ "jno 0f\n"
18893+ "mov %1,(%2)\n"
18894+ "int $4\n0:\n"
18895+ _ASM_EXTABLE(0b, 0b)
18896+#endif
18897+
18898 /* subtracts 1, returns the old value */
18899 " jns 1f\n\t"
18900 " call call_rwsem_wake\n" /* expects old value in %edx */
18901@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18902 long tmp;
18903 asm volatile("# beginning __up_write\n\t"
18904 LOCK_PREFIX " xadd %1,(%2)\n\t"
18905+
18906+#ifdef CONFIG_PAX_REFCOUNT
18907+ "jno 0f\n"
18908+ "mov %1,(%2)\n"
18909+ "int $4\n0:\n"
18910+ _ASM_EXTABLE(0b, 0b)
18911+#endif
18912+
18913 /* subtracts 0xffff0001, returns the old value */
18914 " jns 1f\n\t"
18915 " call call_rwsem_wake\n" /* expects old value in %edx */
18916@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18917 {
18918 asm volatile("# beginning __downgrade_write\n\t"
18919 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18920+
18921+#ifdef CONFIG_PAX_REFCOUNT
18922+ "jno 0f\n"
18923+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18924+ "int $4\n0:\n"
18925+ _ASM_EXTABLE(0b, 0b)
18926+#endif
18927+
18928 /*
18929 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18930 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18931@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18932 */
18933 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18934 {
18935- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18936+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18937+
18938+#ifdef CONFIG_PAX_REFCOUNT
18939+ "jno 0f\n"
18940+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18941+ "int $4\n0:\n"
18942+ _ASM_EXTABLE(0b, 0b)
18943+#endif
18944+
18945 : "+m" (sem->count)
18946 : "er" (delta));
18947 }
18948@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18949 */
18950 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18951 {
18952- return delta + xadd(&sem->count, delta);
18953+ return delta + xadd_check_overflow(&sem->count, delta);
18954 }
18955
18956 #endif /* __KERNEL__ */
18957diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18958index 7d5a192..23ef1aa 100644
18959--- a/arch/x86/include/asm/segment.h
18960+++ b/arch/x86/include/asm/segment.h
18961@@ -82,14 +82,20 @@
18962 * 26 - ESPFIX small SS
18963 * 27 - per-cpu [ offset to per-cpu data area ]
18964 * 28 - stack_canary-20 [ for stack protector ] <=== cacheline #8
18965- * 29 - unused
18966- * 30 - unused
18967+ * 29 - PCI BIOS CS
18968+ * 30 - PCI BIOS DS
18969 * 31 - TSS for double fault handler
18970 */
18971+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
18972+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
18973+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
18974+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
18975+
18976 #define GDT_ENTRY_TLS_MIN 6
18977 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
18978
18979 #define GDT_ENTRY_KERNEL_CS 12
18980+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 4
18981 #define GDT_ENTRY_KERNEL_DS 13
18982 #define GDT_ENTRY_DEFAULT_USER_CS 14
18983 #define GDT_ENTRY_DEFAULT_USER_DS 15
18984@@ -106,6 +112,12 @@
18985 #define GDT_ENTRY_PERCPU 27
18986 #define GDT_ENTRY_STACK_CANARY 28
18987
18988+#define GDT_ENTRY_PCIBIOS_CS 29
18989+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
18990+
18991+#define GDT_ENTRY_PCIBIOS_DS 30
18992+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
18993+
18994 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
18995
18996 /*
18997@@ -118,6 +130,7 @@
18998 */
18999
19000 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19001+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19002 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19003 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)
19004 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8 + 3)
19005@@ -129,7 +142,7 @@
19006 #define PNP_CS16 (GDT_ENTRY_PNPBIOS_CS16*8)
19007
19008 /* "Is this PNP code selector (PNP_CS32 or PNP_CS16)?" */
19009-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == PNP_CS32)
19010+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19011
19012 /* data segment for BIOS: */
19013 #define PNP_DS (GDT_ENTRY_PNPBIOS_DS*8)
19014@@ -176,6 +189,8 @@
19015 #define GDT_ENTRY_DEFAULT_USER_DS 5
19016 #define GDT_ENTRY_DEFAULT_USER_CS 6
19017
19018+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19019+
19020 /* Needs two entries */
19021 #define GDT_ENTRY_TSS 8
19022 /* Needs two entries */
19023@@ -187,10 +202,12 @@
19024 /* Abused to load per CPU data from limit */
19025 #define GDT_ENTRY_PER_CPU 15
19026
19027+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19028+
19029 /*
19030 * Number of entries in the GDT table:
19031 */
19032-#define GDT_ENTRIES 16
19033+#define GDT_ENTRIES 17
19034
19035 /*
19036 * Segment selector values corresponding to the above entries:
19037@@ -200,7 +217,9 @@
19038 */
19039 #define __KERNEL32_CS (GDT_ENTRY_KERNEL32_CS*8)
19040 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19041+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19042 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19043+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19044 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8 + 3)
19045 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)
19046 #define __USER32_DS __USER_DS
19047diff --git a/arch/x86/include/asm/sigcontext.h b/arch/x86/include/asm/sigcontext.h
19048index 6fe6b18..9dfce4e 100644
19049--- a/arch/x86/include/asm/sigcontext.h
19050+++ b/arch/x86/include/asm/sigcontext.h
19051@@ -57,9 +57,9 @@ struct sigcontext {
19052 unsigned long ip;
19053 unsigned long flags;
19054 unsigned short cs;
19055- unsigned short __pad2; /* Was called gs, but was always zero. */
19056- unsigned short __pad1; /* Was called fs, but was always zero. */
19057- unsigned short ss;
19058+ unsigned short gs;
19059+ unsigned short fs;
19060+ unsigned short __pad0;
19061 unsigned long err;
19062 unsigned long trapno;
19063 unsigned long oldmask;
19064diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19065index ba665eb..0f72938 100644
19066--- a/arch/x86/include/asm/smap.h
19067+++ b/arch/x86/include/asm/smap.h
19068@@ -25,6 +25,18 @@
19069
19070 #include <asm/alternative-asm.h>
19071
19072+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19073+#define ASM_PAX_OPEN_USERLAND \
19074+ ALTERNATIVE "", "call __pax_open_userland", X86_FEATURE_STRONGUDEREF
19075+
19076+#define ASM_PAX_CLOSE_USERLAND \
19077+ ALTERNATIVE "", "call __pax_close_userland", X86_FEATURE_STRONGUDEREF
19078+
19079+#else
19080+#define ASM_PAX_OPEN_USERLAND
19081+#define ASM_PAX_CLOSE_USERLAND
19082+#endif
19083+
19084 #ifdef CONFIG_X86_SMAP
19085
19086 #define ASM_CLAC \
19087@@ -44,6 +56,37 @@
19088
19089 #include <asm/alternative.h>
19090
19091+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19092+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19093+
19094+extern void __pax_open_userland(void);
19095+static __always_inline unsigned long pax_open_userland(void)
19096+{
19097+
19098+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19099+ asm volatile(ALTERNATIVE("", "call %P[open]", X86_FEATURE_STRONGUDEREF)
19100+ :
19101+ : [open] "i" (__pax_open_userland)
19102+ : "memory", "rax");
19103+#endif
19104+
19105+ return 0;
19106+}
19107+
19108+extern void __pax_close_userland(void);
19109+static __always_inline unsigned long pax_close_userland(void)
19110+{
19111+
19112+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19113+ asm volatile(ALTERNATIVE("", "call %P[close]", X86_FEATURE_STRONGUDEREF)
19114+ :
19115+ : [close] "i" (__pax_close_userland)
19116+ : "memory", "rax");
19117+#endif
19118+
19119+ return 0;
19120+}
19121+
19122 #ifdef CONFIG_X86_SMAP
19123
19124 static __always_inline void clac(void)
19125diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19126index 17a8dce..79f7280 100644
19127--- a/arch/x86/include/asm/smp.h
19128+++ b/arch/x86/include/asm/smp.h
19129@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19130 /* cpus sharing the last level cache: */
19131 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19132 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19133-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19134+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19135
19136 static inline struct cpumask *cpu_sibling_mask(int cpu)
19137 {
19138@@ -78,7 +78,7 @@ struct smp_ops {
19139
19140 void (*send_call_func_ipi)(const struct cpumask *mask);
19141 void (*send_call_func_single_ipi)(int cpu);
19142-};
19143+} __no_const;
19144
19145 /* Globals due to paravirt */
19146 extern void set_cpu_sibling_map(int cpu);
19147@@ -192,14 +192,8 @@ extern unsigned disabled_cpus;
19148 extern int safe_smp_processor_id(void);
19149
19150 #elif defined(CONFIG_X86_64_SMP)
19151-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19152-
19153-#define stack_smp_processor_id() \
19154-({ \
19155- struct thread_info *ti; \
19156- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19157- ti->cpu; \
19158-})
19159+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19160+#define stack_smp_processor_id() raw_smp_processor_id()
19161 #define safe_smp_processor_id() smp_processor_id()
19162
19163 #endif
19164diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19165index 6a99859..03cb807 100644
19166--- a/arch/x86/include/asm/stackprotector.h
19167+++ b/arch/x86/include/asm/stackprotector.h
19168@@ -47,7 +47,7 @@
19169 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19170 */
19171 #define GDT_STACK_CANARY_INIT \
19172- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19173+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19174
19175 /*
19176 * Initialize the stackprotector canary value.
19177@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19178
19179 static inline void load_stack_canary_segment(void)
19180 {
19181-#ifdef CONFIG_X86_32
19182+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19183 asm volatile ("mov %0, %%gs" : : "r" (0));
19184 #endif
19185 }
19186diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19187index 70bbe39..4ae2bd4 100644
19188--- a/arch/x86/include/asm/stacktrace.h
19189+++ b/arch/x86/include/asm/stacktrace.h
19190@@ -11,28 +11,20 @@
19191
19192 extern int kstack_depth_to_print;
19193
19194-struct thread_info;
19195+struct task_struct;
19196 struct stacktrace_ops;
19197
19198-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19199- unsigned long *stack,
19200- unsigned long bp,
19201- const struct stacktrace_ops *ops,
19202- void *data,
19203- unsigned long *end,
19204- int *graph);
19205+typedef unsigned long walk_stack_t(struct task_struct *task,
19206+ void *stack_start,
19207+ unsigned long *stack,
19208+ unsigned long bp,
19209+ const struct stacktrace_ops *ops,
19210+ void *data,
19211+ unsigned long *end,
19212+ int *graph);
19213
19214-extern unsigned long
19215-print_context_stack(struct thread_info *tinfo,
19216- unsigned long *stack, unsigned long bp,
19217- const struct stacktrace_ops *ops, void *data,
19218- unsigned long *end, int *graph);
19219-
19220-extern unsigned long
19221-print_context_stack_bp(struct thread_info *tinfo,
19222- unsigned long *stack, unsigned long bp,
19223- const struct stacktrace_ops *ops, void *data,
19224- unsigned long *end, int *graph);
19225+extern walk_stack_t print_context_stack;
19226+extern walk_stack_t print_context_stack_bp;
19227
19228 /* Generic stack tracer with callbacks */
19229
19230@@ -40,7 +32,7 @@ struct stacktrace_ops {
19231 void (*address)(void *data, unsigned long address, int reliable);
19232 /* On negative return stop dumping */
19233 int (*stack)(void *data, char *name);
19234- walk_stack_t walk_stack;
19235+ walk_stack_t *walk_stack;
19236 };
19237
19238 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19239diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19240index 751bf4b..3cc39f1 100644
19241--- a/arch/x86/include/asm/switch_to.h
19242+++ b/arch/x86/include/asm/switch_to.h
19243@@ -79,12 +79,12 @@ do { \
19244 #else /* CONFIG_X86_32 */
19245
19246 /* frame pointer must be last for get_wchan */
19247-#define SAVE_CONTEXT "pushq %%rbp ; movq %%rsi,%%rbp\n\t"
19248-#define RESTORE_CONTEXT "movq %%rbp,%%rsi ; popq %%rbp\t"
19249+#define SAVE_CONTEXT "pushf ; pushq %%rbp ; movq %%rsi,%%rbp\n\t"
19250+#define RESTORE_CONTEXT "movq %%rbp,%%rsi ; popq %%rbp ; popf\t"
19251
19252 #define __EXTRA_CLOBBER \
19253 , "rcx", "rbx", "rdx", "r8", "r9", "r10", "r11", \
19254- "r12", "r13", "r14", "r15", "flags"
19255+ "r12", "r13", "r14", "r15"
19256
19257 #ifdef CONFIG_CC_STACKPROTECTOR
19258 #define __switch_canary \
19259@@ -100,11 +100,7 @@ do { \
19260 #define __switch_canary_iparam
19261 #endif /* CC_STACKPROTECTOR */
19262
19263-/*
19264- * There is no need to save or restore flags, because flags are always
19265- * clean in kernel mode, with the possible exception of IOPL. Kernel IOPL
19266- * has no effect.
19267- */
19268+/* Save restore flags to clear handle leaking NT */
19269 #define switch_to(prev, next, last) \
19270 asm volatile(SAVE_CONTEXT \
19271 "movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */ \
19272@@ -112,7 +108,7 @@ do { \
19273 "call __switch_to\n\t" \
19274 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19275 __switch_canary \
19276- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19277+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19278 "movq %%rax,%%rdi\n\t" \
19279 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19280 "jnz ret_from_fork\n\t" \
19281@@ -123,7 +119,7 @@ do { \
19282 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19283 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19284 [_tif_fork] "i" (_TIF_FORK), \
19285- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19286+ [thread_info] "m" (current_tinfo), \
19287 [current_task] "m" (current_task) \
19288 __switch_canary_iparam \
19289 : "memory", "cc" __EXTRA_CLOBBER)
19290diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19291index b4bdec3..e8af9bc 100644
19292--- a/arch/x86/include/asm/thread_info.h
19293+++ b/arch/x86/include/asm/thread_info.h
19294@@ -36,7 +36,7 @@
19295 #ifdef CONFIG_X86_32
19296 # define TOP_OF_KERNEL_STACK_PADDING 8
19297 #else
19298-# define TOP_OF_KERNEL_STACK_PADDING 0
19299+# define TOP_OF_KERNEL_STACK_PADDING 16
19300 #endif
19301
19302 /*
19303@@ -50,27 +50,26 @@ struct task_struct;
19304 #include <linux/atomic.h>
19305
19306 struct thread_info {
19307- struct task_struct *task; /* main task structure */
19308 __u32 flags; /* low level flags */
19309 __u32 status; /* thread synchronous flags */
19310 __u32 cpu; /* current CPU */
19311 int saved_preempt_count;
19312 mm_segment_t addr_limit;
19313 void __user *sysenter_return;
19314+ unsigned long lowest_stack;
19315 unsigned int sig_on_uaccess_error:1;
19316 unsigned int uaccess_err:1; /* uaccess failed */
19317 };
19318
19319-#define INIT_THREAD_INFO(tsk) \
19320+#define INIT_THREAD_INFO \
19321 { \
19322- .task = &tsk, \
19323 .flags = 0, \
19324 .cpu = 0, \
19325 .saved_preempt_count = INIT_PREEMPT_COUNT, \
19326 .addr_limit = KERNEL_DS, \
19327 }
19328
19329-#define init_thread_info (init_thread_union.thread_info)
19330+#define init_thread_info (init_thread_union.stack)
19331 #define init_stack (init_thread_union.stack)
19332
19333 #else /* !__ASSEMBLY__ */
19334@@ -110,6 +109,7 @@ struct thread_info {
19335 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19336 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19337 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19338+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19339
19340 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19341 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19342@@ -133,17 +133,18 @@ struct thread_info {
19343 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19344 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19345 #define _TIF_X32 (1 << TIF_X32)
19346+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19347
19348 /* work to do in syscall_trace_enter() */
19349 #define _TIF_WORK_SYSCALL_ENTRY \
19350 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19351 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19352- _TIF_NOHZ)
19353+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19354
19355 /* work to do in syscall_trace_leave() */
19356 #define _TIF_WORK_SYSCALL_EXIT \
19357 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19358- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19359+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19360
19361 /* work to do on interrupt/exception return */
19362 #define _TIF_WORK_MASK \
19363@@ -154,7 +155,7 @@ struct thread_info {
19364 /* work to do on any return to user space */
19365 #define _TIF_ALLWORK_MASK \
19366 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19367- _TIF_NOHZ)
19368+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19369
19370 /* Only used for 64 bit */
19371 #define _TIF_DO_NOTIFY_MASK \
19372@@ -179,9 +180,11 @@ struct thread_info {
19373
19374 DECLARE_PER_CPU(unsigned long, kernel_stack);
19375
19376+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19377+
19378 static inline struct thread_info *current_thread_info(void)
19379 {
19380- return (struct thread_info *)(current_top_of_stack() - THREAD_SIZE);
19381+ return this_cpu_read_stable(current_tinfo);
19382 }
19383
19384 static inline unsigned long current_stack_pointer(void)
19385@@ -199,8 +202,7 @@ static inline unsigned long current_stack_pointer(void)
19386
19387 /* Load thread_info address into "reg" */
19388 #define GET_THREAD_INFO(reg) \
19389- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19390- _ASM_SUB $(THREAD_SIZE),reg ;
19391+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19392
19393 /*
19394 * ASM operand which evaluates to a 'thread_info' address of
19395@@ -293,5 +295,12 @@ static inline bool is_ia32_task(void)
19396 extern void arch_task_cache_init(void);
19397 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19398 extern void arch_release_task_struct(struct task_struct *tsk);
19399+
19400+#define __HAVE_THREAD_FUNCTIONS
19401+#define task_thread_info(task) (&(task)->tinfo)
19402+#define task_stack_page(task) ((task)->stack)
19403+#define setup_thread_stack(p, org) do {} while (0)
19404+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19405+
19406 #endif
19407 #endif /* _ASM_X86_THREAD_INFO_H */
19408diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19409index cd79194..6a9956f 100644
19410--- a/arch/x86/include/asm/tlbflush.h
19411+++ b/arch/x86/include/asm/tlbflush.h
19412@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19413
19414 static inline void __native_flush_tlb(void)
19415 {
19416+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19417+ u64 descriptor[2];
19418+
19419+ descriptor[0] = PCID_KERNEL;
19420+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19421+ return;
19422+ }
19423+
19424+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19425+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19426+ unsigned int cpu = raw_get_cpu();
19427+
19428+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19429+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19430+ raw_put_cpu_no_resched();
19431+ return;
19432+ }
19433+#endif
19434+
19435 native_write_cr3(native_read_cr3());
19436 }
19437
19438 static inline void __native_flush_tlb_global_irq_disabled(void)
19439 {
19440- unsigned long cr4;
19441+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19442+ u64 descriptor[2];
19443
19444- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19445- /* clear PGE */
19446- native_write_cr4(cr4 & ~X86_CR4_PGE);
19447- /* write old PGE again and flush TLBs */
19448- native_write_cr4(cr4);
19449+ descriptor[0] = PCID_KERNEL;
19450+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19451+ } else {
19452+ unsigned long cr4;
19453+
19454+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19455+ /* clear PGE */
19456+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19457+ /* write old PGE again and flush TLBs */
19458+ native_write_cr4(cr4);
19459+ }
19460 }
19461
19462 static inline void __native_flush_tlb_global(void)
19463@@ -118,6 +144,43 @@ static inline void __native_flush_tlb_global(void)
19464
19465 static inline void __native_flush_tlb_single(unsigned long addr)
19466 {
19467+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19468+ u64 descriptor[2];
19469+
19470+ descriptor[0] = PCID_KERNEL;
19471+ descriptor[1] = addr;
19472+
19473+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19474+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19475+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19476+ if (addr < TASK_SIZE_MAX)
19477+ descriptor[1] += pax_user_shadow_base;
19478+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19479+ }
19480+
19481+ descriptor[0] = PCID_USER;
19482+ descriptor[1] = addr;
19483+ }
19484+#endif
19485+
19486+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19487+ return;
19488+ }
19489+
19490+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19491+ if (static_cpu_has(X86_FEATURE_PCIDUDEREF)) {
19492+ unsigned int cpu = raw_get_cpu();
19493+
19494+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19495+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19496+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19497+ raw_put_cpu_no_resched();
19498+
19499+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19500+ addr += pax_user_shadow_base;
19501+ }
19502+#endif
19503+
19504 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19505 }
19506
19507diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19508index ace9dec..3f9e253 100644
19509--- a/arch/x86/include/asm/uaccess.h
19510+++ b/arch/x86/include/asm/uaccess.h
19511@@ -7,6 +7,7 @@
19512 #include <linux/compiler.h>
19513 #include <linux/thread_info.h>
19514 #include <linux/string.h>
19515+#include <linux/spinlock.h>
19516 #include <asm/asm.h>
19517 #include <asm/page.h>
19518 #include <asm/smap.h>
19519@@ -29,7 +30,12 @@
19520
19521 #define get_ds() (KERNEL_DS)
19522 #define get_fs() (current_thread_info()->addr_limit)
19523+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19524+void __set_fs(mm_segment_t x);
19525+void set_fs(mm_segment_t x);
19526+#else
19527 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19528+#endif
19529
19530 #define segment_eq(a, b) ((a).seg == (b).seg)
19531
19532@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19533 * checks that the pointer is in the user space range - after calling
19534 * this function, memory access functions may still return -EFAULT.
19535 */
19536-#define access_ok(type, addr, size) \
19537- likely(!__range_not_ok(addr, size, user_addr_max()))
19538+extern int _cond_resched(void);
19539+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19540+#define access_ok(type, addr, size) \
19541+({ \
19542+ unsigned long __size = size; \
19543+ unsigned long __addr = (unsigned long)addr; \
19544+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19545+ if (__ret_ao && __size) { \
19546+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19547+ unsigned long __end_ao = __addr + __size - 1; \
19548+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19549+ while (__addr_ao <= __end_ao) { \
19550+ char __c_ao; \
19551+ __addr_ao += PAGE_SIZE; \
19552+ if (__size > PAGE_SIZE) \
19553+ _cond_resched(); \
19554+ if (__get_user(__c_ao, (char __user *)__addr)) \
19555+ break; \
19556+ if (type != VERIFY_WRITE) { \
19557+ __addr = __addr_ao; \
19558+ continue; \
19559+ } \
19560+ if (__put_user(__c_ao, (char __user *)__addr)) \
19561+ break; \
19562+ __addr = __addr_ao; \
19563+ } \
19564+ } \
19565+ } \
19566+ __ret_ao; \
19567+})
19568
19569 /*
19570 * The exception table consists of pairs of addresses relative to the
19571@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19572 extern int __get_user_bad(void);
19573
19574 /*
19575- * This is a type: either unsigned long, if the argument fits into
19576- * that type, or otherwise unsigned long long.
19577+ * This is a type: either (un)signed int, if the argument fits into
19578+ * that type, or otherwise (un)signed long long.
19579 */
19580 #define __inttype(x) \
19581-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19582+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19583+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19584+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19585
19586 /**
19587 * get_user: - Get a simple variable from user space.
19588@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19589 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19590 __chk_user_ptr(ptr); \
19591 might_fault(); \
19592+ pax_open_userland(); \
19593 asm volatile("call __get_user_%P3" \
19594 : "=a" (__ret_gu), "=r" (__val_gu) \
19595 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19596 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19597+ pax_close_userland(); \
19598 __ret_gu; \
19599 })
19600
19601@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19602 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19603 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19604
19605-
19606+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19607+#define __copyuser_seg "gs;"
19608+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19609+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19610+#else
19611+#define __copyuser_seg
19612+#define __COPYUSER_SET_ES
19613+#define __COPYUSER_RESTORE_ES
19614+#endif
19615
19616 #ifdef CONFIG_X86_32
19617 #define __put_user_asm_u64(x, addr, err, errret) \
19618 asm volatile(ASM_STAC "\n" \
19619- "1: movl %%eax,0(%2)\n" \
19620- "2: movl %%edx,4(%2)\n" \
19621+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19622+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19623 "3: " ASM_CLAC "\n" \
19624 ".section .fixup,\"ax\"\n" \
19625 "4: movl %3,%0\n" \
19626@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19627
19628 #define __put_user_asm_ex_u64(x, addr) \
19629 asm volatile(ASM_STAC "\n" \
19630- "1: movl %%eax,0(%1)\n" \
19631- "2: movl %%edx,4(%1)\n" \
19632+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19633+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19634 "3: " ASM_CLAC "\n" \
19635 _ASM_EXTABLE_EX(1b, 2b) \
19636 _ASM_EXTABLE_EX(2b, 3b) \
19637@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19638 __typeof__(*(ptr)) __pu_val; \
19639 __chk_user_ptr(ptr); \
19640 might_fault(); \
19641- __pu_val = x; \
19642+ __pu_val = (x); \
19643+ pax_open_userland(); \
19644 switch (sizeof(*(ptr))) { \
19645 case 1: \
19646 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19647@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19648 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19649 break; \
19650 } \
19651+ pax_close_userland(); \
19652 __ret_pu; \
19653 })
19654
19655@@ -355,8 +403,10 @@ do { \
19656 } while (0)
19657
19658 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19659+do { \
19660+ pax_open_userland(); \
19661 asm volatile(ASM_STAC "\n" \
19662- "1: mov"itype" %2,%"rtype"1\n" \
19663+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19664 "2: " ASM_CLAC "\n" \
19665 ".section .fixup,\"ax\"\n" \
19666 "3: mov %3,%0\n" \
19667@@ -364,8 +414,10 @@ do { \
19668 " jmp 2b\n" \
19669 ".previous\n" \
19670 _ASM_EXTABLE(1b, 3b) \
19671- : "=r" (err), ltype(x) \
19672- : "m" (__m(addr)), "i" (errret), "0" (err))
19673+ : "=r" (err), ltype (x) \
19674+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19675+ pax_close_userland(); \
19676+} while (0)
19677
19678 #define __get_user_size_ex(x, ptr, size) \
19679 do { \
19680@@ -389,7 +441,7 @@ do { \
19681 } while (0)
19682
19683 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19684- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19685+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19686 "2:\n" \
19687 _ASM_EXTABLE_EX(1b, 2b) \
19688 : ltype(x) : "m" (__m(addr)))
19689@@ -406,13 +458,24 @@ do { \
19690 int __gu_err; \
19691 unsigned long __gu_val; \
19692 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19693- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19694+ (x) = (__typeof__(*(ptr)))__gu_val; \
19695 __gu_err; \
19696 })
19697
19698 /* FIXME: this hack is definitely wrong -AK */
19699 struct __large_struct { unsigned long buf[100]; };
19700-#define __m(x) (*(struct __large_struct __user *)(x))
19701+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19702+#define ____m(x) \
19703+({ \
19704+ unsigned long ____x = (unsigned long)(x); \
19705+ if (____x < pax_user_shadow_base) \
19706+ ____x += pax_user_shadow_base; \
19707+ (typeof(x))____x; \
19708+})
19709+#else
19710+#define ____m(x) (x)
19711+#endif
19712+#define __m(x) (*(struct __large_struct __user *)____m(x))
19713
19714 /*
19715 * Tell gcc we read from memory instead of writing: this is because
19716@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19717 * aliasing issues.
19718 */
19719 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19720+do { \
19721+ pax_open_userland(); \
19722 asm volatile(ASM_STAC "\n" \
19723- "1: mov"itype" %"rtype"1,%2\n" \
19724+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19725 "2: " ASM_CLAC "\n" \
19726 ".section .fixup,\"ax\"\n" \
19727 "3: mov %3,%0\n" \
19728@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19729 ".previous\n" \
19730 _ASM_EXTABLE(1b, 3b) \
19731 : "=r"(err) \
19732- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19733+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19734+ pax_close_userland(); \
19735+} while (0)
19736
19737 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19738- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19739+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19740 "2:\n" \
19741 _ASM_EXTABLE_EX(1b, 2b) \
19742 : : ltype(x), "m" (__m(addr)))
19743@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19744 */
19745 #define uaccess_try do { \
19746 current_thread_info()->uaccess_err = 0; \
19747+ pax_open_userland(); \
19748 stac(); \
19749 barrier();
19750
19751 #define uaccess_catch(err) \
19752 clac(); \
19753+ pax_close_userland(); \
19754 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19755 } while (0)
19756
19757@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19758 * On error, the variable @x is set to zero.
19759 */
19760
19761+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19762+#define __get_user(x, ptr) get_user((x), (ptr))
19763+#else
19764 #define __get_user(x, ptr) \
19765 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19766+#endif
19767
19768 /**
19769 * __put_user: - Write a simple value into user space, with less checking.
19770@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19771 * Returns zero on success, or -EFAULT on error.
19772 */
19773
19774+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19775+#define __put_user(x, ptr) put_user((x), (ptr))
19776+#else
19777 #define __put_user(x, ptr) \
19778 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19779+#endif
19780
19781 #define __get_user_unaligned __get_user
19782 #define __put_user_unaligned __put_user
19783@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19784 #define get_user_ex(x, ptr) do { \
19785 unsigned long __gue_val; \
19786 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19787- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19788+ (x) = (__typeof__(*(ptr)))__gue_val; \
19789 } while (0)
19790
19791 #define put_user_try uaccess_try
19792@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19793 extern __must_check long strnlen_user(const char __user *str, long n);
19794
19795 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19796-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19797+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19798
19799 extern void __cmpxchg_wrong_size(void)
19800 __compiletime_error("Bad argument size for cmpxchg");
19801@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19802 __typeof__(ptr) __uval = (uval); \
19803 __typeof__(*(ptr)) __old = (old); \
19804 __typeof__(*(ptr)) __new = (new); \
19805+ pax_open_userland(); \
19806 switch (size) { \
19807 case 1: \
19808 { \
19809 asm volatile("\t" ASM_STAC "\n" \
19810- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19811+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19812 "2:\t" ASM_CLAC "\n" \
19813 "\t.section .fixup, \"ax\"\n" \
19814 "3:\tmov %3, %0\n" \
19815 "\tjmp 2b\n" \
19816 "\t.previous\n" \
19817 _ASM_EXTABLE(1b, 3b) \
19818- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19819+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19820 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19821 : "memory" \
19822 ); \
19823@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19824 case 2: \
19825 { \
19826 asm volatile("\t" ASM_STAC "\n" \
19827- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19828+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19829 "2:\t" ASM_CLAC "\n" \
19830 "\t.section .fixup, \"ax\"\n" \
19831 "3:\tmov %3, %0\n" \
19832 "\tjmp 2b\n" \
19833 "\t.previous\n" \
19834 _ASM_EXTABLE(1b, 3b) \
19835- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19836+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19837 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19838 : "memory" \
19839 ); \
19840@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19841 case 4: \
19842 { \
19843 asm volatile("\t" ASM_STAC "\n" \
19844- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19845+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19846 "2:\t" ASM_CLAC "\n" \
19847 "\t.section .fixup, \"ax\"\n" \
19848 "3:\tmov %3, %0\n" \
19849 "\tjmp 2b\n" \
19850 "\t.previous\n" \
19851 _ASM_EXTABLE(1b, 3b) \
19852- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19853+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19854 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19855 : "memory" \
19856 ); \
19857@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19858 __cmpxchg_wrong_size(); \
19859 \
19860 asm volatile("\t" ASM_STAC "\n" \
19861- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19862+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19863 "2:\t" ASM_CLAC "\n" \
19864 "\t.section .fixup, \"ax\"\n" \
19865 "3:\tmov %3, %0\n" \
19866 "\tjmp 2b\n" \
19867 "\t.previous\n" \
19868 _ASM_EXTABLE(1b, 3b) \
19869- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19870+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19871 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19872 : "memory" \
19873 ); \
19874@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19875 default: \
19876 __cmpxchg_wrong_size(); \
19877 } \
19878+ pax_close_userland(); \
19879 *__uval = __old; \
19880 __ret; \
19881 })
19882@@ -636,17 +715,6 @@ extern struct movsl_mask {
19883
19884 #define ARCH_HAS_NOCACHE_UACCESS 1
19885
19886-#ifdef CONFIG_X86_32
19887-# include <asm/uaccess_32.h>
19888-#else
19889-# include <asm/uaccess_64.h>
19890-#endif
19891-
19892-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19893- unsigned n);
19894-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19895- unsigned n);
19896-
19897 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19898 # define copy_user_diag __compiletime_error
19899 #else
19900@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19901 extern void copy_user_diag("copy_from_user() buffer size is too small")
19902 copy_from_user_overflow(void);
19903 extern void copy_user_diag("copy_to_user() buffer size is too small")
19904-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19905+copy_to_user_overflow(void);
19906
19907 #undef copy_user_diag
19908
19909@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19910
19911 extern void
19912 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19913-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19914+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19915 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19916
19917 #else
19918@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19919
19920 #endif
19921
19922+#ifdef CONFIG_X86_32
19923+# include <asm/uaccess_32.h>
19924+#else
19925+# include <asm/uaccess_64.h>
19926+#endif
19927+
19928 static inline unsigned long __must_check
19929 copy_from_user(void *to, const void __user *from, unsigned long n)
19930 {
19931- int sz = __compiletime_object_size(to);
19932+ size_t sz = __compiletime_object_size(to);
19933
19934 might_fault();
19935
19936@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19937 * case, and do only runtime checking for non-constant sizes.
19938 */
19939
19940- if (likely(sz < 0 || sz >= n))
19941- n = _copy_from_user(to, from, n);
19942- else if(__builtin_constant_p(n))
19943- copy_from_user_overflow();
19944- else
19945- __copy_from_user_overflow(sz, n);
19946+ if (likely(sz != (size_t)-1 && sz < n)) {
19947+ if(__builtin_constant_p(n))
19948+ copy_from_user_overflow();
19949+ else
19950+ __copy_from_user_overflow(sz, n);
19951+ } else if (access_ok(VERIFY_READ, from, n))
19952+ n = __copy_from_user(to, from, n);
19953+ else if ((long)n > 0)
19954+ memset(to, 0, n);
19955
19956 return n;
19957 }
19958@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19959 static inline unsigned long __must_check
19960 copy_to_user(void __user *to, const void *from, unsigned long n)
19961 {
19962- int sz = __compiletime_object_size(from);
19963+ size_t sz = __compiletime_object_size(from);
19964
19965 might_fault();
19966
19967 /* See the comment in copy_from_user() above. */
19968- if (likely(sz < 0 || sz >= n))
19969- n = _copy_to_user(to, from, n);
19970- else if(__builtin_constant_p(n))
19971- copy_to_user_overflow();
19972- else
19973- __copy_to_user_overflow(sz, n);
19974+ if (likely(sz != (size_t)-1 && sz < n)) {
19975+ if(__builtin_constant_p(n))
19976+ copy_to_user_overflow();
19977+ else
19978+ __copy_to_user_overflow(sz, n);
19979+ } else if (access_ok(VERIFY_WRITE, to, n))
19980+ n = __copy_to_user(to, from, n);
19981
19982 return n;
19983 }
19984diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19985index 3c03a5d..edb68ae 100644
19986--- a/arch/x86/include/asm/uaccess_32.h
19987+++ b/arch/x86/include/asm/uaccess_32.h
19988@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
19989 * anything, so this is accurate.
19990 */
19991
19992-static __always_inline unsigned long __must_check
19993+static __always_inline __size_overflow(3) unsigned long __must_check
19994 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
19995 {
19996+ if ((long)n < 0)
19997+ return n;
19998+
19999+ check_object_size(from, n, true);
20000+
20001 if (__builtin_constant_p(n)) {
20002 unsigned long ret;
20003
20004@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20005 __copy_to_user(void __user *to, const void *from, unsigned long n)
20006 {
20007 might_fault();
20008+
20009 return __copy_to_user_inatomic(to, from, n);
20010 }
20011
20012-static __always_inline unsigned long
20013+static __always_inline __size_overflow(3) unsigned long
20014 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20015 {
20016+ if ((long)n < 0)
20017+ return n;
20018+
20019 /* Avoid zeroing the tail if the copy fails..
20020 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20021 * but as the zeroing behaviour is only significant when n is not
20022@@ -137,6 +146,12 @@ static __always_inline unsigned long
20023 __copy_from_user(void *to, const void __user *from, unsigned long n)
20024 {
20025 might_fault();
20026+
20027+ if ((long)n < 0)
20028+ return n;
20029+
20030+ check_object_size(to, n, false);
20031+
20032 if (__builtin_constant_p(n)) {
20033 unsigned long ret;
20034
20035@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20036 const void __user *from, unsigned long n)
20037 {
20038 might_fault();
20039+
20040+ if ((long)n < 0)
20041+ return n;
20042+
20043 if (__builtin_constant_p(n)) {
20044 unsigned long ret;
20045
20046@@ -181,7 +200,10 @@ static __always_inline unsigned long
20047 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20048 unsigned long n)
20049 {
20050- return __copy_from_user_ll_nocache_nozero(to, from, n);
20051+ if ((long)n < 0)
20052+ return n;
20053+
20054+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20055 }
20056
20057 #endif /* _ASM_X86_UACCESS_32_H */
20058diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20059index f2f9b39..2ae1bf8 100644
20060--- a/arch/x86/include/asm/uaccess_64.h
20061+++ b/arch/x86/include/asm/uaccess_64.h
20062@@ -10,6 +10,9 @@
20063 #include <asm/alternative.h>
20064 #include <asm/cpufeature.h>
20065 #include <asm/page.h>
20066+#include <asm/pgtable.h>
20067+
20068+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20069
20070 /*
20071 * Copy To/From Userspace
20072@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20073 __must_check unsigned long
20074 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20075
20076-static __always_inline __must_check unsigned long
20077-copy_user_generic(void *to, const void *from, unsigned len)
20078+static __always_inline __must_check __size_overflow(3) unsigned long
20079+copy_user_generic(void *to, const void *from, unsigned long len)
20080 {
20081 unsigned ret;
20082
20083@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20084 }
20085
20086 __must_check unsigned long
20087-copy_in_user(void __user *to, const void __user *from, unsigned len);
20088+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20089
20090 static __always_inline __must_check
20091-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20092+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20093 {
20094- int ret = 0;
20095+ size_t sz = __compiletime_object_size(dst);
20096+ unsigned ret = 0;
20097+
20098+ if (size > INT_MAX)
20099+ return size;
20100+
20101+ check_object_size(dst, size, false);
20102+
20103+#ifdef CONFIG_PAX_MEMORY_UDEREF
20104+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20105+ return size;
20106+#endif
20107+
20108+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20109+ if(__builtin_constant_p(size))
20110+ copy_from_user_overflow();
20111+ else
20112+ __copy_from_user_overflow(sz, size);
20113+ return size;
20114+ }
20115
20116 if (!__builtin_constant_p(size))
20117- return copy_user_generic(dst, (__force void *)src, size);
20118+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20119 switch (size) {
20120- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20121+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20122 ret, "b", "b", "=q", 1);
20123 return ret;
20124- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20125+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20126 ret, "w", "w", "=r", 2);
20127 return ret;
20128- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20129+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20130 ret, "l", "k", "=r", 4);
20131 return ret;
20132- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20133+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20134 ret, "q", "", "=r", 8);
20135 return ret;
20136 case 10:
20137- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20138+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20139 ret, "q", "", "=r", 10);
20140 if (unlikely(ret))
20141 return ret;
20142 __get_user_asm(*(u16 *)(8 + (char *)dst),
20143- (u16 __user *)(8 + (char __user *)src),
20144+ (const u16 __user *)(8 + (const char __user *)src),
20145 ret, "w", "w", "=r", 2);
20146 return ret;
20147 case 16:
20148- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20149+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20150 ret, "q", "", "=r", 16);
20151 if (unlikely(ret))
20152 return ret;
20153 __get_user_asm(*(u64 *)(8 + (char *)dst),
20154- (u64 __user *)(8 + (char __user *)src),
20155+ (const u64 __user *)(8 + (const char __user *)src),
20156 ret, "q", "", "=r", 8);
20157 return ret;
20158 default:
20159- return copy_user_generic(dst, (__force void *)src, size);
20160+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20161 }
20162 }
20163
20164 static __always_inline __must_check
20165-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20166+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20167 {
20168 might_fault();
20169 return __copy_from_user_nocheck(dst, src, size);
20170 }
20171
20172 static __always_inline __must_check
20173-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20174+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20175 {
20176- int ret = 0;
20177+ size_t sz = __compiletime_object_size(src);
20178+ unsigned ret = 0;
20179+
20180+ if (size > INT_MAX)
20181+ return size;
20182+
20183+ check_object_size(src, size, true);
20184+
20185+#ifdef CONFIG_PAX_MEMORY_UDEREF
20186+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20187+ return size;
20188+#endif
20189+
20190+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20191+ if(__builtin_constant_p(size))
20192+ copy_to_user_overflow();
20193+ else
20194+ __copy_to_user_overflow(sz, size);
20195+ return size;
20196+ }
20197
20198 if (!__builtin_constant_p(size))
20199- return copy_user_generic((__force void *)dst, src, size);
20200+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20201 switch (size) {
20202- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20203+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20204 ret, "b", "b", "iq", 1);
20205 return ret;
20206- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20207+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20208 ret, "w", "w", "ir", 2);
20209 return ret;
20210- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20211+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20212 ret, "l", "k", "ir", 4);
20213 return ret;
20214- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20215+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20216 ret, "q", "", "er", 8);
20217 return ret;
20218 case 10:
20219- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20220+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20221 ret, "q", "", "er", 10);
20222 if (unlikely(ret))
20223 return ret;
20224 asm("":::"memory");
20225- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20226+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20227 ret, "w", "w", "ir", 2);
20228 return ret;
20229 case 16:
20230- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20231+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20232 ret, "q", "", "er", 16);
20233 if (unlikely(ret))
20234 return ret;
20235 asm("":::"memory");
20236- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20237+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20238 ret, "q", "", "er", 8);
20239 return ret;
20240 default:
20241- return copy_user_generic((__force void *)dst, src, size);
20242+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20243 }
20244 }
20245
20246 static __always_inline __must_check
20247-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20248+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20249 {
20250 might_fault();
20251 return __copy_to_user_nocheck(dst, src, size);
20252 }
20253
20254 static __always_inline __must_check
20255-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20256+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20257 {
20258- int ret = 0;
20259+ unsigned ret = 0;
20260
20261 might_fault();
20262+
20263+ if (size > INT_MAX)
20264+ return size;
20265+
20266+#ifdef CONFIG_PAX_MEMORY_UDEREF
20267+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20268+ return size;
20269+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20270+ return size;
20271+#endif
20272+
20273 if (!__builtin_constant_p(size))
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 switch (size) {
20279 case 1: {
20280 u8 tmp;
20281- __get_user_asm(tmp, (u8 __user *)src,
20282+ __get_user_asm(tmp, (const u8 __user *)src,
20283 ret, "b", "b", "=q", 1);
20284 if (likely(!ret))
20285 __put_user_asm(tmp, (u8 __user *)dst,
20286@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20287 }
20288 case 2: {
20289 u16 tmp;
20290- __get_user_asm(tmp, (u16 __user *)src,
20291+ __get_user_asm(tmp, (const u16 __user *)src,
20292 ret, "w", "w", "=r", 2);
20293 if (likely(!ret))
20294 __put_user_asm(tmp, (u16 __user *)dst,
20295@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20296
20297 case 4: {
20298 u32 tmp;
20299- __get_user_asm(tmp, (u32 __user *)src,
20300+ __get_user_asm(tmp, (const u32 __user *)src,
20301 ret, "l", "k", "=r", 4);
20302 if (likely(!ret))
20303 __put_user_asm(tmp, (u32 __user *)dst,
20304@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20305 }
20306 case 8: {
20307 u64 tmp;
20308- __get_user_asm(tmp, (u64 __user *)src,
20309+ __get_user_asm(tmp, (const u64 __user *)src,
20310 ret, "q", "", "=r", 8);
20311 if (likely(!ret))
20312 __put_user_asm(tmp, (u64 __user *)dst,
20313@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20314 return ret;
20315 }
20316 default:
20317- return copy_user_generic((__force void *)dst,
20318- (__force void *)src, size);
20319+ return copy_user_generic((__force_kernel void *)____m(dst),
20320+ (__force_kernel const void *)____m(src), size);
20321 }
20322 }
20323
20324-static __must_check __always_inline int
20325-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20326+static __must_check __always_inline unsigned long
20327+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20328 {
20329 return __copy_from_user_nocheck(dst, src, size);
20330 }
20331
20332-static __must_check __always_inline int
20333-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20334+static __must_check __always_inline unsigned long
20335+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20336 {
20337 return __copy_to_user_nocheck(dst, src, size);
20338 }
20339
20340-extern long __copy_user_nocache(void *dst, const void __user *src,
20341- unsigned size, int zerorest);
20342+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20343+ unsigned long size, int zerorest);
20344
20345-static inline int
20346-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20347+static inline unsigned long
20348+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20349 {
20350 might_fault();
20351+
20352+ if (size > INT_MAX)
20353+ return size;
20354+
20355+#ifdef CONFIG_PAX_MEMORY_UDEREF
20356+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20357+ return size;
20358+#endif
20359+
20360 return __copy_user_nocache(dst, src, size, 1);
20361 }
20362
20363-static inline int
20364+static inline unsigned long
20365 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20366- unsigned size)
20367+ unsigned long size)
20368 {
20369+ if (size > INT_MAX)
20370+ return size;
20371+
20372+#ifdef CONFIG_PAX_MEMORY_UDEREF
20373+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20374+ return size;
20375+#endif
20376+
20377 return __copy_user_nocache(dst, src, size, 0);
20378 }
20379
20380 unsigned long
20381-copy_user_handle_tail(char *to, char *from, unsigned len);
20382+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20383
20384 #endif /* _ASM_X86_UACCESS_64_H */
20385diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20386index 5b238981..77fdd78 100644
20387--- a/arch/x86/include/asm/word-at-a-time.h
20388+++ b/arch/x86/include/asm/word-at-a-time.h
20389@@ -11,7 +11,7 @@
20390 * and shift, for example.
20391 */
20392 struct word_at_a_time {
20393- const unsigned long one_bits, high_bits;
20394+ unsigned long one_bits, high_bits;
20395 };
20396
20397 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20398diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20399index f58a9c7..dc378042a 100644
20400--- a/arch/x86/include/asm/x86_init.h
20401+++ b/arch/x86/include/asm/x86_init.h
20402@@ -129,7 +129,7 @@ struct x86_init_ops {
20403 struct x86_init_timers timers;
20404 struct x86_init_iommu iommu;
20405 struct x86_init_pci pci;
20406-};
20407+} __no_const;
20408
20409 /**
20410 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20411@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20412 void (*setup_percpu_clockev)(void);
20413 void (*early_percpu_clock_init)(void);
20414 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20415-};
20416+} __no_const;
20417
20418 struct timespec;
20419
20420@@ -168,7 +168,7 @@ struct x86_platform_ops {
20421 void (*save_sched_clock_state)(void);
20422 void (*restore_sched_clock_state)(void);
20423 void (*apic_post_init)(void);
20424-};
20425+} __no_const;
20426
20427 struct pci_dev;
20428 struct msi_msg;
20429@@ -182,7 +182,7 @@ struct x86_msi_ops {
20430 void (*teardown_msi_irqs)(struct pci_dev *dev);
20431 void (*restore_msi_irqs)(struct pci_dev *dev);
20432 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20433-};
20434+} __no_const;
20435
20436 struct IO_APIC_route_entry;
20437 struct io_apic_irq_attr;
20438@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20439 unsigned int destination, int vector,
20440 struct io_apic_irq_attr *attr);
20441 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20442-};
20443+} __no_const;
20444
20445 extern struct x86_init_ops x86_init;
20446 extern struct x86_cpuinit_ops x86_cpuinit;
20447diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20448index c44a5d5..7f83cfc 100644
20449--- a/arch/x86/include/asm/xen/page.h
20450+++ b/arch/x86/include/asm/xen/page.h
20451@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20452 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20453 * cases needing an extended handling.
20454 */
20455-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20456+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20457 {
20458 unsigned long mfn;
20459
20460diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20461index c9a6d68..cb57f42 100644
20462--- a/arch/x86/include/asm/xsave.h
20463+++ b/arch/x86/include/asm/xsave.h
20464@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20465 if (unlikely(err))
20466 return -EFAULT;
20467
20468+ pax_open_userland();
20469 __asm__ __volatile__(ASM_STAC "\n"
20470- "1:"XSAVE"\n"
20471+ "1:"
20472+ __copyuser_seg
20473+ XSAVE"\n"
20474 "2: " ASM_CLAC "\n"
20475 xstate_fault
20476 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20477 : "memory");
20478+ pax_close_userland();
20479 return err;
20480 }
20481
20482@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20483 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20484 {
20485 int err = 0;
20486- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20487+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20488 u32 lmask = mask;
20489 u32 hmask = mask >> 32;
20490
20491+ pax_open_userland();
20492 __asm__ __volatile__(ASM_STAC "\n"
20493- "1:"XRSTOR"\n"
20494+ "1:"
20495+ __copyuser_seg
20496+ XRSTOR"\n"
20497 "2: " ASM_CLAC "\n"
20498 xstate_fault
20499 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20500 : "memory"); /* memory required? */
20501+ pax_close_userland();
20502 return err;
20503 }
20504
20505diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20506index 960a8a9..404daf7 100644
20507--- a/arch/x86/include/uapi/asm/e820.h
20508+++ b/arch/x86/include/uapi/asm/e820.h
20509@@ -68,7 +68,7 @@ struct e820map {
20510 #define ISA_START_ADDRESS 0xa0000
20511 #define ISA_END_ADDRESS 0x100000
20512
20513-#define BIOS_BEGIN 0x000a0000
20514+#define BIOS_BEGIN 0x000c0000
20515 #define BIOS_END 0x00100000
20516
20517 #define BIOS_ROM_BASE 0xffe00000
20518diff --git a/arch/x86/include/uapi/asm/sigcontext.h b/arch/x86/include/uapi/asm/sigcontext.h
20519index 16dc4e8..d8b9f908 100644
20520--- a/arch/x86/include/uapi/asm/sigcontext.h
20521+++ b/arch/x86/include/uapi/asm/sigcontext.h
20522@@ -177,24 +177,9 @@ struct sigcontext {
20523 __u64 rip;
20524 __u64 eflags; /* RFLAGS */
20525 __u16 cs;
20526-
20527- /*
20528- * Prior to 2.5.64 ("[PATCH] x86-64 updates for 2.5.64-bk3"),
20529- * Linux saved and restored fs and gs in these slots. This
20530- * was counterproductive, as fsbase and gsbase were never
20531- * saved, so arch_prctl was presumably unreliable.
20532- *
20533- * If these slots are ever needed for any other purpose, there
20534- * is some risk that very old 64-bit binaries could get
20535- * confused. I doubt that many such binaries still work,
20536- * though, since the same patch in 2.5.64 also removed the
20537- * 64-bit set_thread_area syscall, so it appears that there is
20538- * no TLS API that works in both pre- and post-2.5.64 kernels.
20539- */
20540- __u16 __pad2; /* Was gs. */
20541- __u16 __pad1; /* Was fs. */
20542-
20543- __u16 ss;
20544+ __u16 gs;
20545+ __u16 fs;
20546+ __u16 __pad0;
20547 __u64 err;
20548 __u64 trapno;
20549 __u64 oldmask;
20550diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20551index 9bcd0b5..750f1b7 100644
20552--- a/arch/x86/kernel/Makefile
20553+++ b/arch/x86/kernel/Makefile
20554@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20555 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20556 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20557 obj-y += probe_roms.o
20558-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20559+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20560 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20561 obj-$(CONFIG_X86_64) += mcount_64.o
20562 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20563diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20564index dbe76a1..e2ec334 100644
20565--- a/arch/x86/kernel/acpi/boot.c
20566+++ b/arch/x86/kernel/acpi/boot.c
20567@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20568 * If your system is blacklisted here, but you find that acpi=force
20569 * works for you, please contact linux-acpi@vger.kernel.org
20570 */
20571-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20572+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20573 /*
20574 * Boxes that need ACPI disabled
20575 */
20576@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20577 };
20578
20579 /* second table for DMI checks that should run after early-quirks */
20580-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20581+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20582 /*
20583 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20584 * which includes some code which overrides all temperature
20585diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20586index d1daead..acd77e2 100644
20587--- a/arch/x86/kernel/acpi/sleep.c
20588+++ b/arch/x86/kernel/acpi/sleep.c
20589@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20590 #else /* CONFIG_64BIT */
20591 #ifdef CONFIG_SMP
20592 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20593+
20594+ pax_open_kernel();
20595 early_gdt_descr.address =
20596 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20597+ pax_close_kernel();
20598+
20599 initial_gs = per_cpu_offset(smp_processor_id());
20600 #endif
20601 initial_code = (unsigned long)wakeup_long64;
20602diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20603index 665c6b7..eae4d56 100644
20604--- a/arch/x86/kernel/acpi/wakeup_32.S
20605+++ b/arch/x86/kernel/acpi/wakeup_32.S
20606@@ -29,13 +29,11 @@ wakeup_pmode_return:
20607 # and restore the stack ... but you need gdt for this to work
20608 movl saved_context_esp, %esp
20609
20610- movl %cs:saved_magic, %eax
20611- cmpl $0x12345678, %eax
20612+ cmpl $0x12345678, saved_magic
20613 jne bogus_magic
20614
20615 # jump to place where we left off
20616- movl saved_eip, %eax
20617- jmp *%eax
20618+ jmp *(saved_eip)
20619
20620 bogus_magic:
20621 jmp bogus_magic
20622diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20623index aef6531..d7ca83a 100644
20624--- a/arch/x86/kernel/alternative.c
20625+++ b/arch/x86/kernel/alternative.c
20626@@ -248,7 +248,9 @@ static void __init_or_module add_nops(void *insns, unsigned int len)
20627 unsigned int noplen = len;
20628 if (noplen > ASM_NOP_MAX)
20629 noplen = ASM_NOP_MAX;
20630+ pax_open_kernel();
20631 memcpy(insns, ideal_nops[noplen], noplen);
20632+ pax_close_kernel();
20633 insns += noplen;
20634 len -= noplen;
20635 }
20636@@ -276,6 +278,13 @@ recompute_jump(struct alt_instr *a, u8 *orig_insn, u8 *repl_insn, u8 *insnbuf)
20637 if (a->replacementlen != 5)
20638 return;
20639
20640+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20641+ if (orig_insn < (u8 *)_text || (u8 *)_einittext <= orig_insn)
20642+ orig_insn = ktva_ktla(orig_insn);
20643+ else
20644+ orig_insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20645+#endif
20646+
20647 o_dspl = *(s32 *)(insnbuf + 1);
20648
20649 /* next_rip of the replacement JMP */
20650@@ -346,6 +355,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20651 {
20652 struct alt_instr *a;
20653 u8 *instr, *replacement;
20654+ u8 *vinstr, *vreplacement;
20655 u8 insnbuf[MAX_PATCH_LEN];
20656
20657 DPRINTK("alt table %p -> %p", start, end);
20658@@ -361,46 +371,71 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20659 for (a = start; a < end; a++) {
20660 int insnbuf_sz = 0;
20661
20662- instr = (u8 *)&a->instr_offset + a->instr_offset;
20663- replacement = (u8 *)&a->repl_offset + a->repl_offset;
20664+ vinstr = instr = (u8 *)&a->instr_offset + a->instr_offset;
20665+
20666+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20667+ if ((u8 *)_text - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR) <= instr &&
20668+ instr < (u8 *)_einittext - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR)) {
20669+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20670+ vinstr = ktla_ktva(instr);
20671+ } else if ((u8 *)_text <= instr && instr < (u8 *)_einittext) {
20672+ vinstr = ktla_ktva(instr);
20673+ } else {
20674+ instr = ktva_ktla(instr);
20675+ }
20676+#endif
20677+
20678+ vreplacement = replacement = (u8 *)&a->repl_offset + a->repl_offset;
20679+
20680+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20681+ if ((u8 *)_text - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR) <= replacement &&
20682+ replacement < (u8 *)_einittext - (____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR)) {
20683+ replacement += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20684+ vreplacement = ktla_ktva(replacement);
20685+ } else if ((u8 *)_text <= replacement && replacement < (u8 *)_einittext) {
20686+ vreplacement = ktla_ktva(replacement);
20687+ } else
20688+ replacement = ktva_ktla(replacement);
20689+#endif
20690+
20691 BUG_ON(a->instrlen > sizeof(insnbuf));
20692 BUG_ON(a->cpuid >= (NCAPINTS + NBUGINTS) * 32);
20693 if (!boot_cpu_has(a->cpuid)) {
20694 if (a->padlen > 1)
20695- optimize_nops(a, instr);
20696+ optimize_nops(a, vinstr);
20697
20698 continue;
20699 }
20700
20701- DPRINTK("feat: %d*32+%d, old: (%p, len: %d), repl: (%p, len: %d), pad: %d",
20702+ DPRINTK("feat: %d*32+%d, old: (%p/%p, len: %d), repl: (%p, len: %d), pad: %d",
20703 a->cpuid >> 5,
20704 a->cpuid & 0x1f,
20705- instr, a->instrlen,
20706- replacement, a->replacementlen, a->padlen);
20707+ instr, vinstr, a->instrlen,
20708+ vreplacement, a->replacementlen, a->padlen);
20709
20710- DUMP_BYTES(instr, a->instrlen, "%p: old_insn: ", instr);
20711- DUMP_BYTES(replacement, a->replacementlen, "%p: rpl_insn: ", replacement);
20712+ DUMP_BYTES(vinstr, a->instrlen, "%p: old_insn: ", vinstr);
20713+ DUMP_BYTES(vreplacement, a->replacementlen, "%p: rpl_insn: ", vreplacement);
20714
20715- memcpy(insnbuf, replacement, a->replacementlen);
20716+ memcpy(insnbuf, vreplacement, a->replacementlen);
20717 insnbuf_sz = a->replacementlen;
20718
20719 /* 0xe8 is a relative jump; fix the offset. */
20720 if (*insnbuf == 0xe8 && a->replacementlen == 5) {
20721- *(s32 *)(insnbuf + 1) += replacement - instr;
20722+ *(s32 *)(insnbuf + 1) += vreplacement - vinstr;
20723 DPRINTK("Fix CALL offset: 0x%x, CALL 0x%lx",
20724 *(s32 *)(insnbuf + 1),
20725- (unsigned long)instr + *(s32 *)(insnbuf + 1) + 5);
20726+ (unsigned long)vinstr + *(s32 *)(insnbuf + 1) + 5);
20727 }
20728
20729- if (a->replacementlen && is_jmp(replacement[0]))
20730- recompute_jump(a, instr, replacement, insnbuf);
20731+ if (a->replacementlen && is_jmp(vreplacement[0]))
20732+ recompute_jump(a, instr, vreplacement, insnbuf);
20733
20734 if (a->instrlen > a->replacementlen) {
20735 add_nops(insnbuf + a->replacementlen,
20736 a->instrlen - a->replacementlen);
20737 insnbuf_sz += a->instrlen - a->replacementlen;
20738 }
20739- DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", instr);
20740+ DUMP_BYTES(insnbuf, insnbuf_sz, "%p: final_insn: ", vinstr);
20741
20742 text_poke_early(instr, insnbuf, insnbuf_sz);
20743 }
20744@@ -416,10 +451,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20745 for (poff = start; poff < end; poff++) {
20746 u8 *ptr = (u8 *)poff + *poff;
20747
20748+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20749+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20750+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20751+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20752+#endif
20753+
20754 if (!*poff || ptr < text || ptr >= text_end)
20755 continue;
20756 /* turn DS segment override prefix into lock prefix */
20757- if (*ptr == 0x3e)
20758+ if (*ktla_ktva(ptr) == 0x3e)
20759 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20760 }
20761 mutex_unlock(&text_mutex);
20762@@ -434,10 +475,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20763 for (poff = start; poff < end; poff++) {
20764 u8 *ptr = (u8 *)poff + *poff;
20765
20766+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20767+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20768+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20769+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20770+#endif
20771+
20772 if (!*poff || ptr < text || ptr >= text_end)
20773 continue;
20774 /* turn lock prefix into DS segment override prefix */
20775- if (*ptr == 0xf0)
20776+ if (*ktla_ktva(ptr) == 0xf0)
20777 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20778 }
20779 mutex_unlock(&text_mutex);
20780@@ -574,7 +621,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20781
20782 BUG_ON(p->len > MAX_PATCH_LEN);
20783 /* prep the buffer with the original instructions */
20784- memcpy(insnbuf, p->instr, p->len);
20785+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20786 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20787 (unsigned long)p->instr, p->len);
20788
20789@@ -621,7 +668,7 @@ void __init alternative_instructions(void)
20790 if (!uniproc_patched || num_possible_cpus() == 1)
20791 free_init_pages("SMP alternatives",
20792 (unsigned long)__smp_locks,
20793- (unsigned long)__smp_locks_end);
20794+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20795 #endif
20796
20797 apply_paravirt(__parainstructions, __parainstructions_end);
20798@@ -641,13 +688,17 @@ void __init alternative_instructions(void)
20799 * instructions. And on the local CPU you need to be protected again NMI or MCE
20800 * handlers seeing an inconsistent instruction while you patch.
20801 */
20802-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20803+void *__kprobes text_poke_early(void *addr, const void *opcode,
20804 size_t len)
20805 {
20806 unsigned long flags;
20807 local_irq_save(flags);
20808- memcpy(addr, opcode, len);
20809+
20810+ pax_open_kernel();
20811+ memcpy(ktla_ktva(addr), opcode, len);
20812 sync_core();
20813+ pax_close_kernel();
20814+
20815 local_irq_restore(flags);
20816 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20817 that causes hangs on some VIA CPUs. */
20818@@ -669,36 +720,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20819 */
20820 void *text_poke(void *addr, const void *opcode, size_t len)
20821 {
20822- unsigned long flags;
20823- char *vaddr;
20824+ unsigned char *vaddr = ktla_ktva(addr);
20825 struct page *pages[2];
20826- int i;
20827+ size_t i;
20828
20829 if (!core_kernel_text((unsigned long)addr)) {
20830- pages[0] = vmalloc_to_page(addr);
20831- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20832+ pages[0] = vmalloc_to_page(vaddr);
20833+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20834 } else {
20835- pages[0] = virt_to_page(addr);
20836+ pages[0] = virt_to_page(vaddr);
20837 WARN_ON(!PageReserved(pages[0]));
20838- pages[1] = virt_to_page(addr + PAGE_SIZE);
20839+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20840 }
20841 BUG_ON(!pages[0]);
20842- local_irq_save(flags);
20843- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20844- if (pages[1])
20845- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20846- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20847- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20848- clear_fixmap(FIX_TEXT_POKE0);
20849- if (pages[1])
20850- clear_fixmap(FIX_TEXT_POKE1);
20851- local_flush_tlb();
20852- sync_core();
20853- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20854- that causes hangs on some VIA CPUs. */
20855+ text_poke_early(addr, opcode, len);
20856 for (i = 0; i < len; i++)
20857- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20858- local_irq_restore(flags);
20859+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20860 return addr;
20861 }
20862
20863@@ -752,7 +789,7 @@ int poke_int3_handler(struct pt_regs *regs)
20864 */
20865 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20866 {
20867- unsigned char int3 = 0xcc;
20868+ const unsigned char int3 = 0xcc;
20869
20870 bp_int3_handler = handler;
20871 bp_int3_addr = (u8 *)addr + sizeof(int3);
20872diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20873index dcb5285..cc79e9d 100644
20874--- a/arch/x86/kernel/apic/apic.c
20875+++ b/arch/x86/kernel/apic/apic.c
20876@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20877 /*
20878 * Debug level, exported for io_apic.c
20879 */
20880-unsigned int apic_verbosity;
20881+int apic_verbosity;
20882
20883 int pic_mode;
20884
20885@@ -1857,7 +1857,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20886 apic_write(APIC_ESR, 0);
20887 v = apic_read(APIC_ESR);
20888 ack_APIC_irq();
20889- atomic_inc(&irq_err_count);
20890+ atomic_inc_unchecked(&irq_err_count);
20891
20892 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20893 smp_processor_id(), v);
20894diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20895index de918c4..32eed23 100644
20896--- a/arch/x86/kernel/apic/apic_flat_64.c
20897+++ b/arch/x86/kernel/apic/apic_flat_64.c
20898@@ -154,7 +154,7 @@ static int flat_probe(void)
20899 return 1;
20900 }
20901
20902-static struct apic apic_flat = {
20903+static struct apic apic_flat __read_only = {
20904 .name = "flat",
20905 .probe = flat_probe,
20906 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20907@@ -260,7 +260,7 @@ static int physflat_probe(void)
20908 return 0;
20909 }
20910
20911-static struct apic apic_physflat = {
20912+static struct apic apic_physflat __read_only = {
20913
20914 .name = "physical flat",
20915 .probe = physflat_probe,
20916diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20917index b205cdb..d8503ff 100644
20918--- a/arch/x86/kernel/apic/apic_noop.c
20919+++ b/arch/x86/kernel/apic/apic_noop.c
20920@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20921 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20922 }
20923
20924-struct apic apic_noop = {
20925+struct apic apic_noop __read_only = {
20926 .name = "noop",
20927 .probe = noop_probe,
20928 .acpi_madt_oem_check = NULL,
20929diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20930index c4a8d63..fe893ac 100644
20931--- a/arch/x86/kernel/apic/bigsmp_32.c
20932+++ b/arch/x86/kernel/apic/bigsmp_32.c
20933@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20934 return dmi_bigsmp;
20935 }
20936
20937-static struct apic apic_bigsmp = {
20938+static struct apic apic_bigsmp __read_only = {
20939
20940 .name = "bigsmp",
20941 .probe = probe_bigsmp,
20942diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20943index f4dc246..fbab133 100644
20944--- a/arch/x86/kernel/apic/io_apic.c
20945+++ b/arch/x86/kernel/apic/io_apic.c
20946@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20947 return ret;
20948 }
20949
20950-atomic_t irq_mis_count;
20951+atomic_unchecked_t irq_mis_count;
20952
20953 #ifdef CONFIG_GENERIC_PENDING_IRQ
20954 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20955@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20956 * at the cpu.
20957 */
20958 if (!(v & (1 << (i & 0x1f)))) {
20959- atomic_inc(&irq_mis_count);
20960+ atomic_inc_unchecked(&irq_mis_count);
20961
20962 eoi_ioapic_irq(irq, cfg);
20963 }
20964@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20965 ioapic_irqd_unmask(data, cfg, masked);
20966 }
20967
20968-static struct irq_chip ioapic_chip __read_mostly = {
20969+static struct irq_chip ioapic_chip = {
20970 .name = "IO-APIC",
20971 .irq_startup = startup_ioapic_irq,
20972 .irq_mask = mask_ioapic_irq,
20973@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20974 ack_APIC_irq();
20975 }
20976
20977-static struct irq_chip lapic_chip __read_mostly = {
20978+static struct irq_chip lapic_chip = {
20979 .name = "local-APIC",
20980 .irq_mask = mask_lapic_irq,
20981 .irq_unmask = unmask_lapic_irq,
20982diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20983index bda4886..f9c7195 100644
20984--- a/arch/x86/kernel/apic/probe_32.c
20985+++ b/arch/x86/kernel/apic/probe_32.c
20986@@ -72,7 +72,7 @@ static int probe_default(void)
20987 return 1;
20988 }
20989
20990-static struct apic apic_default = {
20991+static struct apic apic_default __read_only = {
20992
20993 .name = "default",
20994 .probe = probe_default,
20995diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20996index 6cedd79..023ff8e 100644
20997--- a/arch/x86/kernel/apic/vector.c
20998+++ b/arch/x86/kernel/apic/vector.c
20999@@ -21,7 +21,7 @@
21000
21001 static DEFINE_RAW_SPINLOCK(vector_lock);
21002
21003-void lock_vector_lock(void)
21004+void lock_vector_lock(void) __acquires(vector_lock)
21005 {
21006 /* Used to the online set of cpus does not change
21007 * during assign_irq_vector.
21008@@ -29,7 +29,7 @@ void lock_vector_lock(void)
21009 raw_spin_lock(&vector_lock);
21010 }
21011
21012-void unlock_vector_lock(void)
21013+void unlock_vector_lock(void) __releases(vector_lock)
21014 {
21015 raw_spin_unlock(&vector_lock);
21016 }
21017diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
21018index ab3219b..e8033eb 100644
21019--- a/arch/x86/kernel/apic/x2apic_cluster.c
21020+++ b/arch/x86/kernel/apic/x2apic_cluster.c
21021@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
21022 return notifier_from_errno(err);
21023 }
21024
21025-static struct notifier_block __refdata x2apic_cpu_notifier = {
21026+static struct notifier_block x2apic_cpu_notifier = {
21027 .notifier_call = update_clusterinfo,
21028 };
21029
21030@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
21031 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
21032 }
21033
21034-static struct apic apic_x2apic_cluster = {
21035+static struct apic apic_x2apic_cluster __read_only = {
21036
21037 .name = "cluster x2apic",
21038 .probe = x2apic_cluster_probe,
21039diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
21040index 6fae733..5ca17af 100644
21041--- a/arch/x86/kernel/apic/x2apic_phys.c
21042+++ b/arch/x86/kernel/apic/x2apic_phys.c
21043@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
21044 return apic == &apic_x2apic_phys;
21045 }
21046
21047-static struct apic apic_x2apic_phys = {
21048+static struct apic apic_x2apic_phys __read_only = {
21049
21050 .name = "physical x2apic",
21051 .probe = x2apic_phys_probe,
21052diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
21053index c8d9295..9af2d03 100644
21054--- a/arch/x86/kernel/apic/x2apic_uv_x.c
21055+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
21056@@ -375,7 +375,7 @@ static int uv_probe(void)
21057 return apic == &apic_x2apic_uv_x;
21058 }
21059
21060-static struct apic __refdata apic_x2apic_uv_x = {
21061+static struct apic apic_x2apic_uv_x __read_only = {
21062
21063 .name = "UV large system",
21064 .probe = uv_probe,
21065diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
21066index 927ec92..de68f32 100644
21067--- a/arch/x86/kernel/apm_32.c
21068+++ b/arch/x86/kernel/apm_32.c
21069@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
21070 * This is for buggy BIOS's that refer to (real mode) segment 0x40
21071 * even though they are called in protected mode.
21072 */
21073-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
21074+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21075 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21076
21077 static const char driver_version[] = "1.16ac"; /* no spaces */
21078@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
21079 BUG_ON(cpu != 0);
21080 gdt = get_cpu_gdt_table(cpu);
21081 save_desc_40 = gdt[0x40 / 8];
21082+
21083+ pax_open_kernel();
21084 gdt[0x40 / 8] = bad_bios_desc;
21085+ pax_close_kernel();
21086
21087 apm_irq_save(flags);
21088 APM_DO_SAVE_SEGS;
21089@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
21090 &call->esi);
21091 APM_DO_RESTORE_SEGS;
21092 apm_irq_restore(flags);
21093+
21094+ pax_open_kernel();
21095 gdt[0x40 / 8] = save_desc_40;
21096+ pax_close_kernel();
21097+
21098 put_cpu();
21099
21100 return call->eax & 0xff;
21101@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21102 BUG_ON(cpu != 0);
21103 gdt = get_cpu_gdt_table(cpu);
21104 save_desc_40 = gdt[0x40 / 8];
21105+
21106+ pax_open_kernel();
21107 gdt[0x40 / 8] = bad_bios_desc;
21108+ pax_close_kernel();
21109
21110 apm_irq_save(flags);
21111 APM_DO_SAVE_SEGS;
21112@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21113 &call->eax);
21114 APM_DO_RESTORE_SEGS;
21115 apm_irq_restore(flags);
21116+
21117+ pax_open_kernel();
21118 gdt[0x40 / 8] = save_desc_40;
21119+ pax_close_kernel();
21120+
21121 put_cpu();
21122 return error;
21123 }
21124@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21125 return 0;
21126 }
21127
21128-static struct dmi_system_id __initdata apm_dmi_table[] = {
21129+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21130 {
21131 print_if_true,
21132 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21133@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21134 * code to that CPU.
21135 */
21136 gdt = get_cpu_gdt_table(0);
21137+
21138+ pax_open_kernel();
21139 set_desc_base(&gdt[APM_CS >> 3],
21140 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21141 set_desc_base(&gdt[APM_CS_16 >> 3],
21142 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21143 set_desc_base(&gdt[APM_DS >> 3],
21144 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21145+ pax_close_kernel();
21146
21147 proc_create("apm", 0, NULL, &apm_file_ops);
21148
21149diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21150index 9f6b934..cf5ffb3 100644
21151--- a/arch/x86/kernel/asm-offsets.c
21152+++ b/arch/x86/kernel/asm-offsets.c
21153@@ -32,6 +32,8 @@ void common(void) {
21154 OFFSET(TI_flags, thread_info, flags);
21155 OFFSET(TI_status, thread_info, status);
21156 OFFSET(TI_addr_limit, thread_info, addr_limit);
21157+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21158+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21159
21160 BLANK();
21161 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21162@@ -52,8 +54,26 @@ void common(void) {
21163 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21164 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21165 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21166+
21167+#ifdef CONFIG_PAX_KERNEXEC
21168+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21169 #endif
21170
21171+#ifdef CONFIG_PAX_MEMORY_UDEREF
21172+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21173+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21174+#ifdef CONFIG_X86_64
21175+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21176+#endif
21177+#endif
21178+
21179+#endif
21180+
21181+ BLANK();
21182+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21183+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21184+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21185+
21186 #ifdef CONFIG_XEN
21187 BLANK();
21188 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21189diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21190index 5ce6f2d..9e738f3 100644
21191--- a/arch/x86/kernel/asm-offsets_64.c
21192+++ b/arch/x86/kernel/asm-offsets_64.c
21193@@ -80,6 +80,7 @@ int main(void)
21194 BLANK();
21195 #undef ENTRY
21196
21197+ DEFINE(TSS_size, sizeof(struct tss_struct));
21198 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21199 OFFSET(TSS_sp0, tss_struct, x86_tss.sp0);
21200 BLANK();
21201diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21202index 9bff687..5b899fb 100644
21203--- a/arch/x86/kernel/cpu/Makefile
21204+++ b/arch/x86/kernel/cpu/Makefile
21205@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21206 CFLAGS_REMOVE_perf_event.o = -pg
21207 endif
21208
21209-# Make sure load_percpu_segment has no stackprotector
21210-nostackp := $(call cc-option, -fno-stack-protector)
21211-CFLAGS_common.o := $(nostackp)
21212-
21213 obj-y := intel_cacheinfo.o scattered.o topology.o
21214 obj-y += common.o
21215 obj-y += rdrand.o
21216diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21217index e4cf633..941f450 100644
21218--- a/arch/x86/kernel/cpu/amd.c
21219+++ b/arch/x86/kernel/cpu/amd.c
21220@@ -729,7 +729,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21221 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21222 {
21223 /* AMD errata T13 (order #21922) */
21224- if ((c->x86 == 6)) {
21225+ if (c->x86 == 6) {
21226 /* Duron Rev A0 */
21227 if (c->x86_model == 3 && c->x86_mask == 0)
21228 size = 64;
21229diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21230index a62cf04..a55415c 100644
21231--- a/arch/x86/kernel/cpu/common.c
21232+++ b/arch/x86/kernel/cpu/common.c
21233@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21234
21235 static const struct cpu_dev *this_cpu = &default_cpu;
21236
21237-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21238-#ifdef CONFIG_X86_64
21239- /*
21240- * We need valid kernel segments for data and code in long mode too
21241- * IRET will check the segment types kkeil 2000/10/28
21242- * Also sysret mandates a special GDT layout
21243- *
21244- * TLS descriptors are currently at a different place compared to i386.
21245- * Hopefully nobody expects them at a fixed place (Wine?)
21246- */
21247- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21248- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21249- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21250- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21251- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21252- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21253-#else
21254- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21255- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21256- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21257- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21258- /*
21259- * Segments used for calling PnP BIOS have byte granularity.
21260- * They code segments and data segments have fixed 64k limits,
21261- * the transfer segment sizes are set at run time.
21262- */
21263- /* 32-bit code */
21264- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21265- /* 16-bit code */
21266- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21267- /* 16-bit data */
21268- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21269- /* 16-bit data */
21270- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21271- /* 16-bit data */
21272- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21273- /*
21274- * The APM segments have byte granularity and their bases
21275- * are set at run time. All have 64k limits.
21276- */
21277- /* 32-bit code */
21278- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21279- /* 16-bit code */
21280- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21281- /* data */
21282- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21283-
21284- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21285- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21286- GDT_STACK_CANARY_INIT
21287-#endif
21288-} };
21289-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21290-
21291 static int __init x86_xsave_setup(char *s)
21292 {
21293 if (strlen(s))
21294@@ -306,6 +252,109 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21295 }
21296 }
21297
21298+#ifdef CONFIG_PAX_MEMORY_UDEREF
21299+#ifdef CONFIG_X86_64
21300+static bool uderef_enabled __read_only = true;
21301+unsigned long pax_user_shadow_base __read_only;
21302+EXPORT_SYMBOL(pax_user_shadow_base);
21303+extern char pax_enter_kernel_user[];
21304+extern char pax_exit_kernel_user[];
21305+
21306+static int __init setup_pax_weakuderef(char *str)
21307+{
21308+ if (uderef_enabled)
21309+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21310+ return 1;
21311+}
21312+__setup("pax_weakuderef", setup_pax_weakuderef);
21313+#endif
21314+
21315+static int __init setup_pax_nouderef(char *str)
21316+{
21317+#ifdef CONFIG_X86_32
21318+ unsigned int cpu;
21319+ struct desc_struct *gdt;
21320+
21321+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
21322+ gdt = get_cpu_gdt_table(cpu);
21323+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
21324+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
21325+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
21326+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
21327+ }
21328+ loadsegment(ds, __KERNEL_DS);
21329+ loadsegment(es, __KERNEL_DS);
21330+ loadsegment(ss, __KERNEL_DS);
21331+#else
21332+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
21333+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
21334+ clone_pgd_mask = ~(pgdval_t)0UL;
21335+ pax_user_shadow_base = 0UL;
21336+ setup_clear_cpu_cap(X86_FEATURE_PCIDUDEREF);
21337+ uderef_enabled = false;
21338+#endif
21339+
21340+ return 0;
21341+}
21342+early_param("pax_nouderef", setup_pax_nouderef);
21343+#endif
21344+
21345+#ifdef CONFIG_X86_64
21346+static __init int setup_disable_pcid(char *arg)
21347+{
21348+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21349+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21350+
21351+#ifdef CONFIG_PAX_MEMORY_UDEREF
21352+ if (uderef_enabled)
21353+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21354+#endif
21355+
21356+ return 1;
21357+}
21358+__setup("nopcid", setup_disable_pcid);
21359+
21360+static void setup_pcid(struct cpuinfo_x86 *c)
21361+{
21362+ if (cpu_has(c, X86_FEATURE_PCID)) {
21363+ printk("PAX: PCID detected\n");
21364+ cr4_set_bits(X86_CR4_PCIDE);
21365+ } else
21366+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21367+
21368+ if (cpu_has(c, X86_FEATURE_INVPCID))
21369+ printk("PAX: INVPCID detected\n");
21370+
21371+#ifdef CONFIG_PAX_MEMORY_UDEREF
21372+ if (!uderef_enabled) {
21373+ printk("PAX: UDEREF disabled\n");
21374+ return;
21375+ }
21376+
21377+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21378+ pax_open_kernel();
21379+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21380+ pax_close_kernel();
21381+ printk("PAX: slow and weak UDEREF enabled\n");
21382+ return;
21383+ }
21384+
21385+ set_cpu_cap(c, X86_FEATURE_PCIDUDEREF);
21386+
21387+ pax_open_kernel();
21388+ clone_pgd_mask = ~(pgdval_t)0UL;
21389+ pax_close_kernel();
21390+ if (pax_user_shadow_base)
21391+ printk("PAX: weak UDEREF enabled\n");
21392+ else {
21393+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21394+ printk("PAX: strong UDEREF enabled\n");
21395+ }
21396+#endif
21397+
21398+}
21399+#endif
21400+
21401 /*
21402 * Some CPU features depend on higher CPUID levels, which may not always
21403 * be available due to CPUID level capping or broken virtualization
21404@@ -406,7 +455,7 @@ void switch_to_new_gdt(int cpu)
21405 {
21406 struct desc_ptr gdt_descr;
21407
21408- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21409+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21410 gdt_descr.size = GDT_SIZE - 1;
21411 load_gdt(&gdt_descr);
21412 /* Reload the per-cpu base */
21413@@ -935,6 +984,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21414 setup_smep(c);
21415 setup_smap(c);
21416
21417+#ifdef CONFIG_X86_32
21418+#ifdef CONFIG_PAX_PAGEEXEC
21419+ if (!(__supported_pte_mask & _PAGE_NX))
21420+ clear_cpu_cap(c, X86_FEATURE_PSE);
21421+#endif
21422+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21423+ clear_cpu_cap(c, X86_FEATURE_SEP);
21424+#endif
21425+#endif
21426+
21427+#ifdef CONFIG_X86_64
21428+ setup_pcid(c);
21429+#endif
21430+
21431 /*
21432 * The vendor-specific functions might have changed features.
21433 * Now we do "generic changes."
21434@@ -1009,7 +1072,7 @@ void enable_sep_cpu(void)
21435 int cpu;
21436
21437 cpu = get_cpu();
21438- tss = &per_cpu(cpu_tss, cpu);
21439+ tss = cpu_tss + cpu;
21440
21441 if (!boot_cpu_has(X86_FEATURE_SEP))
21442 goto out;
21443@@ -1155,14 +1218,16 @@ static __init int setup_disablecpuid(char *arg)
21444 }
21445 __setup("clearcpuid=", setup_disablecpuid);
21446
21447+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21448+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21449+
21450 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21451- (unsigned long)&init_thread_union + THREAD_SIZE;
21452+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21453 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21454
21455 #ifdef CONFIG_X86_64
21456-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21457-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21458- (unsigned long) debug_idt_table };
21459+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21460+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21461
21462 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21463 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21464@@ -1367,7 +1432,7 @@ void cpu_init(void)
21465 */
21466 load_ucode_ap();
21467
21468- t = &per_cpu(cpu_tss, cpu);
21469+ t = cpu_tss + cpu;
21470 oist = &per_cpu(orig_ist, cpu);
21471
21472 #ifdef CONFIG_NUMA
21473@@ -1399,7 +1464,6 @@ void cpu_init(void)
21474 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21475 barrier();
21476
21477- x86_configure_nx();
21478 x2apic_setup();
21479
21480 /*
21481@@ -1451,7 +1515,7 @@ void cpu_init(void)
21482 {
21483 int cpu = smp_processor_id();
21484 struct task_struct *curr = current;
21485- struct tss_struct *t = &per_cpu(cpu_tss, cpu);
21486+ struct tss_struct *t = cpu_tss + cpu;
21487 struct thread_struct *thread = &curr->thread;
21488
21489 wait_for_master_cpu(cpu);
21490diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21491index edcb0e2..a138233 100644
21492--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21493+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21494@@ -519,25 +519,23 @@ cache_private_attrs_is_visible(struct kobject *kobj,
21495 return 0;
21496 }
21497
21498+static struct attribute *amd_l3_attrs[4];
21499+
21500 static struct attribute_group cache_private_group = {
21501 .is_visible = cache_private_attrs_is_visible,
21502+ .attrs = amd_l3_attrs,
21503 };
21504
21505 static void init_amd_l3_attrs(void)
21506 {
21507 int n = 1;
21508- static struct attribute **amd_l3_attrs;
21509-
21510- if (amd_l3_attrs) /* already initialized */
21511- return;
21512
21513 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21514 n += 2;
21515 if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21516 n += 1;
21517
21518- amd_l3_attrs = kcalloc(n, sizeof(*amd_l3_attrs), GFP_KERNEL);
21519- if (!amd_l3_attrs)
21520+ if (n > 1 && amd_l3_attrs[0]) /* already initialized */
21521 return;
21522
21523 n = 0;
21524@@ -547,8 +545,6 @@ static void init_amd_l3_attrs(void)
21525 }
21526 if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21527 amd_l3_attrs[n++] = &dev_attr_subcaches.attr;
21528-
21529- cache_private_group.attrs = amd_l3_attrs;
21530 }
21531
21532 const struct attribute_group *
21533@@ -559,7 +555,7 @@ cache_get_priv_group(struct cacheinfo *this_leaf)
21534 if (this_leaf->level < 3 || !nb)
21535 return NULL;
21536
21537- if (nb && nb->l3_cache.indices)
21538+ if (nb->l3_cache.indices)
21539 init_amd_l3_attrs();
21540
21541 return &cache_private_group;
21542diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21543index 20190bd..cadb2ab 100644
21544--- a/arch/x86/kernel/cpu/mcheck/mce.c
21545+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21546@@ -47,6 +47,7 @@
21547 #include <asm/tlbflush.h>
21548 #include <asm/mce.h>
21549 #include <asm/msr.h>
21550+#include <asm/local.h>
21551
21552 #include "mce-internal.h"
21553
21554@@ -256,7 +257,7 @@ static void print_mce(struct mce *m)
21555 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21556 m->cs, m->ip);
21557
21558- if (m->cs == __KERNEL_CS)
21559+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21560 print_symbol("{%s}", m->ip);
21561 pr_cont("\n");
21562 }
21563@@ -289,10 +290,10 @@ static void print_mce(struct mce *m)
21564
21565 #define PANIC_TIMEOUT 5 /* 5 seconds */
21566
21567-static atomic_t mce_panicked;
21568+static atomic_unchecked_t mce_panicked;
21569
21570 static int fake_panic;
21571-static atomic_t mce_fake_panicked;
21572+static atomic_unchecked_t mce_fake_panicked;
21573
21574 /* Panic in progress. Enable interrupts and wait for final IPI */
21575 static void wait_for_panic(void)
21576@@ -316,7 +317,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21577 /*
21578 * Make sure only one CPU runs in machine check panic
21579 */
21580- if (atomic_inc_return(&mce_panicked) > 1)
21581+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21582 wait_for_panic();
21583 barrier();
21584
21585@@ -324,7 +325,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21586 console_verbose();
21587 } else {
21588 /* Don't log too much for fake panic */
21589- if (atomic_inc_return(&mce_fake_panicked) > 1)
21590+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21591 return;
21592 }
21593 /* First print corrected ones that are still unlogged */
21594@@ -363,7 +364,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21595 if (!fake_panic) {
21596 if (panic_timeout == 0)
21597 panic_timeout = mca_cfg.panic_timeout;
21598- panic(msg);
21599+ panic("%s", msg);
21600 } else
21601 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21602 }
21603@@ -749,7 +750,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21604 * might have been modified by someone else.
21605 */
21606 rmb();
21607- if (atomic_read(&mce_panicked))
21608+ if (atomic_read_unchecked(&mce_panicked))
21609 wait_for_panic();
21610 if (!mca_cfg.monarch_timeout)
21611 goto out;
21612@@ -1679,7 +1680,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21613 }
21614
21615 /* Call the installed machine check handler for this CPU setup. */
21616-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21617+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21618 unexpected_machine_check;
21619
21620 /*
21621@@ -1702,7 +1703,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21622 return;
21623 }
21624
21625+ pax_open_kernel();
21626 machine_check_vector = do_machine_check;
21627+ pax_close_kernel();
21628
21629 __mcheck_cpu_init_generic();
21630 __mcheck_cpu_init_vendor(c);
21631@@ -1716,7 +1719,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21632 */
21633
21634 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21635-static int mce_chrdev_open_count; /* #times opened */
21636+static local_t mce_chrdev_open_count; /* #times opened */
21637 static int mce_chrdev_open_exclu; /* already open exclusive? */
21638
21639 static int mce_chrdev_open(struct inode *inode, struct file *file)
21640@@ -1724,7 +1727,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21641 spin_lock(&mce_chrdev_state_lock);
21642
21643 if (mce_chrdev_open_exclu ||
21644- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21645+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21646 spin_unlock(&mce_chrdev_state_lock);
21647
21648 return -EBUSY;
21649@@ -1732,7 +1735,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21650
21651 if (file->f_flags & O_EXCL)
21652 mce_chrdev_open_exclu = 1;
21653- mce_chrdev_open_count++;
21654+ local_inc(&mce_chrdev_open_count);
21655
21656 spin_unlock(&mce_chrdev_state_lock);
21657
21658@@ -1743,7 +1746,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21659 {
21660 spin_lock(&mce_chrdev_state_lock);
21661
21662- mce_chrdev_open_count--;
21663+ local_dec(&mce_chrdev_open_count);
21664 mce_chrdev_open_exclu = 0;
21665
21666 spin_unlock(&mce_chrdev_state_lock);
21667@@ -2419,7 +2422,7 @@ static __init void mce_init_banks(void)
21668
21669 for (i = 0; i < mca_cfg.banks; i++) {
21670 struct mce_bank *b = &mce_banks[i];
21671- struct device_attribute *a = &b->attr;
21672+ device_attribute_no_const *a = &b->attr;
21673
21674 sysfs_attr_init(&a->attr);
21675 a->attr.name = b->attrname;
21676@@ -2526,7 +2529,7 @@ struct dentry *mce_get_debugfs_dir(void)
21677 static void mce_reset(void)
21678 {
21679 cpu_missing = 0;
21680- atomic_set(&mce_fake_panicked, 0);
21681+ atomic_set_unchecked(&mce_fake_panicked, 0);
21682 atomic_set(&mce_executing, 0);
21683 atomic_set(&mce_callin, 0);
21684 atomic_set(&global_nwo, 0);
21685diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21686index 737b0ad..09ec66e 100644
21687--- a/arch/x86/kernel/cpu/mcheck/p5.c
21688+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21689@@ -12,6 +12,7 @@
21690 #include <asm/tlbflush.h>
21691 #include <asm/mce.h>
21692 #include <asm/msr.h>
21693+#include <asm/pgtable.h>
21694
21695 /* By default disabled */
21696 int mce_p5_enabled __read_mostly;
21697@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21698 if (!cpu_has(c, X86_FEATURE_MCE))
21699 return;
21700
21701+ pax_open_kernel();
21702 machine_check_vector = pentium_machine_check;
21703+ pax_close_kernel();
21704 /* Make sure the vector pointer is visible before we enable MCEs: */
21705 wmb();
21706
21707diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21708index 44f1382..315b292 100644
21709--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21710+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21711@@ -11,6 +11,7 @@
21712 #include <asm/tlbflush.h>
21713 #include <asm/mce.h>
21714 #include <asm/msr.h>
21715+#include <asm/pgtable.h>
21716
21717 /* Machine check handler for WinChip C6: */
21718 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21719@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21720 {
21721 u32 lo, hi;
21722
21723+ pax_open_kernel();
21724 machine_check_vector = winchip_machine_check;
21725+ pax_close_kernel();
21726 /* Make sure the vector pointer is visible before we enable MCEs: */
21727 wmb();
21728
21729diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21730index 36a8361..e7058c2 100644
21731--- a/arch/x86/kernel/cpu/microcode/core.c
21732+++ b/arch/x86/kernel/cpu/microcode/core.c
21733@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21734 return NOTIFY_OK;
21735 }
21736
21737-static struct notifier_block __refdata mc_cpu_notifier = {
21738+static struct notifier_block mc_cpu_notifier = {
21739 .notifier_call = mc_cpu_callback,
21740 };
21741
21742diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21743index a41bead..4e3685b 100644
21744--- a/arch/x86/kernel/cpu/microcode/intel.c
21745+++ b/arch/x86/kernel/cpu/microcode/intel.c
21746@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21747
21748 static int get_ucode_user(void *to, const void *from, size_t n)
21749 {
21750- return copy_from_user(to, from, n);
21751+ return copy_from_user(to, (const void __force_user *)from, n);
21752 }
21753
21754 static enum ucode_state
21755 request_microcode_user(int cpu, const void __user *buf, size_t size)
21756 {
21757- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21758+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21759 }
21760
21761 static void microcode_fini_cpu(int cpu)
21762diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21763index ea5f363..cb0e905 100644
21764--- a/arch/x86/kernel/cpu/mtrr/main.c
21765+++ b/arch/x86/kernel/cpu/mtrr/main.c
21766@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21767 u64 size_or_mask, size_and_mask;
21768 static bool mtrr_aps_delayed_init;
21769
21770-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21771+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21772
21773 const struct mtrr_ops *mtrr_if;
21774
21775diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21776index df5e41f..816c719 100644
21777--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21778+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21779@@ -25,7 +25,7 @@ struct mtrr_ops {
21780 int (*validate_add_page)(unsigned long base, unsigned long size,
21781 unsigned int type);
21782 int (*have_wrcomb)(void);
21783-};
21784+} __do_const;
21785
21786 extern int generic_get_free_region(unsigned long base, unsigned long size,
21787 int replace_reg);
21788diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21789index aa4e3a7..469370f 100644
21790--- a/arch/x86/kernel/cpu/perf_event.c
21791+++ b/arch/x86/kernel/cpu/perf_event.c
21792@@ -1509,7 +1509,7 @@ static void __init pmu_check_apic(void)
21793
21794 }
21795
21796-static struct attribute_group x86_pmu_format_group = {
21797+static attribute_group_no_const x86_pmu_format_group = {
21798 .name = "format",
21799 .attrs = NULL,
21800 };
21801@@ -1608,7 +1608,7 @@ static struct attribute *events_attr[] = {
21802 NULL,
21803 };
21804
21805-static struct attribute_group x86_pmu_events_group = {
21806+static attribute_group_no_const x86_pmu_events_group = {
21807 .name = "events",
21808 .attrs = events_attr,
21809 };
21810@@ -2181,7 +2181,7 @@ static unsigned long get_segment_base(unsigned int segment)
21811 if (idx > GDT_ENTRIES)
21812 return 0;
21813
21814- desc = raw_cpu_ptr(gdt_page.gdt);
21815+ desc = get_cpu_gdt_table(smp_processor_id());
21816 }
21817
21818 return get_desc_base(desc + idx);
21819@@ -2271,7 +2271,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21820 break;
21821
21822 perf_callchain_store(entry, frame.return_address);
21823- fp = frame.next_frame;
21824+ fp = (const void __force_user *)frame.next_frame;
21825 }
21826 }
21827
21828diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21829index 97242a9..cf9c30e 100644
21830--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21831+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21832@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21833 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21834 {
21835 struct attribute **attrs;
21836- struct attribute_group *attr_group;
21837+ attribute_group_no_const *attr_group;
21838 int i = 0, j;
21839
21840 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21841diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21842index 2813ea0..3ef5969c8 100644
21843--- a/arch/x86/kernel/cpu/perf_event_intel.c
21844+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21845@@ -3033,10 +3033,10 @@ __init int intel_pmu_init(void)
21846 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21847
21848 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21849- u64 capabilities;
21850+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21851
21852- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21853- x86_pmu.intel_cap.capabilities = capabilities;
21854+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21855+ x86_pmu.intel_cap.capabilities = capabilities;
21856 }
21857
21858 intel_ds_init();
21859diff --git a/arch/x86/kernel/cpu/perf_event_intel_bts.c b/arch/x86/kernel/cpu/perf_event_intel_bts.c
21860index 7795f3f..3535b76 100644
21861--- a/arch/x86/kernel/cpu/perf_event_intel_bts.c
21862+++ b/arch/x86/kernel/cpu/perf_event_intel_bts.c
21863@@ -252,7 +252,7 @@ static void bts_event_start(struct perf_event *event, int flags)
21864 __bts_event_start(event);
21865
21866 /* PMI handler: this counter is running and likely generating PMIs */
21867- ACCESS_ONCE(bts->started) = 1;
21868+ ACCESS_ONCE_RW(bts->started) = 1;
21869 }
21870
21871 static void __bts_event_stop(struct perf_event *event)
21872@@ -266,7 +266,7 @@ static void __bts_event_stop(struct perf_event *event)
21873 if (event->hw.state & PERF_HES_STOPPED)
21874 return;
21875
21876- ACCESS_ONCE(event->hw.state) |= PERF_HES_STOPPED;
21877+ ACCESS_ONCE_RW(event->hw.state) |= PERF_HES_STOPPED;
21878 }
21879
21880 static void bts_event_stop(struct perf_event *event, int flags)
21881@@ -274,7 +274,7 @@ static void bts_event_stop(struct perf_event *event, int flags)
21882 struct bts_ctx *bts = this_cpu_ptr(&bts_ctx);
21883
21884 /* PMI handler: don't restart this counter */
21885- ACCESS_ONCE(bts->started) = 0;
21886+ ACCESS_ONCE_RW(bts->started) = 0;
21887
21888 __bts_event_stop(event);
21889
21890diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21891index cb77b11..8867302 100644
21892--- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21893+++ b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
21894@@ -1360,7 +1360,9 @@ static int __init intel_cqm_init(void)
21895 goto out;
21896 }
21897
21898- event_attr_intel_cqm_llc_scale.event_str = str;
21899+ pax_open_kernel();
21900+ *(const char **)&event_attr_intel_cqm_llc_scale.event_str = str;
21901+ pax_close_kernel();
21902
21903 ret = intel_cqm_setup_rmid_cache();
21904 if (ret)
21905diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/kernel/cpu/perf_event_intel_pt.c
21906index 123ff1b..d53e500 100644
21907--- a/arch/x86/kernel/cpu/perf_event_intel_pt.c
21908+++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c
21909@@ -116,16 +116,12 @@ static const struct attribute_group *pt_attr_groups[] = {
21910
21911 static int __init pt_pmu_hw_init(void)
21912 {
21913- struct dev_ext_attribute *de_attrs;
21914- struct attribute **attrs;
21915- size_t size;
21916- int ret;
21917+ static struct dev_ext_attribute de_attrs[ARRAY_SIZE(pt_caps)];
21918+ static struct attribute *attrs[ARRAY_SIZE(pt_caps)];
21919 long i;
21920
21921- attrs = NULL;
21922- ret = -ENODEV;
21923 if (!test_cpu_cap(&boot_cpu_data, X86_FEATURE_INTEL_PT))
21924- goto fail;
21925+ return -ENODEV;
21926
21927 for (i = 0; i < PT_CPUID_LEAVES; i++) {
21928 cpuid_count(20, i,
21929@@ -135,39 +131,25 @@ static int __init pt_pmu_hw_init(void)
21930 &pt_pmu.caps[CR_EDX + i*4]);
21931 }
21932
21933- ret = -ENOMEM;
21934- size = sizeof(struct attribute *) * (ARRAY_SIZE(pt_caps)+1);
21935- attrs = kzalloc(size, GFP_KERNEL);
21936- if (!attrs)
21937- goto fail;
21938-
21939- size = sizeof(struct dev_ext_attribute) * (ARRAY_SIZE(pt_caps)+1);
21940- de_attrs = kzalloc(size, GFP_KERNEL);
21941- if (!de_attrs)
21942- goto fail;
21943-
21944+ pax_open_kernel();
21945 for (i = 0; i < ARRAY_SIZE(pt_caps); i++) {
21946- struct dev_ext_attribute *de_attr = de_attrs + i;
21947+ struct dev_ext_attribute *de_attr = &de_attrs[i];
21948
21949- de_attr->attr.attr.name = pt_caps[i].name;
21950+ *(const char **)&de_attr->attr.attr.name = pt_caps[i].name;
21951
21952 sysfs_attr_init(&de_attr->attr.attr);
21953
21954- de_attr->attr.attr.mode = S_IRUGO;
21955- de_attr->attr.show = pt_cap_show;
21956- de_attr->var = (void *)i;
21957+ *(umode_t *)&de_attr->attr.attr.mode = S_IRUGO;
21958+ *(void **)&de_attr->attr.show = pt_cap_show;
21959+ *(void **)&de_attr->var = (void *)i;
21960
21961 attrs[i] = &de_attr->attr.attr;
21962 }
21963
21964- pt_cap_group.attrs = attrs;
21965+ *(struct attribute ***)&pt_cap_group.attrs = attrs;
21966+ pax_close_kernel();
21967
21968 return 0;
21969-
21970-fail:
21971- kfree(attrs);
21972-
21973- return ret;
21974 }
21975
21976 #define PT_CONFIG_MASK (RTIT_CTL_TSC_EN | RTIT_CTL_DISRETC)
21977@@ -928,7 +910,7 @@ static void pt_event_start(struct perf_event *event, int mode)
21978 return;
21979 }
21980
21981- ACCESS_ONCE(pt->handle_nmi) = 1;
21982+ ACCESS_ONCE_RW(pt->handle_nmi) = 1;
21983 event->hw.state = 0;
21984
21985 pt_config_buffer(buf->cur->table, buf->cur_idx,
21986@@ -945,7 +927,7 @@ static void pt_event_stop(struct perf_event *event, int mode)
21987 * Protect against the PMI racing with disabling wrmsr,
21988 * see comment in intel_pt_interrupt().
21989 */
21990- ACCESS_ONCE(pt->handle_nmi) = 0;
21991+ ACCESS_ONCE_RW(pt->handle_nmi) = 0;
21992 pt_config_start(false);
21993
21994 if (event->hw.state == PERF_HES_STOPPED)
21995diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21996index 358c54a..f068235 100644
21997--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21998+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21999@@ -487,7 +487,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
22000 NULL,
22001 };
22002
22003-static struct attribute_group rapl_pmu_events_group = {
22004+static attribute_group_no_const rapl_pmu_events_group __read_only = {
22005 .name = "events",
22006 .attrs = NULL, /* patched at runtime */
22007 };
22008diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
22009index 90b7c50..7863ae3 100644
22010--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
22011+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
22012@@ -732,7 +732,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
22013 static int __init uncore_type_init(struct intel_uncore_type *type)
22014 {
22015 struct intel_uncore_pmu *pmus;
22016- struct attribute_group *attr_group;
22017+ attribute_group_no_const *attr_group;
22018 struct attribute **attrs;
22019 int i, j;
22020
22021diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
22022index ceac8f5..a562de7 100644
22023--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
22024+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
22025@@ -115,7 +115,7 @@ struct intel_uncore_box {
22026 struct uncore_event_desc {
22027 struct kobj_attribute attr;
22028 const char *config;
22029-};
22030+} __do_const;
22031
22032 ssize_t uncore_event_show(struct kobject *kobj,
22033 struct kobj_attribute *attr, char *buf);
22034diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
22035index 83741a7..bd3507d 100644
22036--- a/arch/x86/kernel/cpuid.c
22037+++ b/arch/x86/kernel/cpuid.c
22038@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
22039 return notifier_from_errno(err);
22040 }
22041
22042-static struct notifier_block __refdata cpuid_class_cpu_notifier =
22043+static struct notifier_block cpuid_class_cpu_notifier =
22044 {
22045 .notifier_call = cpuid_class_cpu_callback,
22046 };
22047diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
22048index afa64ad..dce67dd 100644
22049--- a/arch/x86/kernel/crash_dump_64.c
22050+++ b/arch/x86/kernel/crash_dump_64.c
22051@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
22052 return -ENOMEM;
22053
22054 if (userbuf) {
22055- if (copy_to_user(buf, vaddr + offset, csize)) {
22056+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
22057 iounmap(vaddr);
22058 return -EFAULT;
22059 }
22060diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
22061index f6dfd93..892ade4 100644
22062--- a/arch/x86/kernel/doublefault.c
22063+++ b/arch/x86/kernel/doublefault.c
22064@@ -12,7 +12,7 @@
22065
22066 #define DOUBLEFAULT_STACKSIZE (1024)
22067 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
22068-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
22069+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
22070
22071 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
22072
22073@@ -22,7 +22,7 @@ static void doublefault_fn(void)
22074 unsigned long gdt, tss;
22075
22076 native_store_gdt(&gdt_desc);
22077- gdt = gdt_desc.address;
22078+ gdt = (unsigned long)gdt_desc.address;
22079
22080 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
22081
22082@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
22083 /* 0x2 bit is always set */
22084 .flags = X86_EFLAGS_SF | 0x2,
22085 .sp = STACK_START,
22086- .es = __USER_DS,
22087+ .es = __KERNEL_DS,
22088 .cs = __KERNEL_CS,
22089 .ss = __KERNEL_DS,
22090- .ds = __USER_DS,
22091+ .ds = __KERNEL_DS,
22092 .fs = __KERNEL_PERCPU,
22093
22094 .__cr3 = __pa_nodebug(swapper_pg_dir),
22095diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
22096index 9c30acf..8cf2411 100644
22097--- a/arch/x86/kernel/dumpstack.c
22098+++ b/arch/x86/kernel/dumpstack.c
22099@@ -2,6 +2,9 @@
22100 * Copyright (C) 1991, 1992 Linus Torvalds
22101 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
22102 */
22103+#ifdef CONFIG_GRKERNSEC_HIDESYM
22104+#define __INCLUDED_BY_HIDESYM 1
22105+#endif
22106 #include <linux/kallsyms.h>
22107 #include <linux/kprobes.h>
22108 #include <linux/uaccess.h>
22109@@ -35,23 +38,21 @@ static void printk_stack_address(unsigned long address, int reliable,
22110
22111 void printk_address(unsigned long address)
22112 {
22113- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
22114+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
22115 }
22116
22117 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
22118 static void
22119 print_ftrace_graph_addr(unsigned long addr, void *data,
22120 const struct stacktrace_ops *ops,
22121- struct thread_info *tinfo, int *graph)
22122+ struct task_struct *task, int *graph)
22123 {
22124- struct task_struct *task;
22125 unsigned long ret_addr;
22126 int index;
22127
22128 if (addr != (unsigned long)return_to_handler)
22129 return;
22130
22131- task = tinfo->task;
22132 index = task->curr_ret_stack;
22133
22134 if (!task->ret_stack || index < *graph)
22135@@ -68,7 +69,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
22136 static inline void
22137 print_ftrace_graph_addr(unsigned long addr, void *data,
22138 const struct stacktrace_ops *ops,
22139- struct thread_info *tinfo, int *graph)
22140+ struct task_struct *task, int *graph)
22141 { }
22142 #endif
22143
22144@@ -79,10 +80,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
22145 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
22146 */
22147
22148-static inline int valid_stack_ptr(struct thread_info *tinfo,
22149- void *p, unsigned int size, void *end)
22150+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
22151 {
22152- void *t = tinfo;
22153 if (end) {
22154 if (p < end && p >= (end-THREAD_SIZE))
22155 return 1;
22156@@ -93,14 +92,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
22157 }
22158
22159 unsigned long
22160-print_context_stack(struct thread_info *tinfo,
22161+print_context_stack(struct task_struct *task, void *stack_start,
22162 unsigned long *stack, unsigned long bp,
22163 const struct stacktrace_ops *ops, void *data,
22164 unsigned long *end, int *graph)
22165 {
22166 struct stack_frame *frame = (struct stack_frame *)bp;
22167
22168- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
22169+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
22170 unsigned long addr;
22171
22172 addr = *stack;
22173@@ -112,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
22174 } else {
22175 ops->address(data, addr, 0);
22176 }
22177- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22178+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22179 }
22180 stack++;
22181 }
22182@@ -121,7 +120,7 @@ print_context_stack(struct thread_info *tinfo,
22183 EXPORT_SYMBOL_GPL(print_context_stack);
22184
22185 unsigned long
22186-print_context_stack_bp(struct thread_info *tinfo,
22187+print_context_stack_bp(struct task_struct *task, void *stack_start,
22188 unsigned long *stack, unsigned long bp,
22189 const struct stacktrace_ops *ops, void *data,
22190 unsigned long *end, int *graph)
22191@@ -129,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22192 struct stack_frame *frame = (struct stack_frame *)bp;
22193 unsigned long *ret_addr = &frame->return_address;
22194
22195- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
22196+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
22197 unsigned long addr = *ret_addr;
22198
22199 if (!__kernel_text_address(addr))
22200@@ -138,7 +137,7 @@ print_context_stack_bp(struct thread_info *tinfo,
22201 ops->address(data, addr, 1);
22202 frame = frame->next_frame;
22203 ret_addr = &frame->return_address;
22204- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
22205+ print_ftrace_graph_addr(addr, data, ops, task, graph);
22206 }
22207
22208 return (unsigned long)frame;
22209@@ -226,6 +225,8 @@ unsigned long oops_begin(void)
22210 EXPORT_SYMBOL_GPL(oops_begin);
22211 NOKPROBE_SYMBOL(oops_begin);
22212
22213+extern void gr_handle_kernel_exploit(void);
22214+
22215 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22216 {
22217 if (regs && kexec_should_crash(current))
22218@@ -247,7 +248,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22219 panic("Fatal exception in interrupt");
22220 if (panic_on_oops)
22221 panic("Fatal exception");
22222- do_exit(signr);
22223+
22224+ gr_handle_kernel_exploit();
22225+
22226+ do_group_exit(signr);
22227 }
22228 NOKPROBE_SYMBOL(oops_end);
22229
22230diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22231index 464ffd6..01f2cda 100644
22232--- a/arch/x86/kernel/dumpstack_32.c
22233+++ b/arch/x86/kernel/dumpstack_32.c
22234@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22235 bp = stack_frame(task, regs);
22236
22237 for (;;) {
22238- struct thread_info *context;
22239+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22240 void *end_stack;
22241
22242 end_stack = is_hardirq_stack(stack, cpu);
22243 if (!end_stack)
22244 end_stack = is_softirq_stack(stack, cpu);
22245
22246- context = task_thread_info(task);
22247- bp = ops->walk_stack(context, stack, bp, ops, data,
22248+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22249 end_stack, &graph);
22250
22251 /* Stop if not on irq stack */
22252@@ -137,16 +136,17 @@ void show_regs(struct pt_regs *regs)
22253 unsigned int code_len = code_bytes;
22254 unsigned char c;
22255 u8 *ip;
22256+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22257
22258 pr_emerg("Stack:\n");
22259 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22260
22261 pr_emerg("Code:");
22262
22263- ip = (u8 *)regs->ip - code_prologue;
22264+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22265 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22266 /* try starting at IP */
22267- ip = (u8 *)regs->ip;
22268+ ip = (u8 *)regs->ip + cs_base;
22269 code_len = code_len - code_prologue + 1;
22270 }
22271 for (i = 0; i < code_len; i++, ip++) {
22272@@ -155,7 +155,7 @@ void show_regs(struct pt_regs *regs)
22273 pr_cont(" Bad EIP value.");
22274 break;
22275 }
22276- if (ip == (u8 *)regs->ip)
22277+ if (ip == (u8 *)regs->ip + cs_base)
22278 pr_cont(" <%02x>", c);
22279 else
22280 pr_cont(" %02x", c);
22281@@ -168,6 +168,7 @@ int is_valid_bugaddr(unsigned long ip)
22282 {
22283 unsigned short ud2;
22284
22285+ ip = ktla_ktva(ip);
22286 if (ip < PAGE_OFFSET)
22287 return 0;
22288 if (probe_kernel_address((unsigned short *)ip, ud2))
22289@@ -175,3 +176,15 @@ int is_valid_bugaddr(unsigned long ip)
22290
22291 return ud2 == 0x0b0f;
22292 }
22293+
22294+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22295+void __used pax_check_alloca(unsigned long size)
22296+{
22297+ unsigned long sp = (unsigned long)&sp, stack_left;
22298+
22299+ /* all kernel stacks are of the same size */
22300+ stack_left = sp & (THREAD_SIZE - 1);
22301+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22302+}
22303+EXPORT_SYMBOL(pax_check_alloca);
22304+#endif
22305diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22306index 5f1c626..1cba97e 100644
22307--- a/arch/x86/kernel/dumpstack_64.c
22308+++ b/arch/x86/kernel/dumpstack_64.c
22309@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22310 const struct stacktrace_ops *ops, void *data)
22311 {
22312 const unsigned cpu = get_cpu();
22313- struct thread_info *tinfo;
22314 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22315 unsigned long dummy;
22316 unsigned used = 0;
22317 int graph = 0;
22318 int done = 0;
22319+ void *stack_start;
22320
22321 if (!task)
22322 task = current;
22323@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22324 * current stack address. If the stacks consist of nested
22325 * exceptions
22326 */
22327- tinfo = task_thread_info(task);
22328 while (!done) {
22329 unsigned long *stack_end;
22330 enum stack_type stype;
22331@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22332 if (ops->stack(data, id) < 0)
22333 break;
22334
22335- bp = ops->walk_stack(tinfo, stack, bp, ops,
22336+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22337 data, stack_end, &graph);
22338 ops->stack(data, "<EOE>");
22339 /*
22340@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22341 * second-to-last pointer (index -2 to end) in the
22342 * exception stack:
22343 */
22344+ if ((u16)stack_end[-1] != __KERNEL_DS)
22345+ goto out;
22346 stack = (unsigned long *) stack_end[-2];
22347 done = 0;
22348 break;
22349@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22350
22351 if (ops->stack(data, "IRQ") < 0)
22352 break;
22353- bp = ops->walk_stack(tinfo, stack, bp,
22354+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22355 ops, data, stack_end, &graph);
22356 /*
22357 * We link to the next stack (which would be
22358@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22359 /*
22360 * This handles the process stack:
22361 */
22362- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22363+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22364+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22365+out:
22366 put_cpu();
22367 }
22368 EXPORT_SYMBOL(dump_trace);
22369@@ -347,8 +350,55 @@ int is_valid_bugaddr(unsigned long ip)
22370 {
22371 unsigned short ud2;
22372
22373- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22374+ if (probe_kernel_address((unsigned short *)ip, ud2))
22375 return 0;
22376
22377 return ud2 == 0x0b0f;
22378 }
22379+
22380+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22381+void __used pax_check_alloca(unsigned long size)
22382+{
22383+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22384+ unsigned cpu, used;
22385+ char *id;
22386+
22387+ /* check the process stack first */
22388+ stack_start = (unsigned long)task_stack_page(current);
22389+ stack_end = stack_start + THREAD_SIZE;
22390+ if (likely(stack_start <= sp && sp < stack_end)) {
22391+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22392+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22393+ return;
22394+ }
22395+
22396+ cpu = get_cpu();
22397+
22398+ /* check the irq stacks */
22399+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22400+ stack_start = stack_end - IRQ_STACK_SIZE;
22401+ if (stack_start <= sp && sp < stack_end) {
22402+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22403+ put_cpu();
22404+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22405+ return;
22406+ }
22407+
22408+ /* check the exception stacks */
22409+ used = 0;
22410+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22411+ stack_start = stack_end - EXCEPTION_STKSZ;
22412+ if (stack_end && stack_start <= sp && sp < stack_end) {
22413+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22414+ put_cpu();
22415+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22416+ return;
22417+ }
22418+
22419+ put_cpu();
22420+
22421+ /* unknown stack */
22422+ BUG();
22423+}
22424+EXPORT_SYMBOL(pax_check_alloca);
22425+#endif
22426diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22427index e2ce85d..00ccad0 100644
22428--- a/arch/x86/kernel/e820.c
22429+++ b/arch/x86/kernel/e820.c
22430@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22431
22432 static void early_panic(char *msg)
22433 {
22434- early_printk(msg);
22435- panic(msg);
22436+ early_printk("%s", msg);
22437+ panic("%s", msg);
22438 }
22439
22440 static int userdef __initdata;
22441diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22442index 89427d8..00c0d52 100644
22443--- a/arch/x86/kernel/early_printk.c
22444+++ b/arch/x86/kernel/early_printk.c
22445@@ -7,6 +7,7 @@
22446 #include <linux/pci_regs.h>
22447 #include <linux/pci_ids.h>
22448 #include <linux/errno.h>
22449+#include <linux/sched.h>
22450 #include <asm/io.h>
22451 #include <asm/processor.h>
22452 #include <asm/fcntl.h>
22453diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22454index 1c30976..71b41b9 100644
22455--- a/arch/x86/kernel/entry_32.S
22456+++ b/arch/x86/kernel/entry_32.S
22457@@ -177,13 +177,154 @@
22458 /*CFI_REL_OFFSET gs, PT_GS*/
22459 .endm
22460 .macro SET_KERNEL_GS reg
22461+
22462+#ifdef CONFIG_CC_STACKPROTECTOR
22463 movl $(__KERNEL_STACK_CANARY), \reg
22464+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22465+ movl $(__USER_DS), \reg
22466+#else
22467+ xorl \reg, \reg
22468+#endif
22469+
22470 movl \reg, %gs
22471 .endm
22472
22473 #endif /* CONFIG_X86_32_LAZY_GS */
22474
22475-.macro SAVE_ALL
22476+.macro pax_enter_kernel
22477+#ifdef CONFIG_PAX_KERNEXEC
22478+ call pax_enter_kernel
22479+#endif
22480+.endm
22481+
22482+.macro pax_exit_kernel
22483+#ifdef CONFIG_PAX_KERNEXEC
22484+ call pax_exit_kernel
22485+#endif
22486+.endm
22487+
22488+#ifdef CONFIG_PAX_KERNEXEC
22489+ENTRY(pax_enter_kernel)
22490+#ifdef CONFIG_PARAVIRT
22491+ pushl %eax
22492+ pushl %ecx
22493+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22494+ mov %eax, %esi
22495+#else
22496+ mov %cr0, %esi
22497+#endif
22498+ bts $X86_CR0_WP_BIT, %esi
22499+ jnc 1f
22500+ mov %cs, %esi
22501+ cmp $__KERNEL_CS, %esi
22502+ jz 3f
22503+ ljmp $__KERNEL_CS, $3f
22504+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22505+2:
22506+#ifdef CONFIG_PARAVIRT
22507+ mov %esi, %eax
22508+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22509+#else
22510+ mov %esi, %cr0
22511+#endif
22512+3:
22513+#ifdef CONFIG_PARAVIRT
22514+ popl %ecx
22515+ popl %eax
22516+#endif
22517+ ret
22518+ENDPROC(pax_enter_kernel)
22519+
22520+ENTRY(pax_exit_kernel)
22521+#ifdef CONFIG_PARAVIRT
22522+ pushl %eax
22523+ pushl %ecx
22524+#endif
22525+ mov %cs, %esi
22526+ cmp $__KERNEXEC_KERNEL_CS, %esi
22527+ jnz 2f
22528+#ifdef CONFIG_PARAVIRT
22529+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22530+ mov %eax, %esi
22531+#else
22532+ mov %cr0, %esi
22533+#endif
22534+ btr $X86_CR0_WP_BIT, %esi
22535+ ljmp $__KERNEL_CS, $1f
22536+1:
22537+#ifdef CONFIG_PARAVIRT
22538+ mov %esi, %eax
22539+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22540+#else
22541+ mov %esi, %cr0
22542+#endif
22543+2:
22544+#ifdef CONFIG_PARAVIRT
22545+ popl %ecx
22546+ popl %eax
22547+#endif
22548+ ret
22549+ENDPROC(pax_exit_kernel)
22550+#endif
22551+
22552+ .macro pax_erase_kstack
22553+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22554+ call pax_erase_kstack
22555+#endif
22556+ .endm
22557+
22558+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22559+/*
22560+ * ebp: thread_info
22561+ */
22562+ENTRY(pax_erase_kstack)
22563+ pushl %edi
22564+ pushl %ecx
22565+ pushl %eax
22566+
22567+ mov TI_lowest_stack(%ebp), %edi
22568+ mov $-0xBEEF, %eax
22569+ std
22570+
22571+1: mov %edi, %ecx
22572+ and $THREAD_SIZE_asm - 1, %ecx
22573+ shr $2, %ecx
22574+ repne scasl
22575+ jecxz 2f
22576+
22577+ cmp $2*16, %ecx
22578+ jc 2f
22579+
22580+ mov $2*16, %ecx
22581+ repe scasl
22582+ jecxz 2f
22583+ jne 1b
22584+
22585+2: cld
22586+ or $2*4, %edi
22587+ mov %esp, %ecx
22588+ sub %edi, %ecx
22589+
22590+ cmp $THREAD_SIZE_asm, %ecx
22591+ jb 3f
22592+ ud2
22593+3:
22594+
22595+ shr $2, %ecx
22596+ rep stosl
22597+
22598+ mov TI_task_thread_sp0(%ebp), %edi
22599+ sub $128, %edi
22600+ mov %edi, TI_lowest_stack(%ebp)
22601+
22602+ popl %eax
22603+ popl %ecx
22604+ popl %edi
22605+ ret
22606+ENDPROC(pax_erase_kstack)
22607+#endif
22608+
22609+.macro __SAVE_ALL _DS
22610 cld
22611 PUSH_GS
22612 pushl_cfi %fs
22613@@ -206,7 +347,7 @@
22614 CFI_REL_OFFSET ecx, 0
22615 pushl_cfi %ebx
22616 CFI_REL_OFFSET ebx, 0
22617- movl $(__USER_DS), %edx
22618+ movl $\_DS, %edx
22619 movl %edx, %ds
22620 movl %edx, %es
22621 movl $(__KERNEL_PERCPU), %edx
22622@@ -214,6 +355,15 @@
22623 SET_KERNEL_GS %edx
22624 .endm
22625
22626+.macro SAVE_ALL
22627+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22628+ __SAVE_ALL __KERNEL_DS
22629+ pax_enter_kernel
22630+#else
22631+ __SAVE_ALL __USER_DS
22632+#endif
22633+.endm
22634+
22635 .macro RESTORE_INT_REGS
22636 popl_cfi %ebx
22637 CFI_RESTORE ebx
22638@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22639 popfl_cfi
22640 jmp syscall_exit
22641 CFI_ENDPROC
22642-END(ret_from_fork)
22643+ENDPROC(ret_from_fork)
22644
22645 ENTRY(ret_from_kernel_thread)
22646 CFI_STARTPROC
22647@@ -340,7 +490,15 @@ ret_from_intr:
22648 andl $SEGMENT_RPL_MASK, %eax
22649 #endif
22650 cmpl $USER_RPL, %eax
22651+
22652+#ifdef CONFIG_PAX_KERNEXEC
22653+ jae resume_userspace
22654+
22655+ pax_exit_kernel
22656+ jmp resume_kernel
22657+#else
22658 jb resume_kernel # not returning to v8086 or userspace
22659+#endif
22660
22661 ENTRY(resume_userspace)
22662 LOCKDEP_SYS_EXIT
22663@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22664 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22665 # int/exception return?
22666 jne work_pending
22667- jmp restore_all
22668-END(ret_from_exception)
22669+ jmp restore_all_pax
22670+ENDPROC(ret_from_exception)
22671
22672 #ifdef CONFIG_PREEMPT
22673 ENTRY(resume_kernel)
22674@@ -365,7 +523,7 @@ need_resched:
22675 jz restore_all
22676 call preempt_schedule_irq
22677 jmp need_resched
22678-END(resume_kernel)
22679+ENDPROC(resume_kernel)
22680 #endif
22681 CFI_ENDPROC
22682
22683@@ -395,33 +553,45 @@ sysenter_past_esp:
22684 /*CFI_REL_OFFSET cs, 0*/
22685 /*
22686 * Push current_thread_info()->sysenter_return to the stack.
22687- * A tiny bit of offset fixup is necessary: TI_sysenter_return
22688- * is relative to thread_info, which is at the bottom of the
22689- * kernel stack page. 4*4 means the 4 words pushed above;
22690- * TOP_OF_KERNEL_STACK_PADDING takes us to the top of the stack;
22691- * and THREAD_SIZE takes us to the bottom.
22692 */
22693- pushl_cfi ((TI_sysenter_return) - THREAD_SIZE + TOP_OF_KERNEL_STACK_PADDING + 4*4)(%esp)
22694+ pushl_cfi $0
22695 CFI_REL_OFFSET eip, 0
22696
22697 pushl_cfi %eax
22698 SAVE_ALL
22699+ GET_THREAD_INFO(%ebp)
22700+ movl TI_sysenter_return(%ebp),%ebp
22701+ movl %ebp,PT_EIP(%esp)
22702 ENABLE_INTERRUPTS(CLBR_NONE)
22703
22704 /*
22705 * Load the potential sixth argument from user stack.
22706 * Careful about security.
22707 */
22708+ movl PT_OLDESP(%esp),%ebp
22709+
22710+#ifdef CONFIG_PAX_MEMORY_UDEREF
22711+ mov PT_OLDSS(%esp),%ds
22712+1: movl %ds:(%ebp),%ebp
22713+ push %ss
22714+ pop %ds
22715+#else
22716 cmpl $__PAGE_OFFSET-3,%ebp
22717 jae syscall_fault
22718 ASM_STAC
22719 1: movl (%ebp),%ebp
22720 ASM_CLAC
22721+#endif
22722+
22723 movl %ebp,PT_EBP(%esp)
22724 _ASM_EXTABLE(1b,syscall_fault)
22725
22726 GET_THREAD_INFO(%ebp)
22727
22728+#ifdef CONFIG_PAX_RANDKSTACK
22729+ pax_erase_kstack
22730+#endif
22731+
22732 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22733 jnz sysenter_audit
22734 sysenter_do_call:
22735@@ -437,12 +607,24 @@ sysenter_after_call:
22736 testl $_TIF_ALLWORK_MASK, %ecx
22737 jnz sysexit_audit
22738 sysenter_exit:
22739+
22740+#ifdef CONFIG_PAX_RANDKSTACK
22741+ pushl_cfi %eax
22742+ movl %esp, %eax
22743+ call pax_randomize_kstack
22744+ popl_cfi %eax
22745+#endif
22746+
22747+ pax_erase_kstack
22748+
22749 /* if something modifies registers it must also disable sysexit */
22750 movl PT_EIP(%esp), %edx
22751 movl PT_OLDESP(%esp), %ecx
22752 xorl %ebp,%ebp
22753 TRACE_IRQS_ON
22754 1: mov PT_FS(%esp), %fs
22755+2: mov PT_DS(%esp), %ds
22756+3: mov PT_ES(%esp), %es
22757 PTGS_TO_GS
22758 ENABLE_INTERRUPTS_SYSEXIT
22759
22760@@ -456,6 +638,9 @@ sysenter_audit:
22761 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22762 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22763 call __audit_syscall_entry
22764+
22765+ pax_erase_kstack
22766+
22767 popl_cfi %ecx /* get that remapped edx off the stack */
22768 popl_cfi %ecx /* get that remapped esi off the stack */
22769 movl PT_EAX(%esp),%eax /* reload syscall number */
22770@@ -482,10 +667,16 @@ sysexit_audit:
22771
22772 CFI_ENDPROC
22773 .pushsection .fixup,"ax"
22774-2: movl $0,PT_FS(%esp)
22775+4: movl $0,PT_FS(%esp)
22776+ jmp 1b
22777+5: movl $0,PT_DS(%esp)
22778+ jmp 1b
22779+6: movl $0,PT_ES(%esp)
22780 jmp 1b
22781 .popsection
22782- _ASM_EXTABLE(1b,2b)
22783+ _ASM_EXTABLE(1b,4b)
22784+ _ASM_EXTABLE(2b,5b)
22785+ _ASM_EXTABLE(3b,6b)
22786 PTGS_TO_GS_EX
22787 ENDPROC(ia32_sysenter_target)
22788
22789@@ -496,6 +687,11 @@ ENTRY(system_call)
22790 pushl_cfi %eax # save orig_eax
22791 SAVE_ALL
22792 GET_THREAD_INFO(%ebp)
22793+
22794+#ifdef CONFIG_PAX_RANDKSTACK
22795+ pax_erase_kstack
22796+#endif
22797+
22798 # system call tracing in operation / emulation
22799 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22800 jnz syscall_trace_entry
22801@@ -515,6 +711,15 @@ syscall_exit:
22802 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22803 jnz syscall_exit_work
22804
22805+restore_all_pax:
22806+
22807+#ifdef CONFIG_PAX_RANDKSTACK
22808+ movl %esp, %eax
22809+ call pax_randomize_kstack
22810+#endif
22811+
22812+ pax_erase_kstack
22813+
22814 restore_all:
22815 TRACE_IRQS_IRET
22816 restore_all_notrace:
22817@@ -569,14 +774,34 @@ ldt_ss:
22818 * compensating for the offset by changing to the ESPFIX segment with
22819 * a base address that matches for the difference.
22820 */
22821-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22822+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22823 mov %esp, %edx /* load kernel esp */
22824 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22825 mov %dx, %ax /* eax: new kernel esp */
22826 sub %eax, %edx /* offset (low word is 0) */
22827+#ifdef CONFIG_SMP
22828+ movl PER_CPU_VAR(cpu_number), %ebx
22829+ shll $PAGE_SHIFT_asm, %ebx
22830+ addl $cpu_gdt_table, %ebx
22831+#else
22832+ movl $cpu_gdt_table, %ebx
22833+#endif
22834 shr $16, %edx
22835- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22836- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22837+
22838+#ifdef CONFIG_PAX_KERNEXEC
22839+ mov %cr0, %esi
22840+ btr $X86_CR0_WP_BIT, %esi
22841+ mov %esi, %cr0
22842+#endif
22843+
22844+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22845+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22846+
22847+#ifdef CONFIG_PAX_KERNEXEC
22848+ bts $X86_CR0_WP_BIT, %esi
22849+ mov %esi, %cr0
22850+#endif
22851+
22852 pushl_cfi $__ESPFIX_SS
22853 pushl_cfi %eax /* new kernel esp */
22854 /* Disable interrupts, but do not irqtrace this section: we
22855@@ -606,20 +831,18 @@ work_resched:
22856 movl TI_flags(%ebp), %ecx
22857 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22858 # than syscall tracing?
22859- jz restore_all
22860+ jz restore_all_pax
22861 testb $_TIF_NEED_RESCHED, %cl
22862 jnz work_resched
22863
22864 work_notifysig: # deal with pending signals and
22865 # notify-resume requests
22866+ movl %esp, %eax
22867 #ifdef CONFIG_VM86
22868 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22869- movl %esp, %eax
22870 jnz work_notifysig_v86 # returning to kernel-space or
22871 # vm86-space
22872 1:
22873-#else
22874- movl %esp, %eax
22875 #endif
22876 TRACE_IRQS_ON
22877 ENABLE_INTERRUPTS(CLBR_NONE)
22878@@ -640,7 +863,7 @@ work_notifysig_v86:
22879 movl %eax, %esp
22880 jmp 1b
22881 #endif
22882-END(work_pending)
22883+ENDPROC(work_pending)
22884
22885 # perform syscall exit tracing
22886 ALIGN
22887@@ -648,11 +871,14 @@ syscall_trace_entry:
22888 movl $-ENOSYS,PT_EAX(%esp)
22889 movl %esp, %eax
22890 call syscall_trace_enter
22891+
22892+ pax_erase_kstack
22893+
22894 /* What it returned is what we'll actually use. */
22895 cmpl $(NR_syscalls), %eax
22896 jnae syscall_call
22897 jmp syscall_exit
22898-END(syscall_trace_entry)
22899+ENDPROC(syscall_trace_entry)
22900
22901 # perform syscall exit tracing
22902 ALIGN
22903@@ -665,26 +891,30 @@ syscall_exit_work:
22904 movl %esp, %eax
22905 call syscall_trace_leave
22906 jmp resume_userspace
22907-END(syscall_exit_work)
22908+ENDPROC(syscall_exit_work)
22909 CFI_ENDPROC
22910
22911 RING0_INT_FRAME # can't unwind into user space anyway
22912 syscall_fault:
22913+#ifdef CONFIG_PAX_MEMORY_UDEREF
22914+ push %ss
22915+ pop %ds
22916+#endif
22917 ASM_CLAC
22918 GET_THREAD_INFO(%ebp)
22919 movl $-EFAULT,PT_EAX(%esp)
22920 jmp resume_userspace
22921-END(syscall_fault)
22922+ENDPROC(syscall_fault)
22923
22924 syscall_badsys:
22925 movl $-ENOSYS,%eax
22926 jmp syscall_after_call
22927-END(syscall_badsys)
22928+ENDPROC(syscall_badsys)
22929
22930 sysenter_badsys:
22931 movl $-ENOSYS,%eax
22932 jmp sysenter_after_call
22933-END(sysenter_badsys)
22934+ENDPROC(sysenter_badsys)
22935 CFI_ENDPROC
22936
22937 .macro FIXUP_ESPFIX_STACK
22938@@ -697,8 +927,15 @@ END(sysenter_badsys)
22939 */
22940 #ifdef CONFIG_X86_ESPFIX32
22941 /* fixup the stack */
22942- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22943- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22944+#ifdef CONFIG_SMP
22945+ movl PER_CPU_VAR(cpu_number), %ebx
22946+ shll $PAGE_SHIFT_asm, %ebx
22947+ addl $cpu_gdt_table, %ebx
22948+#else
22949+ movl $cpu_gdt_table, %ebx
22950+#endif
22951+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22952+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22953 shl $16, %eax
22954 addl %esp, %eax /* the adjusted stack pointer */
22955 pushl_cfi $__KERNEL_DS
22956@@ -737,7 +974,7 @@ ENTRY(irq_entries_start)
22957 CFI_ADJUST_CFA_OFFSET -4
22958 .align 8
22959 .endr
22960-END(irq_entries_start)
22961+ENDPROC(irq_entries_start)
22962
22963 /*
22964 * the CPU automatically disables interrupts when executing an IRQ vector,
22965@@ -790,7 +1027,7 @@ ENTRY(coprocessor_error)
22966 pushl_cfi $do_coprocessor_error
22967 jmp error_code
22968 CFI_ENDPROC
22969-END(coprocessor_error)
22970+ENDPROC(coprocessor_error)
22971
22972 ENTRY(simd_coprocessor_error)
22973 RING0_INT_FRAME
22974@@ -806,7 +1043,7 @@ ENTRY(simd_coprocessor_error)
22975 #endif
22976 jmp error_code
22977 CFI_ENDPROC
22978-END(simd_coprocessor_error)
22979+ENDPROC(simd_coprocessor_error)
22980
22981 ENTRY(device_not_available)
22982 RING0_INT_FRAME
22983@@ -815,18 +1052,18 @@ ENTRY(device_not_available)
22984 pushl_cfi $do_device_not_available
22985 jmp error_code
22986 CFI_ENDPROC
22987-END(device_not_available)
22988+ENDPROC(device_not_available)
22989
22990 #ifdef CONFIG_PARAVIRT
22991 ENTRY(native_iret)
22992 iret
22993 _ASM_EXTABLE(native_iret, iret_exc)
22994-END(native_iret)
22995+ENDPROC(native_iret)
22996
22997 ENTRY(native_irq_enable_sysexit)
22998 sti
22999 sysexit
23000-END(native_irq_enable_sysexit)
23001+ENDPROC(native_irq_enable_sysexit)
23002 #endif
23003
23004 ENTRY(overflow)
23005@@ -836,7 +1073,7 @@ ENTRY(overflow)
23006 pushl_cfi $do_overflow
23007 jmp error_code
23008 CFI_ENDPROC
23009-END(overflow)
23010+ENDPROC(overflow)
23011
23012 ENTRY(bounds)
23013 RING0_INT_FRAME
23014@@ -845,7 +1082,7 @@ ENTRY(bounds)
23015 pushl_cfi $do_bounds
23016 jmp error_code
23017 CFI_ENDPROC
23018-END(bounds)
23019+ENDPROC(bounds)
23020
23021 ENTRY(invalid_op)
23022 RING0_INT_FRAME
23023@@ -854,7 +1091,7 @@ ENTRY(invalid_op)
23024 pushl_cfi $do_invalid_op
23025 jmp error_code
23026 CFI_ENDPROC
23027-END(invalid_op)
23028+ENDPROC(invalid_op)
23029
23030 ENTRY(coprocessor_segment_overrun)
23031 RING0_INT_FRAME
23032@@ -863,7 +1100,7 @@ ENTRY(coprocessor_segment_overrun)
23033 pushl_cfi $do_coprocessor_segment_overrun
23034 jmp error_code
23035 CFI_ENDPROC
23036-END(coprocessor_segment_overrun)
23037+ENDPROC(coprocessor_segment_overrun)
23038
23039 ENTRY(invalid_TSS)
23040 RING0_EC_FRAME
23041@@ -871,7 +1108,7 @@ ENTRY(invalid_TSS)
23042 pushl_cfi $do_invalid_TSS
23043 jmp error_code
23044 CFI_ENDPROC
23045-END(invalid_TSS)
23046+ENDPROC(invalid_TSS)
23047
23048 ENTRY(segment_not_present)
23049 RING0_EC_FRAME
23050@@ -879,7 +1116,7 @@ ENTRY(segment_not_present)
23051 pushl_cfi $do_segment_not_present
23052 jmp error_code
23053 CFI_ENDPROC
23054-END(segment_not_present)
23055+ENDPROC(segment_not_present)
23056
23057 ENTRY(stack_segment)
23058 RING0_EC_FRAME
23059@@ -887,7 +1124,7 @@ ENTRY(stack_segment)
23060 pushl_cfi $do_stack_segment
23061 jmp error_code
23062 CFI_ENDPROC
23063-END(stack_segment)
23064+ENDPROC(stack_segment)
23065
23066 ENTRY(alignment_check)
23067 RING0_EC_FRAME
23068@@ -895,7 +1132,7 @@ ENTRY(alignment_check)
23069 pushl_cfi $do_alignment_check
23070 jmp error_code
23071 CFI_ENDPROC
23072-END(alignment_check)
23073+ENDPROC(alignment_check)
23074
23075 ENTRY(divide_error)
23076 RING0_INT_FRAME
23077@@ -904,7 +1141,7 @@ ENTRY(divide_error)
23078 pushl_cfi $do_divide_error
23079 jmp error_code
23080 CFI_ENDPROC
23081-END(divide_error)
23082+ENDPROC(divide_error)
23083
23084 #ifdef CONFIG_X86_MCE
23085 ENTRY(machine_check)
23086@@ -914,7 +1151,7 @@ ENTRY(machine_check)
23087 pushl_cfi machine_check_vector
23088 jmp error_code
23089 CFI_ENDPROC
23090-END(machine_check)
23091+ENDPROC(machine_check)
23092 #endif
23093
23094 ENTRY(spurious_interrupt_bug)
23095@@ -924,7 +1161,7 @@ ENTRY(spurious_interrupt_bug)
23096 pushl_cfi $do_spurious_interrupt_bug
23097 jmp error_code
23098 CFI_ENDPROC
23099-END(spurious_interrupt_bug)
23100+ENDPROC(spurious_interrupt_bug)
23101
23102 #ifdef CONFIG_XEN
23103 /* Xen doesn't set %esp to be precisely what the normal sysenter
23104@@ -1033,7 +1270,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
23105
23106 ENTRY(mcount)
23107 ret
23108-END(mcount)
23109+ENDPROC(mcount)
23110
23111 ENTRY(ftrace_caller)
23112 pushl %eax
23113@@ -1063,7 +1300,7 @@ ftrace_graph_call:
23114 .globl ftrace_stub
23115 ftrace_stub:
23116 ret
23117-END(ftrace_caller)
23118+ENDPROC(ftrace_caller)
23119
23120 ENTRY(ftrace_regs_caller)
23121 pushf /* push flags before compare (in cs location) */
23122@@ -1161,7 +1398,7 @@ trace:
23123 popl %ecx
23124 popl %eax
23125 jmp ftrace_stub
23126-END(mcount)
23127+ENDPROC(mcount)
23128 #endif /* CONFIG_DYNAMIC_FTRACE */
23129 #endif /* CONFIG_FUNCTION_TRACER */
23130
23131@@ -1179,7 +1416,7 @@ ENTRY(ftrace_graph_caller)
23132 popl %ecx
23133 popl %eax
23134 ret
23135-END(ftrace_graph_caller)
23136+ENDPROC(ftrace_graph_caller)
23137
23138 .globl return_to_handler
23139 return_to_handler:
23140@@ -1233,15 +1470,18 @@ error_code:
23141 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
23142 REG_TO_PTGS %ecx
23143 SET_KERNEL_GS %ecx
23144- movl $(__USER_DS), %ecx
23145+ movl $(__KERNEL_DS), %ecx
23146 movl %ecx, %ds
23147 movl %ecx, %es
23148+
23149+ pax_enter_kernel
23150+
23151 TRACE_IRQS_OFF
23152 movl %esp,%eax # pt_regs pointer
23153 call *%edi
23154 jmp ret_from_exception
23155 CFI_ENDPROC
23156-END(page_fault)
23157+ENDPROC(page_fault)
23158
23159 /*
23160 * Debug traps and NMI can happen at the one SYSENTER instruction
23161@@ -1284,7 +1524,7 @@ debug_stack_correct:
23162 call do_debug
23163 jmp ret_from_exception
23164 CFI_ENDPROC
23165-END(debug)
23166+ENDPROC(debug)
23167
23168 /*
23169 * NMI is doubly nasty. It can happen _while_ we're handling
23170@@ -1324,6 +1564,9 @@ nmi_stack_correct:
23171 xorl %edx,%edx # zero error code
23172 movl %esp,%eax # pt_regs pointer
23173 call do_nmi
23174+
23175+ pax_exit_kernel
23176+
23177 jmp restore_all_notrace
23178 CFI_ENDPROC
23179
23180@@ -1361,13 +1604,16 @@ nmi_espfix_stack:
23181 FIXUP_ESPFIX_STACK # %eax == %esp
23182 xorl %edx,%edx # zero error code
23183 call do_nmi
23184+
23185+ pax_exit_kernel
23186+
23187 RESTORE_REGS
23188 lss 12+4(%esp), %esp # back to espfix stack
23189 CFI_ADJUST_CFA_OFFSET -24
23190 jmp irq_return
23191 #endif
23192 CFI_ENDPROC
23193-END(nmi)
23194+ENDPROC(nmi)
23195
23196 ENTRY(int3)
23197 RING0_INT_FRAME
23198@@ -1380,14 +1626,14 @@ ENTRY(int3)
23199 call do_int3
23200 jmp ret_from_exception
23201 CFI_ENDPROC
23202-END(int3)
23203+ENDPROC(int3)
23204
23205 ENTRY(general_protection)
23206 RING0_EC_FRAME
23207 pushl_cfi $do_general_protection
23208 jmp error_code
23209 CFI_ENDPROC
23210-END(general_protection)
23211+ENDPROC(general_protection)
23212
23213 #ifdef CONFIG_KVM_GUEST
23214 ENTRY(async_page_fault)
23215@@ -1396,6 +1642,6 @@ ENTRY(async_page_fault)
23216 pushl_cfi $do_async_page_fault
23217 jmp error_code
23218 CFI_ENDPROC
23219-END(async_page_fault)
23220+ENDPROC(async_page_fault)
23221 #endif
23222
23223diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23224index 4bd6c19..a0eba01 100644
23225--- a/arch/x86/kernel/entry_64.S
23226+++ b/arch/x86/kernel/entry_64.S
23227@@ -46,6 +46,8 @@
23228 #include <asm/smap.h>
23229 #include <asm/pgtable_types.h>
23230 #include <linux/err.h>
23231+#include <asm/pgtable.h>
23232+#include <asm/alternative-asm.h>
23233
23234 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23235 #include <linux/elf-em.h>
23236@@ -64,6 +66,401 @@ ENTRY(native_usergs_sysret64)
23237 ENDPROC(native_usergs_sysret64)
23238 #endif /* CONFIG_PARAVIRT */
23239
23240+ .macro ljmpq sel, off
23241+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23242+ .byte 0x48; ljmp *1234f(%rip)
23243+ .pushsection .rodata
23244+ .align 16
23245+ 1234: .quad \off; .word \sel
23246+ .popsection
23247+#else
23248+ pushq $\sel
23249+ pushq $\off
23250+ lretq
23251+#endif
23252+ .endm
23253+
23254+ .macro pax_enter_kernel
23255+ pax_set_fptr_mask
23256+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23257+ call pax_enter_kernel
23258+#endif
23259+ .endm
23260+
23261+ .macro pax_exit_kernel
23262+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23263+ call pax_exit_kernel
23264+#endif
23265+ .endm
23266+
23267+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23268+ENTRY(pax_enter_kernel)
23269+ pushq %rdi
23270+
23271+#ifdef CONFIG_PARAVIRT
23272+ PV_SAVE_REGS(CLBR_RDI)
23273+#endif
23274+
23275+#ifdef CONFIG_PAX_KERNEXEC
23276+ GET_CR0_INTO_RDI
23277+ bts $X86_CR0_WP_BIT,%rdi
23278+ jnc 3f
23279+ mov %cs,%edi
23280+ cmp $__KERNEL_CS,%edi
23281+ jnz 2f
23282+1:
23283+#endif
23284+
23285+#ifdef CONFIG_PAX_MEMORY_UDEREF
23286+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23287+ GET_CR3_INTO_RDI
23288+ cmp $0,%dil
23289+ jnz 112f
23290+ mov $__KERNEL_DS,%edi
23291+ mov %edi,%ss
23292+ jmp 111f
23293+112: cmp $1,%dil
23294+ jz 113f
23295+ ud2
23296+113: sub $4097,%rdi
23297+ bts $63,%rdi
23298+ SET_RDI_INTO_CR3
23299+ mov $__UDEREF_KERNEL_DS,%edi
23300+ mov %edi,%ss
23301+111:
23302+#endif
23303+
23304+#ifdef CONFIG_PARAVIRT
23305+ PV_RESTORE_REGS(CLBR_RDI)
23306+#endif
23307+
23308+ popq %rdi
23309+ pax_force_retaddr
23310+ retq
23311+
23312+#ifdef CONFIG_PAX_KERNEXEC
23313+2: ljmpq __KERNEL_CS,1b
23314+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23315+4: SET_RDI_INTO_CR0
23316+ jmp 1b
23317+#endif
23318+ENDPROC(pax_enter_kernel)
23319+
23320+ENTRY(pax_exit_kernel)
23321+ pushq %rdi
23322+
23323+#ifdef CONFIG_PARAVIRT
23324+ PV_SAVE_REGS(CLBR_RDI)
23325+#endif
23326+
23327+#ifdef CONFIG_PAX_KERNEXEC
23328+ mov %cs,%rdi
23329+ cmp $__KERNEXEC_KERNEL_CS,%edi
23330+ jz 2f
23331+ GET_CR0_INTO_RDI
23332+ bts $X86_CR0_WP_BIT,%rdi
23333+ jnc 4f
23334+1:
23335+#endif
23336+
23337+#ifdef CONFIG_PAX_MEMORY_UDEREF
23338+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23339+ mov %ss,%edi
23340+ cmp $__UDEREF_KERNEL_DS,%edi
23341+ jnz 111f
23342+ GET_CR3_INTO_RDI
23343+ cmp $0,%dil
23344+ jz 112f
23345+ ud2
23346+112: add $4097,%rdi
23347+ bts $63,%rdi
23348+ SET_RDI_INTO_CR3
23349+ mov $__KERNEL_DS,%edi
23350+ mov %edi,%ss
23351+111:
23352+#endif
23353+
23354+#ifdef CONFIG_PARAVIRT
23355+ PV_RESTORE_REGS(CLBR_RDI);
23356+#endif
23357+
23358+ popq %rdi
23359+ pax_force_retaddr
23360+ retq
23361+
23362+#ifdef CONFIG_PAX_KERNEXEC
23363+2: GET_CR0_INTO_RDI
23364+ btr $X86_CR0_WP_BIT,%rdi
23365+ jnc 4f
23366+ ljmpq __KERNEL_CS,3f
23367+3: SET_RDI_INTO_CR0
23368+ jmp 1b
23369+4: ud2
23370+ jmp 4b
23371+#endif
23372+ENDPROC(pax_exit_kernel)
23373+#endif
23374+
23375+ .macro pax_enter_kernel_user
23376+ pax_set_fptr_mask
23377+#ifdef CONFIG_PAX_MEMORY_UDEREF
23378+ call pax_enter_kernel_user
23379+#endif
23380+ .endm
23381+
23382+ .macro pax_exit_kernel_user
23383+#ifdef CONFIG_PAX_MEMORY_UDEREF
23384+ call pax_exit_kernel_user
23385+#endif
23386+#ifdef CONFIG_PAX_RANDKSTACK
23387+ pushq %rax
23388+ pushq %r11
23389+ call pax_randomize_kstack
23390+ popq %r11
23391+ popq %rax
23392+#endif
23393+ .endm
23394+
23395+#ifdef CONFIG_PAX_MEMORY_UDEREF
23396+ENTRY(pax_enter_kernel_user)
23397+ pushq %rdi
23398+ pushq %rbx
23399+
23400+#ifdef CONFIG_PARAVIRT
23401+ PV_SAVE_REGS(CLBR_RDI)
23402+#endif
23403+
23404+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23405+ GET_CR3_INTO_RDI
23406+ cmp $1,%dil
23407+ jnz 4f
23408+ sub $4097,%rdi
23409+ bts $63,%rdi
23410+ SET_RDI_INTO_CR3
23411+ jmp 3f
23412+111:
23413+
23414+ GET_CR3_INTO_RDI
23415+ mov %rdi,%rbx
23416+ add $__START_KERNEL_map,%rbx
23417+ sub phys_base(%rip),%rbx
23418+
23419+#ifdef CONFIG_PARAVIRT
23420+ cmpl $0, pv_info+PARAVIRT_enabled
23421+ jz 1f
23422+ pushq %rdi
23423+ i = 0
23424+ .rept USER_PGD_PTRS
23425+ mov i*8(%rbx),%rsi
23426+ mov $0,%sil
23427+ lea i*8(%rbx),%rdi
23428+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23429+ i = i + 1
23430+ .endr
23431+ popq %rdi
23432+ jmp 2f
23433+1:
23434+#endif
23435+
23436+ i = 0
23437+ .rept USER_PGD_PTRS
23438+ movb $0,i*8(%rbx)
23439+ i = i + 1
23440+ .endr
23441+
23442+2: SET_RDI_INTO_CR3
23443+
23444+#ifdef CONFIG_PAX_KERNEXEC
23445+ GET_CR0_INTO_RDI
23446+ bts $X86_CR0_WP_BIT,%rdi
23447+ SET_RDI_INTO_CR0
23448+#endif
23449+
23450+3:
23451+
23452+#ifdef CONFIG_PARAVIRT
23453+ PV_RESTORE_REGS(CLBR_RDI)
23454+#endif
23455+
23456+ popq %rbx
23457+ popq %rdi
23458+ pax_force_retaddr
23459+ retq
23460+4: ud2
23461+ENDPROC(pax_enter_kernel_user)
23462+
23463+ENTRY(pax_exit_kernel_user)
23464+ pushq %rdi
23465+ pushq %rbx
23466+
23467+#ifdef CONFIG_PARAVIRT
23468+ PV_SAVE_REGS(CLBR_RDI)
23469+#endif
23470+
23471+ GET_CR3_INTO_RDI
23472+ ALTERNATIVE "jmp 1f", "", X86_FEATURE_PCID
23473+ cmp $0,%dil
23474+ jnz 3f
23475+ add $4097,%rdi
23476+ bts $63,%rdi
23477+ SET_RDI_INTO_CR3
23478+ jmp 2f
23479+1:
23480+
23481+ mov %rdi,%rbx
23482+
23483+#ifdef CONFIG_PAX_KERNEXEC
23484+ GET_CR0_INTO_RDI
23485+ btr $X86_CR0_WP_BIT,%rdi
23486+ jnc 3f
23487+ SET_RDI_INTO_CR0
23488+#endif
23489+
23490+ add $__START_KERNEL_map,%rbx
23491+ sub phys_base(%rip),%rbx
23492+
23493+#ifdef CONFIG_PARAVIRT
23494+ cmpl $0, pv_info+PARAVIRT_enabled
23495+ jz 1f
23496+ i = 0
23497+ .rept USER_PGD_PTRS
23498+ mov i*8(%rbx),%rsi
23499+ mov $0x67,%sil
23500+ lea i*8(%rbx),%rdi
23501+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23502+ i = i + 1
23503+ .endr
23504+ jmp 2f
23505+1:
23506+#endif
23507+
23508+ i = 0
23509+ .rept USER_PGD_PTRS
23510+ movb $0x67,i*8(%rbx)
23511+ i = i + 1
23512+ .endr
23513+2:
23514+
23515+#ifdef CONFIG_PARAVIRT
23516+ PV_RESTORE_REGS(CLBR_RDI)
23517+#endif
23518+
23519+ popq %rbx
23520+ popq %rdi
23521+ pax_force_retaddr
23522+ retq
23523+3: ud2
23524+ENDPROC(pax_exit_kernel_user)
23525+#endif
23526+
23527+ .macro pax_enter_kernel_nmi
23528+ pax_set_fptr_mask
23529+
23530+#ifdef CONFIG_PAX_KERNEXEC
23531+ GET_CR0_INTO_RDI
23532+ bts $X86_CR0_WP_BIT,%rdi
23533+ jc 110f
23534+ SET_RDI_INTO_CR0
23535+ or $2,%ebx
23536+110:
23537+#endif
23538+
23539+#ifdef CONFIG_PAX_MEMORY_UDEREF
23540+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23541+ GET_CR3_INTO_RDI
23542+ cmp $0,%dil
23543+ jz 111f
23544+ sub $4097,%rdi
23545+ or $4,%ebx
23546+ bts $63,%rdi
23547+ SET_RDI_INTO_CR3
23548+ mov $__UDEREF_KERNEL_DS,%edi
23549+ mov %edi,%ss
23550+111:
23551+#endif
23552+ .endm
23553+
23554+ .macro pax_exit_kernel_nmi
23555+#ifdef CONFIG_PAX_KERNEXEC
23556+ btr $1,%ebx
23557+ jnc 110f
23558+ GET_CR0_INTO_RDI
23559+ btr $X86_CR0_WP_BIT,%rdi
23560+ SET_RDI_INTO_CR0
23561+110:
23562+#endif
23563+
23564+#ifdef CONFIG_PAX_MEMORY_UDEREF
23565+ ALTERNATIVE "jmp 111f", "", X86_FEATURE_PCID
23566+ btr $2,%ebx
23567+ jnc 111f
23568+ GET_CR3_INTO_RDI
23569+ add $4097,%rdi
23570+ bts $63,%rdi
23571+ SET_RDI_INTO_CR3
23572+ mov $__KERNEL_DS,%edi
23573+ mov %edi,%ss
23574+111:
23575+#endif
23576+ .endm
23577+
23578+ .macro pax_erase_kstack
23579+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23580+ call pax_erase_kstack
23581+#endif
23582+ .endm
23583+
23584+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23585+ENTRY(pax_erase_kstack)
23586+ pushq %rdi
23587+ pushq %rcx
23588+ pushq %rax
23589+ pushq %r11
23590+
23591+ GET_THREAD_INFO(%r11)
23592+ mov TI_lowest_stack(%r11), %rdi
23593+ mov $-0xBEEF, %rax
23594+ std
23595+
23596+1: mov %edi, %ecx
23597+ and $THREAD_SIZE_asm - 1, %ecx
23598+ shr $3, %ecx
23599+ repne scasq
23600+ jecxz 2f
23601+
23602+ cmp $2*8, %ecx
23603+ jc 2f
23604+
23605+ mov $2*8, %ecx
23606+ repe scasq
23607+ jecxz 2f
23608+ jne 1b
23609+
23610+2: cld
23611+ or $2*8, %rdi
23612+ mov %esp, %ecx
23613+ sub %edi, %ecx
23614+
23615+ cmp $THREAD_SIZE_asm, %rcx
23616+ jb 3f
23617+ ud2
23618+3:
23619+
23620+ shr $3, %ecx
23621+ rep stosq
23622+
23623+ mov TI_task_thread_sp0(%r11), %rdi
23624+ sub $256, %rdi
23625+ mov %rdi, TI_lowest_stack(%r11)
23626+
23627+ popq %r11
23628+ popq %rax
23629+ popq %rcx
23630+ popq %rdi
23631+ pax_force_retaddr
23632+ ret
23633+ENDPROC(pax_erase_kstack)
23634+#endif
23635
23636 .macro TRACE_IRQS_IRETQ
23637 #ifdef CONFIG_TRACE_IRQFLAGS
23638@@ -100,7 +497,7 @@ ENDPROC(native_usergs_sysret64)
23639 .endm
23640
23641 .macro TRACE_IRQS_IRETQ_DEBUG
23642- bt $9,EFLAGS(%rsp) /* interrupts off? */
23643+ bt $X86_EFLAGS_IF_BIT,EFLAGS(%rsp) /* interrupts off? */
23644 jnc 1f
23645 TRACE_IRQS_ON_DEBUG
23646 1:
23647@@ -221,14 +618,6 @@ GLOBAL(system_call_after_swapgs)
23648 /* Construct struct pt_regs on stack */
23649 pushq_cfi $__USER_DS /* pt_regs->ss */
23650 pushq_cfi PER_CPU_VAR(rsp_scratch) /* pt_regs->sp */
23651- /*
23652- * Re-enable interrupts.
23653- * We use 'rsp_scratch' as a scratch space, hence irq-off block above
23654- * must execute atomically in the face of possible interrupt-driven
23655- * task preemption. We must enable interrupts only after we're done
23656- * with using rsp_scratch:
23657- */
23658- ENABLE_INTERRUPTS(CLBR_NONE)
23659 pushq_cfi %r11 /* pt_regs->flags */
23660 pushq_cfi $__USER_CS /* pt_regs->cs */
23661 pushq_cfi %rcx /* pt_regs->ip */
23662@@ -246,7 +635,27 @@ GLOBAL(system_call_after_swapgs)
23663 sub $(6*8),%rsp /* pt_regs->bp,bx,r12-15 not saved */
23664 CFI_ADJUST_CFA_OFFSET 6*8
23665
23666- testl $_TIF_WORK_SYSCALL_ENTRY, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
23667+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
23668+ movq_cfi r12, R12
23669+#endif
23670+
23671+ pax_enter_kernel_user
23672+
23673+#ifdef CONFIG_PAX_RANDKSTACK
23674+ pax_erase_kstack
23675+#endif
23676+
23677+ /*
23678+ * Re-enable interrupts.
23679+ * We use 'rsp_scratch' as a scratch space, hence irq-off block above
23680+ * must execute atomically in the face of possible interrupt-driven
23681+ * task preemption. We must enable interrupts only after we're done
23682+ * with using rsp_scratch:
23683+ */
23684+ ENABLE_INTERRUPTS(CLBR_NONE)
23685+
23686+ GET_THREAD_INFO(%rcx)
23687+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23688 jnz tracesys
23689 system_call_fastpath:
23690 #if __SYSCALL_MASK == ~0
23691@@ -279,10 +688,13 @@ system_call_fastpath:
23692 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23693 * very bad.
23694 */
23695- testl $_TIF_ALLWORK_MASK, ASM_THREAD_INFO(TI_flags, %rsp, SIZEOF_PTREGS)
23696+ GET_THREAD_INFO(%rcx)
23697+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23698 jnz int_ret_from_sys_call_irqs_off /* Go to the slow path */
23699
23700 CFI_REMEMBER_STATE
23701+ pax_exit_kernel_user
23702+ pax_erase_kstack
23703
23704 RESTORE_C_REGS_EXCEPT_RCX_R11
23705 movq RIP(%rsp),%rcx
23706@@ -316,6 +728,9 @@ tracesys:
23707 call syscall_trace_enter_phase1
23708 test %rax, %rax
23709 jnz tracesys_phase2 /* if needed, run the slow path */
23710+
23711+ pax_erase_kstack
23712+
23713 RESTORE_C_REGS_EXCEPT_RAX /* else restore clobbered regs */
23714 movq ORIG_RAX(%rsp), %rax
23715 jmp system_call_fastpath /* and return to the fast path */
23716@@ -327,6 +742,8 @@ tracesys_phase2:
23717 movq %rax,%rdx
23718 call syscall_trace_enter_phase2
23719
23720+ pax_erase_kstack
23721+
23722 /*
23723 * Reload registers from stack in case ptrace changed them.
23724 * We don't reload %rax because syscall_trace_entry_phase2() returned
23725@@ -364,6 +781,8 @@ GLOBAL(int_with_check)
23726 andl %edi,%edx
23727 jnz int_careful
23728 andl $~TS_COMPAT,TI_status(%rcx)
23729+ pax_exit_kernel_user
23730+ pax_erase_kstack
23731 jmp syscall_return
23732
23733 /* Either reschedule or signal or syscall exit tracking needed. */
23734@@ -485,7 +904,7 @@ opportunistic_sysret_failed:
23735 SWAPGS
23736 jmp restore_c_regs_and_iret
23737 CFI_ENDPROC
23738-END(system_call)
23739+ENDPROC(system_call)
23740
23741
23742 .macro FORK_LIKE func
23743@@ -495,7 +914,7 @@ ENTRY(stub_\func)
23744 SAVE_EXTRA_REGS 8
23745 jmp sys_\func
23746 CFI_ENDPROC
23747-END(stub_\func)
23748+ENDPROC(stub_\func)
23749 .endm
23750
23751 FORK_LIKE clone
23752@@ -519,7 +938,7 @@ return_from_execve:
23753 movq %rax,RAX(%rsp)
23754 jmp int_ret_from_sys_call
23755 CFI_ENDPROC
23756-END(stub_execve)
23757+ENDPROC(stub_execve)
23758 /*
23759 * Remaining execve stubs are only 7 bytes long.
23760 * ENTRY() often aligns to 16 bytes, which in this case has no benefits.
23761@@ -531,7 +950,7 @@ GLOBAL(stub_execveat)
23762 call sys_execveat
23763 jmp return_from_execve
23764 CFI_ENDPROC
23765-END(stub_execveat)
23766+ENDPROC(stub_execveat)
23767
23768 #ifdef CONFIG_X86_X32_ABI
23769 .align 8
23770@@ -541,7 +960,7 @@ GLOBAL(stub_x32_execve)
23771 call compat_sys_execve
23772 jmp return_from_execve
23773 CFI_ENDPROC
23774-END(stub_x32_execve)
23775+ENDPROC(stub_x32_execve)
23776 .align 8
23777 GLOBAL(stub_x32_execveat)
23778 CFI_STARTPROC
23779@@ -549,7 +968,7 @@ GLOBAL(stub_x32_execveat)
23780 call compat_sys_execveat
23781 jmp return_from_execve
23782 CFI_ENDPROC
23783-END(stub_x32_execveat)
23784+ENDPROC(stub_x32_execveat)
23785 #endif
23786
23787 #ifdef CONFIG_IA32_EMULATION
23788@@ -592,7 +1011,7 @@ return_from_stub:
23789 movq %rax,RAX(%rsp)
23790 jmp int_ret_from_sys_call
23791 CFI_ENDPROC
23792-END(stub_rt_sigreturn)
23793+ENDPROC(stub_rt_sigreturn)
23794
23795 #ifdef CONFIG_X86_X32_ABI
23796 ENTRY(stub_x32_rt_sigreturn)
23797@@ -602,7 +1021,7 @@ ENTRY(stub_x32_rt_sigreturn)
23798 call sys32_x32_rt_sigreturn
23799 jmp return_from_stub
23800 CFI_ENDPROC
23801-END(stub_x32_rt_sigreturn)
23802+ENDPROC(stub_x32_rt_sigreturn)
23803 #endif
23804
23805 /*
23806@@ -622,7 +1041,7 @@ ENTRY(ret_from_fork)
23807
23808 RESTORE_EXTRA_REGS
23809
23810- testl $3,CS(%rsp) # from kernel_thread?
23811+ testb $3,CS(%rsp) # from kernel_thread?
23812
23813 /*
23814 * By the time we get here, we have no idea whether our pt_regs,
23815@@ -641,7 +1060,7 @@ ENTRY(ret_from_fork)
23816 RESTORE_EXTRA_REGS
23817 jmp int_ret_from_sys_call
23818 CFI_ENDPROC
23819-END(ret_from_fork)
23820+ENDPROC(ret_from_fork)
23821
23822 /*
23823 * Build the entry stubs with some assembler magic.
23824@@ -659,7 +1078,7 @@ ENTRY(irq_entries_start)
23825 .align 8
23826 .endr
23827 CFI_ENDPROC
23828-END(irq_entries_start)
23829+ENDPROC(irq_entries_start)
23830
23831 /*
23832 * Interrupt entry/exit.
23833@@ -672,21 +1091,13 @@ END(irq_entries_start)
23834 /* 0(%rsp): ~(interrupt number) */
23835 .macro interrupt func
23836 cld
23837- /*
23838- * Since nothing in interrupt handling code touches r12...r15 members
23839- * of "struct pt_regs", and since interrupts can nest, we can save
23840- * four stack slots and simultaneously provide
23841- * an unwind-friendly stack layout by saving "truncated" pt_regs
23842- * exactly up to rbp slot, without these members.
23843- */
23844- ALLOC_PT_GPREGS_ON_STACK -RBP
23845- SAVE_C_REGS -RBP
23846- /* this goes to 0(%rsp) for unwinder, not for saving the value: */
23847- SAVE_EXTRA_REGS_RBP -RBP
23848+ ALLOC_PT_GPREGS_ON_STACK
23849+ SAVE_C_REGS
23850+ SAVE_EXTRA_REGS
23851
23852- leaq -RBP(%rsp),%rdi /* arg1 for \func (pointer to pt_regs) */
23853+ movq %rsp,%rdi /* arg1 for \func (pointer to pt_regs) */
23854
23855- testl $3, CS-RBP(%rsp)
23856+ testb $3, CS(%rsp)
23857 je 1f
23858 SWAPGS
23859 1:
23860@@ -709,8 +1120,20 @@ END(irq_entries_start)
23861 CFI_ESCAPE 0x0f /* DW_CFA_def_cfa_expression */, 6, \
23862 0x77 /* DW_OP_breg7 (rsp) */, 0, \
23863 0x06 /* DW_OP_deref */, \
23864- 0x08 /* DW_OP_const1u */, SIZEOF_PTREGS-RBP, \
23865+ 0x08 /* DW_OP_const1u */, SIZEOF_PTREGS, \
23866 0x22 /* DW_OP_plus */
23867+
23868+#ifdef CONFIG_PAX_MEMORY_UDEREF
23869+ testb $3, CS(%rdi)
23870+ jnz 1f
23871+ pax_enter_kernel
23872+ jmp 2f
23873+1: pax_enter_kernel_user
23874+2:
23875+#else
23876+ pax_enter_kernel
23877+#endif
23878+
23879 /* We entered an interrupt context - irqs are off: */
23880 TRACE_IRQS_OFF
23881
23882@@ -735,13 +1158,12 @@ ret_from_intr:
23883
23884 /* Restore saved previous stack */
23885 popq %rsi
23886- CFI_DEF_CFA rsi,SIZEOF_PTREGS-RBP /* reg/off reset after def_cfa_expr */
23887- /* return code expects complete pt_regs - adjust rsp accordingly: */
23888- leaq -RBP(%rsi),%rsp
23889+ CFI_DEF_CFA rsi,SIZEOF_PTREGS /* reg/off reset after def_cfa_expr */
23890+ movq %rsi, %rsp
23891 CFI_DEF_CFA_REGISTER rsp
23892- CFI_ADJUST_CFA_OFFSET RBP
23893+ CFI_ADJUST_CFA_OFFSET 0
23894
23895- testl $3,CS(%rsp)
23896+ testb $3,CS(%rsp)
23897 je retint_kernel
23898 /* Interrupt came from user space */
23899
23900@@ -763,6 +1185,8 @@ retint_swapgs: /* return to user-space */
23901 * The iretq could re-enable interrupts:
23902 */
23903 DISABLE_INTERRUPTS(CLBR_ANY)
23904+ pax_exit_kernel_user
23905+# pax_erase_kstack
23906 TRACE_IRQS_IRETQ
23907
23908 SWAPGS
23909@@ -781,6 +1205,21 @@ retint_kernel:
23910 jmp 0b
23911 1:
23912 #endif
23913+
23914+ pax_exit_kernel
23915+
23916+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23917+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23918+ * namely calling EFI runtime services with a phys mapping. We're
23919+ * starting off with NOPs and patch in the real instrumentation
23920+ * (BTS/OR) before starting any userland process; even before starting
23921+ * up the APs.
23922+ */
23923+ ALTERNATIVE "", "pax_force_retaddr 16*8", X86_FEATURE_ALWAYS
23924+#else
23925+ pax_force_retaddr RIP
23926+#endif
23927+
23928 /*
23929 * The iretq could re-enable interrupts:
23930 */
23931@@ -822,15 +1261,15 @@ native_irq_return_ldt:
23932 SWAPGS
23933 movq PER_CPU_VAR(espfix_waddr),%rdi
23934 movq %rax,(0*8)(%rdi) /* RAX */
23935- movq (2*8)(%rsp),%rax /* RIP */
23936+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23937 movq %rax,(1*8)(%rdi)
23938- movq (3*8)(%rsp),%rax /* CS */
23939+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23940 movq %rax,(2*8)(%rdi)
23941- movq (4*8)(%rsp),%rax /* RFLAGS */
23942+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23943 movq %rax,(3*8)(%rdi)
23944- movq (6*8)(%rsp),%rax /* SS */
23945+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23946 movq %rax,(5*8)(%rdi)
23947- movq (5*8)(%rsp),%rax /* RSP */
23948+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23949 movq %rax,(4*8)(%rdi)
23950 andl $0xffff0000,%eax
23951 popq_cfi %rdi
23952@@ -873,7 +1312,7 @@ retint_signal:
23953 jmp retint_with_reschedule
23954
23955 CFI_ENDPROC
23956-END(common_interrupt)
23957+ENDPROC(common_interrupt)
23958
23959 /*
23960 * APIC interrupts.
23961@@ -887,7 +1326,7 @@ ENTRY(\sym)
23962 interrupt \do_sym
23963 jmp ret_from_intr
23964 CFI_ENDPROC
23965-END(\sym)
23966+ENDPROC(\sym)
23967 .endm
23968
23969 #ifdef CONFIG_TRACING
23970@@ -960,7 +1399,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23971 /*
23972 * Exception entry points.
23973 */
23974-#define CPU_TSS_IST(x) PER_CPU_VAR(cpu_tss) + (TSS_ist + ((x) - 1) * 8)
23975+#define CPU_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23976
23977 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23978 ENTRY(\sym)
23979@@ -1016,6 +1455,12 @@ ENTRY(\sym)
23980 .endif
23981
23982 .if \shift_ist != -1
23983+#ifdef CONFIG_SMP
23984+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23985+ lea cpu_tss(%r13), %r13
23986+#else
23987+ lea cpu_tss(%rip), %r13
23988+#endif
23989 subq $EXCEPTION_STKSZ, CPU_TSS_IST(\shift_ist)
23990 .endif
23991
23992@@ -1063,7 +1508,7 @@ ENTRY(\sym)
23993 .endif
23994
23995 CFI_ENDPROC
23996-END(\sym)
23997+ENDPROC(\sym)
23998 .endm
23999
24000 #ifdef CONFIG_TRACING
24001@@ -1104,9 +1549,10 @@ gs_change:
24002 2: mfence /* workaround */
24003 SWAPGS
24004 popfq_cfi
24005+ pax_force_retaddr
24006 ret
24007 CFI_ENDPROC
24008-END(native_load_gs_index)
24009+ENDPROC(native_load_gs_index)
24010
24011 _ASM_EXTABLE(gs_change,bad_gs)
24012 .section .fixup,"ax"
24013@@ -1134,9 +1580,10 @@ ENTRY(do_softirq_own_stack)
24014 CFI_DEF_CFA_REGISTER rsp
24015 CFI_ADJUST_CFA_OFFSET -8
24016 decl PER_CPU_VAR(irq_count)
24017+ pax_force_retaddr
24018 ret
24019 CFI_ENDPROC
24020-END(do_softirq_own_stack)
24021+ENDPROC(do_softirq_own_stack)
24022
24023 #ifdef CONFIG_XEN
24024 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24025@@ -1177,7 +1624,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24026 #endif
24027 jmp error_exit
24028 CFI_ENDPROC
24029-END(xen_do_hypervisor_callback)
24030+ENDPROC(xen_do_hypervisor_callback)
24031
24032 /*
24033 * Hypervisor uses this for application faults while it executes.
24034@@ -1238,7 +1685,7 @@ ENTRY(xen_failsafe_callback)
24035 SAVE_EXTRA_REGS
24036 jmp error_exit
24037 CFI_ENDPROC
24038-END(xen_failsafe_callback)
24039+ENDPROC(xen_failsafe_callback)
24040
24041 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24042 xen_hvm_callback_vector xen_evtchn_do_upcall
24043@@ -1284,9 +1731,39 @@ ENTRY(paranoid_entry)
24044 js 1f /* negative -> in kernel */
24045 SWAPGS
24046 xorl %ebx,%ebx
24047-1: ret
24048+1:
24049+#ifdef CONFIG_PAX_MEMORY_UDEREF
24050+ testb $3, CS+8(%rsp)
24051+ jnz 1f
24052+ pax_enter_kernel
24053+ jmp 2f
24054+1: pax_enter_kernel_user
24055+2:
24056+#else
24057+ pax_enter_kernel
24058+#endif
24059+ pax_force_retaddr
24060+ ret
24061 CFI_ENDPROC
24062-END(paranoid_entry)
24063+ENDPROC(paranoid_entry)
24064+
24065+ENTRY(paranoid_entry_nmi)
24066+ XCPT_FRAME 1 15*8
24067+ cld
24068+ SAVE_C_REGS 8
24069+ SAVE_EXTRA_REGS 8
24070+ movl $1,%ebx
24071+ movl $MSR_GS_BASE,%ecx
24072+ rdmsr
24073+ testl %edx,%edx
24074+ js 1f /* negative -> in kernel */
24075+ SWAPGS
24076+ xorl %ebx,%ebx
24077+1: pax_enter_kernel_nmi
24078+ pax_force_retaddr
24079+ ret
24080+ CFI_ENDPROC
24081+ENDPROC(paranoid_entry_nmi)
24082
24083 /*
24084 * "Paranoid" exit path from exception stack. This is invoked
24085@@ -1303,20 +1780,27 @@ ENTRY(paranoid_exit)
24086 DEFAULT_FRAME
24087 DISABLE_INTERRUPTS(CLBR_NONE)
24088 TRACE_IRQS_OFF_DEBUG
24089- testl %ebx,%ebx /* swapgs needed? */
24090+ testl $1,%ebx /* swapgs needed? */
24091 jnz paranoid_exit_no_swapgs
24092+#ifdef CONFIG_PAX_MEMORY_UDEREF
24093+ pax_exit_kernel_user
24094+#else
24095+ pax_exit_kernel
24096+#endif
24097 TRACE_IRQS_IRETQ
24098 SWAPGS_UNSAFE_STACK
24099 jmp paranoid_exit_restore
24100 paranoid_exit_no_swapgs:
24101+ pax_exit_kernel
24102 TRACE_IRQS_IRETQ_DEBUG
24103 paranoid_exit_restore:
24104 RESTORE_EXTRA_REGS
24105 RESTORE_C_REGS
24106 REMOVE_PT_GPREGS_FROM_STACK 8
24107+ pax_force_retaddr_bts
24108 INTERRUPT_RETURN
24109 CFI_ENDPROC
24110-END(paranoid_exit)
24111+ENDPROC(paranoid_exit)
24112
24113 /*
24114 * Save all registers in pt_regs, and switch gs if needed.
24115@@ -1328,12 +1812,23 @@ ENTRY(error_entry)
24116 SAVE_C_REGS 8
24117 SAVE_EXTRA_REGS 8
24118 xorl %ebx,%ebx
24119- testl $3,CS+8(%rsp)
24120+ testb $3,CS+8(%rsp)
24121 je error_kernelspace
24122 error_swapgs:
24123 SWAPGS
24124 error_sti:
24125+#ifdef CONFIG_PAX_MEMORY_UDEREF
24126+ testb $3, CS+8(%rsp)
24127+ jnz 1f
24128+ pax_enter_kernel
24129+ jmp 2f
24130+1: pax_enter_kernel_user
24131+2:
24132+#else
24133+ pax_enter_kernel
24134+#endif
24135 TRACE_IRQS_OFF
24136+ pax_force_retaddr
24137 ret
24138
24139 /*
24140@@ -1368,7 +1863,7 @@ error_bad_iret:
24141 decl %ebx /* Return to usergs */
24142 jmp error_sti
24143 CFI_ENDPROC
24144-END(error_entry)
24145+ENDPROC(error_entry)
24146
24147
24148 /* On entry, ebx is "no swapgs" flag (1: don't need swapgs, 0: need it) */
24149@@ -1379,7 +1874,7 @@ ENTRY(error_exit)
24150 DISABLE_INTERRUPTS(CLBR_NONE)
24151 TRACE_IRQS_OFF
24152 GET_THREAD_INFO(%rcx)
24153- testl %eax,%eax
24154+ testl $1,%eax
24155 jne retint_kernel
24156 LOCKDEP_SYS_EXIT_IRQ
24157 movl TI_flags(%rcx),%edx
24158@@ -1388,7 +1883,7 @@ ENTRY(error_exit)
24159 jnz retint_careful
24160 jmp retint_swapgs
24161 CFI_ENDPROC
24162-END(error_exit)
24163+ENDPROC(error_exit)
24164
24165 /* Runs on exception stack */
24166 ENTRY(nmi)
24167@@ -1473,6 +1968,12 @@ ENTRY(nmi)
24168 pushq %r14 /* pt_regs->r14 */
24169 pushq %r15 /* pt_regs->r15 */
24170
24171+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24172+ xorl %ebx,%ebx
24173+#endif
24174+
24175+ pax_enter_kernel_nmi
24176+
24177 /*
24178 * At this point we no longer need to worry about stack damage
24179 * due to nesting -- we're on the normal thread stack and we're
24180@@ -1482,12 +1983,19 @@ ENTRY(nmi)
24181 movq $-1, %rsi
24182 call do_nmi
24183
24184+ pax_exit_kernel_nmi
24185+
24186 /*
24187 * Return back to user mode. We must *not* do the normal exit
24188 * work, because we don't want to enable interrupts. Fortunately,
24189 * do_nmi doesn't modify pt_regs.
24190 */
24191 SWAPGS
24192+
24193+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
24194+ movq_cfi_restore RBX, rbx
24195+#endif
24196+
24197 jmp restore_c_regs_and_iret
24198
24199 .Lnmi_from_kernel:
24200@@ -1595,8 +2103,7 @@ nested_nmi:
24201 * Modify the "iret" frame to point to repeat_nmi, forcing another
24202 * iteration of NMI handling.
24203 */
24204- leaq -1*8(%rsp), %rdx
24205- movq %rdx, %rsp
24206+ subq $8, %rsp
24207 CFI_ADJUST_CFA_OFFSET 1*8
24208 leaq -10*8(%rsp), %rdx
24209 pushq_cfi $__KERNEL_DS
24210@@ -1614,6 +2121,7 @@ nested_nmi_out:
24211 CFI_RESTORE rdx
24212
24213 /* We are returning to kernel mode, so this cannot result in a fault. */
24214+# pax_force_retaddr_bts
24215 INTERRUPT_RETURN
24216
24217 CFI_RESTORE_STATE
24218@@ -1679,13 +2187,13 @@ end_repeat_nmi:
24219 ALLOC_PT_GPREGS_ON_STACK
24220
24221 /*
24222- * Use paranoid_entry to handle SWAPGS, but no need to use paranoid_exit
24223+ * Use paranoid_entry_nmi to handle SWAPGS, but no need to use paranoid_exit
24224 * as we should not be calling schedule in NMI context.
24225 * Even with normal interrupts enabled. An NMI should not be
24226 * setting NEED_RESCHED or anything that normal interrupts and
24227 * exceptions might do.
24228 */
24229- call paranoid_entry
24230+ call paranoid_entry_nmi
24231 DEFAULT_FRAME 0
24232
24233 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24234@@ -1693,7 +2201,9 @@ end_repeat_nmi:
24235 movq $-1,%rsi
24236 call do_nmi
24237
24238- testl %ebx,%ebx /* swapgs needed? */
24239+ pax_exit_kernel_nmi
24240+
24241+ testl $1,%ebx /* swapgs needed? */
24242 jnz nmi_restore
24243 nmi_swapgs:
24244 SWAPGS_UNSAFE_STACK
24245@@ -1704,6 +2214,8 @@ nmi_restore:
24246 /* Point RSP at the "iret" frame. */
24247 REMOVE_PT_GPREGS_FROM_STACK 6*8
24248
24249+ pax_force_retaddr_bts
24250+
24251 /*
24252 * Clear "NMI executing". Set DF first so that we can easily
24253 * distinguish the remaining code between here and IRET from
24254@@ -1722,12 +2234,12 @@ nmi_restore:
24255 */
24256 INTERRUPT_RETURN
24257 CFI_ENDPROC
24258-END(nmi)
24259+ENDPROC(nmi)
24260
24261 ENTRY(ignore_sysret)
24262 CFI_STARTPROC
24263 mov $-ENOSYS,%eax
24264 sysret
24265 CFI_ENDPROC
24266-END(ignore_sysret)
24267+ENDPROC(ignore_sysret)
24268
24269diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24270index f5d0730..5bce89c 100644
24271--- a/arch/x86/kernel/espfix_64.c
24272+++ b/arch/x86/kernel/espfix_64.c
24273@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24274 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24275 static void *espfix_pages[ESPFIX_MAX_PAGES];
24276
24277-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24278- __aligned(PAGE_SIZE);
24279+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24280
24281 static unsigned int page_random, slot_random;
24282
24283@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24284 void __init init_espfix_bsp(void)
24285 {
24286 pgd_t *pgd_p;
24287+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24288
24289 /* Install the espfix pud into the kernel page directory */
24290- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24291+ pgd_p = &init_level4_pgt[index];
24292 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24293
24294+#ifdef CONFIG_PAX_PER_CPU_PGD
24295+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24296+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24297+#endif
24298+
24299 /* Randomize the locations */
24300 init_espfix_random();
24301
24302@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24303 set_pte(&pte_p[n*PTE_STRIDE], pte);
24304
24305 /* Job is done for this CPU and any CPU which shares this page */
24306- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24307+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24308
24309 unlock_done:
24310 mutex_unlock(&espfix_init_mutex);
24311diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24312index 8b7b0a5..02219db 100644
24313--- a/arch/x86/kernel/ftrace.c
24314+++ b/arch/x86/kernel/ftrace.c
24315@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24316 * kernel identity mapping to modify code.
24317 */
24318 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24319- ip = (unsigned long)__va(__pa_symbol(ip));
24320+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24321
24322 return ip;
24323 }
24324@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24325 {
24326 unsigned char replaced[MCOUNT_INSN_SIZE];
24327
24328+ ip = ktla_ktva(ip);
24329+
24330 /*
24331 * Note: Due to modules and __init, code can
24332 * disappear and change, we need to protect against faulting
24333@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24334 unsigned char old[MCOUNT_INSN_SIZE];
24335 int ret;
24336
24337- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24338+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24339
24340 ftrace_update_func = ip;
24341 /* Make sure the breakpoints see the ftrace_update_func update */
24342@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24343 unsigned char replaced[MCOUNT_INSN_SIZE];
24344 unsigned char brk = BREAKPOINT_INSTRUCTION;
24345
24346- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24347+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24348 return -EFAULT;
24349
24350 /* Make sure it is what we expect it to be */
24351@@ -670,11 +672,11 @@ static unsigned char *ftrace_jmp_replace(unsigned long ip, unsigned long addr)
24352 /* Module allocation simplifies allocating memory for code */
24353 static inline void *alloc_tramp(unsigned long size)
24354 {
24355- return module_alloc(size);
24356+ return module_alloc_exec(size);
24357 }
24358 static inline void tramp_free(void *tramp)
24359 {
24360- module_memfree(tramp);
24361+ module_memfree_exec(tramp);
24362 }
24363 #else
24364 /* Trampolines can only be created if modules are supported */
24365@@ -753,7 +755,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24366 *tramp_size = size + MCOUNT_INSN_SIZE + sizeof(void *);
24367
24368 /* Copy ftrace_caller onto the trampoline memory */
24369+ pax_open_kernel();
24370 ret = probe_kernel_read(trampoline, (void *)start_offset, size);
24371+ pax_close_kernel();
24372 if (WARN_ON(ret < 0)) {
24373 tramp_free(trampoline);
24374 return 0;
24375@@ -763,6 +767,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24376
24377 /* The trampoline ends with a jmp to ftrace_return */
24378 jmp = ftrace_jmp_replace(ip, (unsigned long)ftrace_return);
24379+ pax_open_kernel();
24380 memcpy(trampoline + size, jmp, MCOUNT_INSN_SIZE);
24381
24382 /*
24383@@ -775,6 +780,7 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24384
24385 ptr = (unsigned long *)(trampoline + size + MCOUNT_INSN_SIZE);
24386 *ptr = (unsigned long)ops;
24387+ pax_close_kernel();
24388
24389 op_offset -= start_offset;
24390 memcpy(&op_ptr, trampoline + op_offset, OP_REF_SIZE);
24391@@ -792,7 +798,9 @@ create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size)
24392 op_ptr.offset = offset;
24393
24394 /* put in the new offset to the ftrace_ops */
24395+ pax_open_kernel();
24396 memcpy(trampoline + op_offset, &op_ptr, OP_REF_SIZE);
24397+ pax_close_kernel();
24398
24399 /* ALLOC_TRAMP flags lets us know we created it */
24400 ops->flags |= FTRACE_OPS_FL_ALLOC_TRAMP;
24401diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24402index f129a9a..af8f6da 100644
24403--- a/arch/x86/kernel/head64.c
24404+++ b/arch/x86/kernel/head64.c
24405@@ -68,12 +68,12 @@ again:
24406 pgd = *pgd_p;
24407
24408 /*
24409- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24410- * critical -- __PAGE_OFFSET would point us back into the dynamic
24411+ * The use of __early_va rather than __va here is critical:
24412+ * __va would point us back into the dynamic
24413 * range and we might end up looping forever...
24414 */
24415 if (pgd)
24416- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24417+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24418 else {
24419 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24420 reset_early_page_tables();
24421@@ -83,13 +83,13 @@ again:
24422 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24423 for (i = 0; i < PTRS_PER_PUD; i++)
24424 pud_p[i] = 0;
24425- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24426+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24427 }
24428 pud_p += pud_index(address);
24429 pud = *pud_p;
24430
24431 if (pud)
24432- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24433+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24434 else {
24435 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24436 reset_early_page_tables();
24437@@ -99,7 +99,7 @@ again:
24438 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24439 for (i = 0; i < PTRS_PER_PMD; i++)
24440 pmd_p[i] = 0;
24441- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24442+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24443 }
24444 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24445 pmd_p[pmd_index(address)] = pmd;
24446@@ -163,8 +163,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24447
24448 clear_bss();
24449
24450- clear_page(init_level4_pgt);
24451-
24452 kasan_early_init();
24453
24454 for (i = 0; i < NUM_EXCEPTION_VECTORS; i++)
24455diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24456index 7e429c9..7244a52 100644
24457--- a/arch/x86/kernel/head_32.S
24458+++ b/arch/x86/kernel/head_32.S
24459@@ -27,6 +27,12 @@
24460 /* Physical address */
24461 #define pa(X) ((X) - __PAGE_OFFSET)
24462
24463+#ifdef CONFIG_PAX_KERNEXEC
24464+#define ta(X) (X)
24465+#else
24466+#define ta(X) ((X) - __PAGE_OFFSET)
24467+#endif
24468+
24469 /*
24470 * References to members of the new_cpu_data structure.
24471 */
24472@@ -56,11 +62,7 @@
24473 * and small than max_low_pfn, otherwise will waste some page table entries
24474 */
24475
24476-#if PTRS_PER_PMD > 1
24477-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24478-#else
24479-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24480-#endif
24481+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24482
24483 /*
24484 * Number of possible pages in the lowmem region.
24485@@ -86,6 +88,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24486 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24487
24488 /*
24489+ * Real beginning of normal "text" segment
24490+ */
24491+ENTRY(stext)
24492+ENTRY(_stext)
24493+
24494+/*
24495 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24496 * %esi points to the real-mode code as a 32-bit pointer.
24497 * CS and DS must be 4 GB flat segments, but we don't depend on
24498@@ -93,6 +101,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24499 * can.
24500 */
24501 __HEAD
24502+
24503+#ifdef CONFIG_PAX_KERNEXEC
24504+ jmp startup_32
24505+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24506+.fill PAGE_SIZE-5,1,0xcc
24507+#endif
24508+
24509 ENTRY(startup_32)
24510 movl pa(stack_start),%ecx
24511
24512@@ -114,6 +129,59 @@ ENTRY(startup_32)
24513 2:
24514 leal -__PAGE_OFFSET(%ecx),%esp
24515
24516+#ifdef CONFIG_SMP
24517+ movl $pa(cpu_gdt_table),%edi
24518+ movl $__per_cpu_load,%eax
24519+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24520+ rorl $16,%eax
24521+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24522+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24523+ movl $__per_cpu_end - 1,%eax
24524+ subl $__per_cpu_start,%eax
24525+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24526+#endif
24527+
24528+#ifdef CONFIG_PAX_MEMORY_UDEREF
24529+ movl $NR_CPUS,%ecx
24530+ movl $pa(cpu_gdt_table),%edi
24531+1:
24532+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24533+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24534+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24535+ addl $PAGE_SIZE_asm,%edi
24536+ loop 1b
24537+#endif
24538+
24539+#ifdef CONFIG_PAX_KERNEXEC
24540+ movl $pa(boot_gdt),%edi
24541+ movl $__LOAD_PHYSICAL_ADDR,%eax
24542+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24543+ rorl $16,%eax
24544+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24545+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24546+ rorl $16,%eax
24547+
24548+ ljmp $(__BOOT_CS),$1f
24549+1:
24550+
24551+ movl $NR_CPUS,%ecx
24552+ movl $pa(cpu_gdt_table),%edi
24553+ addl $__PAGE_OFFSET,%eax
24554+1:
24555+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24556+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24557+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24558+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24559+ rorl $16,%eax
24560+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24561+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24562+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24563+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24564+ rorl $16,%eax
24565+ addl $PAGE_SIZE_asm,%edi
24566+ loop 1b
24567+#endif
24568+
24569 /*
24570 * Clear BSS first so that there are no surprises...
24571 */
24572@@ -209,8 +277,11 @@ ENTRY(startup_32)
24573 movl %eax, pa(max_pfn_mapped)
24574
24575 /* Do early initialization of the fixmap area */
24576- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24577- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24578+#ifdef CONFIG_COMPAT_VDSO
24579+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24580+#else
24581+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24582+#endif
24583 #else /* Not PAE */
24584
24585 page_pde_offset = (__PAGE_OFFSET >> 20);
24586@@ -240,8 +311,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24587 movl %eax, pa(max_pfn_mapped)
24588
24589 /* Do early initialization of the fixmap area */
24590- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24591- movl %eax,pa(initial_page_table+0xffc)
24592+#ifdef CONFIG_COMPAT_VDSO
24593+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24594+#else
24595+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24596+#endif
24597 #endif
24598
24599 #ifdef CONFIG_PARAVIRT
24600@@ -255,9 +329,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24601 cmpl $num_subarch_entries, %eax
24602 jae bad_subarch
24603
24604- movl pa(subarch_entries)(,%eax,4), %eax
24605- subl $__PAGE_OFFSET, %eax
24606- jmp *%eax
24607+ jmp *pa(subarch_entries)(,%eax,4)
24608
24609 bad_subarch:
24610 WEAK(lguest_entry)
24611@@ -269,10 +341,10 @@ WEAK(xen_entry)
24612 __INITDATA
24613
24614 subarch_entries:
24615- .long default_entry /* normal x86/PC */
24616- .long lguest_entry /* lguest hypervisor */
24617- .long xen_entry /* Xen hypervisor */
24618- .long default_entry /* Moorestown MID */
24619+ .long ta(default_entry) /* normal x86/PC */
24620+ .long ta(lguest_entry) /* lguest hypervisor */
24621+ .long ta(xen_entry) /* Xen hypervisor */
24622+ .long ta(default_entry) /* Moorestown MID */
24623 num_subarch_entries = (. - subarch_entries) / 4
24624 .previous
24625 #else
24626@@ -362,6 +434,7 @@ default_entry:
24627 movl pa(mmu_cr4_features),%eax
24628 movl %eax,%cr4
24629
24630+#ifdef CONFIG_X86_PAE
24631 testb $X86_CR4_PAE, %al # check if PAE is enabled
24632 jz enable_paging
24633
24634@@ -390,6 +463,9 @@ default_entry:
24635 /* Make changes effective */
24636 wrmsr
24637
24638+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24639+#endif
24640+
24641 enable_paging:
24642
24643 /*
24644@@ -457,14 +533,20 @@ is486:
24645 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24646 movl %eax,%ss # after changing gdt.
24647
24648- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24649+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24650 movl %eax,%ds
24651 movl %eax,%es
24652
24653 movl $(__KERNEL_PERCPU), %eax
24654 movl %eax,%fs # set this cpu's percpu
24655
24656+#ifdef CONFIG_CC_STACKPROTECTOR
24657 movl $(__KERNEL_STACK_CANARY),%eax
24658+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24659+ movl $(__USER_DS),%eax
24660+#else
24661+ xorl %eax,%eax
24662+#endif
24663 movl %eax,%gs
24664
24665 xorl %eax,%eax # Clear LDT
24666@@ -521,8 +603,11 @@ setup_once:
24667 * relocation. Manually set base address in stack canary
24668 * segment descriptor.
24669 */
24670- movl $gdt_page,%eax
24671+ movl $cpu_gdt_table,%eax
24672 movl $stack_canary,%ecx
24673+#ifdef CONFIG_SMP
24674+ addl $__per_cpu_load,%ecx
24675+#endif
24676 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24677 shrl $16, %ecx
24678 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24679@@ -559,7 +644,7 @@ early_idt_handler_common:
24680 cmpl $2,(%esp) # X86_TRAP_NMI
24681 je is_nmi # Ignore NMI
24682
24683- cmpl $2,%ss:early_recursion_flag
24684+ cmpl $1,%ss:early_recursion_flag
24685 je hlt_loop
24686 incl %ss:early_recursion_flag
24687
24688@@ -597,8 +682,8 @@ early_idt_handler_common:
24689 pushl (20+6*4)(%esp) /* trapno */
24690 pushl $fault_msg
24691 call printk
24692-#endif
24693 call dump_stack
24694+#endif
24695 hlt_loop:
24696 hlt
24697 jmp hlt_loop
24698@@ -618,8 +703,11 @@ ENDPROC(early_idt_handler_common)
24699 /* This is the default interrupt "handler" :-) */
24700 ALIGN
24701 ignore_int:
24702- cld
24703 #ifdef CONFIG_PRINTK
24704+ cmpl $2,%ss:early_recursion_flag
24705+ je hlt_loop
24706+ incl %ss:early_recursion_flag
24707+ cld
24708 pushl %eax
24709 pushl %ecx
24710 pushl %edx
24711@@ -628,9 +716,6 @@ ignore_int:
24712 movl $(__KERNEL_DS),%eax
24713 movl %eax,%ds
24714 movl %eax,%es
24715- cmpl $2,early_recursion_flag
24716- je hlt_loop
24717- incl early_recursion_flag
24718 pushl 16(%esp)
24719 pushl 24(%esp)
24720 pushl 32(%esp)
24721@@ -664,29 +749,34 @@ ENTRY(setup_once_ref)
24722 /*
24723 * BSS section
24724 */
24725-__PAGE_ALIGNED_BSS
24726- .align PAGE_SIZE
24727 #ifdef CONFIG_X86_PAE
24728+.section .initial_pg_pmd,"a",@progbits
24729 initial_pg_pmd:
24730 .fill 1024*KPMDS,4,0
24731 #else
24732+.section .initial_page_table,"a",@progbits
24733 ENTRY(initial_page_table)
24734 .fill 1024,4,0
24735 #endif
24736+.section .initial_pg_fixmap,"a",@progbits
24737 initial_pg_fixmap:
24738 .fill 1024,4,0
24739+.section .empty_zero_page,"a",@progbits
24740 ENTRY(empty_zero_page)
24741 .fill 4096,1,0
24742+.section .swapper_pg_dir,"a",@progbits
24743 ENTRY(swapper_pg_dir)
24744+#ifdef CONFIG_X86_PAE
24745+ .fill 4,8,0
24746+#else
24747 .fill 1024,4,0
24748+#endif
24749
24750 /*
24751 * This starts the data section.
24752 */
24753 #ifdef CONFIG_X86_PAE
24754-__PAGE_ALIGNED_DATA
24755- /* Page-aligned for the benefit of paravirt? */
24756- .align PAGE_SIZE
24757+.section .initial_page_table,"a",@progbits
24758 ENTRY(initial_page_table)
24759 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24760 # if KPMDS == 3
24761@@ -705,12 +795,20 @@ ENTRY(initial_page_table)
24762 # error "Kernel PMDs should be 1, 2 or 3"
24763 # endif
24764 .align PAGE_SIZE /* needs to be page-sized too */
24765+
24766+#ifdef CONFIG_PAX_PER_CPU_PGD
24767+ENTRY(cpu_pgd)
24768+ .rept 2*NR_CPUS
24769+ .fill 4,8,0
24770+ .endr
24771+#endif
24772+
24773 #endif
24774
24775 .data
24776 .balign 4
24777 ENTRY(stack_start)
24778- .long init_thread_union+THREAD_SIZE
24779+ .long init_thread_union+THREAD_SIZE-8
24780
24781 __INITRODATA
24782 int_msg:
24783@@ -738,7 +836,7 @@ fault_msg:
24784 * segment size, and 32-bit linear address value:
24785 */
24786
24787- .data
24788+.section .rodata,"a",@progbits
24789 .globl boot_gdt_descr
24790 .globl idt_descr
24791
24792@@ -747,7 +845,7 @@ fault_msg:
24793 .word 0 # 32 bit align gdt_desc.address
24794 boot_gdt_descr:
24795 .word __BOOT_DS+7
24796- .long boot_gdt - __PAGE_OFFSET
24797+ .long pa(boot_gdt)
24798
24799 .word 0 # 32-bit align idt_desc.address
24800 idt_descr:
24801@@ -758,7 +856,7 @@ idt_descr:
24802 .word 0 # 32 bit align gdt_desc.address
24803 ENTRY(early_gdt_descr)
24804 .word GDT_ENTRIES*8-1
24805- .long gdt_page /* Overwritten for secondary CPUs */
24806+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24807
24808 /*
24809 * The boot_gdt must mirror the equivalent in setup.S and is
24810@@ -767,5 +865,65 @@ ENTRY(early_gdt_descr)
24811 .align L1_CACHE_BYTES
24812 ENTRY(boot_gdt)
24813 .fill GDT_ENTRY_BOOT_CS,8,0
24814- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24815- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24816+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24817+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24818+
24819+ .align PAGE_SIZE_asm
24820+ENTRY(cpu_gdt_table)
24821+ .rept NR_CPUS
24822+ .quad 0x0000000000000000 /* NULL descriptor */
24823+ .quad 0x0000000000000000 /* 0x0b reserved */
24824+ .quad 0x0000000000000000 /* 0x13 reserved */
24825+ .quad 0x0000000000000000 /* 0x1b reserved */
24826+
24827+#ifdef CONFIG_PAX_KERNEXEC
24828+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24829+#else
24830+ .quad 0x0000000000000000 /* 0x20 unused */
24831+#endif
24832+
24833+ .quad 0x0000000000000000 /* 0x28 unused */
24834+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24835+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24836+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24837+ .quad 0x0000000000000000 /* 0x4b reserved */
24838+ .quad 0x0000000000000000 /* 0x53 reserved */
24839+ .quad 0x0000000000000000 /* 0x5b reserved */
24840+
24841+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24842+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24843+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24844+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24845+
24846+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24847+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24848+
24849+ /*
24850+ * Segments used for calling PnP BIOS have byte granularity.
24851+ * The code segments and data segments have fixed 64k limits,
24852+ * the transfer segment sizes are set at run time.
24853+ */
24854+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24855+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24856+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24857+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24858+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24859+
24860+ /*
24861+ * The APM segments have byte granularity and their bases
24862+ * are set at run time. All have 64k limits.
24863+ */
24864+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24865+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24866+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24867+
24868+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24869+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24870+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24871+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24872+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24873+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24874+
24875+ /* Be sure this is zeroed to avoid false validations in Xen */
24876+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24877+ .endr
24878diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24879index 7e5da2c..761adf1 100644
24880--- a/arch/x86/kernel/head_64.S
24881+++ b/arch/x86/kernel/head_64.S
24882@@ -20,6 +20,8 @@
24883 #include <asm/processor-flags.h>
24884 #include <asm/percpu.h>
24885 #include <asm/nops.h>
24886+#include <asm/cpufeature.h>
24887+#include <asm/alternative-asm.h>
24888
24889 #ifdef CONFIG_PARAVIRT
24890 #include <asm/asm-offsets.h>
24891@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24892 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24893 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24894 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24895+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24896+L3_VMALLOC_START = pud_index(VMALLOC_START)
24897+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24898+L3_VMALLOC_END = pud_index(VMALLOC_END)
24899+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24900+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24901
24902 .text
24903 __HEAD
24904@@ -89,11 +97,26 @@ startup_64:
24905 * Fixup the physical addresses in the page table
24906 */
24907 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24908+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24909+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24910+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24911+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24912+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24913
24914- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24915- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24916+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24917+#ifndef CONFIG_XEN
24918+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24919+#endif
24920
24921+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24922+
24923+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24924+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24925+
24926+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
24927+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
24928 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24929+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24930
24931 /*
24932 * Set up the identity mapping for the switchover. These
24933@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
24934 * after the boot processor executes this code.
24935 */
24936
24937+ orq $-1, %rbp
24938 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24939 1:
24940
24941- /* Enable PAE mode and PGE */
24942- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24943+ /* Enable PAE mode and PSE/PGE */
24944+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24945 movq %rcx, %cr4
24946
24947 /* Setup early boot stage 4 level pagetables. */
24948@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
24949 movl $MSR_EFER, %ecx
24950 rdmsr
24951 btsl $_EFER_SCE, %eax /* Enable System Call */
24952- btl $20,%edi /* No Execute supported? */
24953+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24954 jnc 1f
24955 btsl $_EFER_NX, %eax
24956+ cmpq $-1, %rbp
24957+ je 1f
24958 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24959+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24960+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24961+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24962+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24963+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
24964+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
24965+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24966+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24967+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24968 1: wrmsr /* Make changes effective */
24969
24970 /* Setup cr0 */
24971@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
24972 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24973 * address given in m16:64.
24974 */
24975+ pax_set_fptr_mask
24976 movq initial_code(%rip),%rax
24977 pushq $0 # fake return address to stop unwinder
24978 pushq $__KERNEL_CS # set correct cs
24979@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
24980 .quad INIT_PER_CPU_VAR(irq_stack_union)
24981
24982 GLOBAL(stack_start)
24983- .quad init_thread_union+THREAD_SIZE-8
24984+ .quad init_thread_union+THREAD_SIZE-16
24985 .word 0
24986 __FINITDATA
24987
24988@@ -393,7 +429,7 @@ early_idt_handler_common:
24989 call dump_stack
24990 #ifdef CONFIG_KALLSYMS
24991 leaq early_idt_ripmsg(%rip),%rdi
24992- movq 40(%rsp),%rsi # %rip again
24993+ movq 88(%rsp),%rsi # %rip again
24994 call __print_symbol
24995 #endif
24996 #endif /* EARLY_PRINTK */
24997@@ -422,6 +458,7 @@ ENDPROC(early_idt_handler_common)
24998 early_recursion_flag:
24999 .long 0
25000
25001+ .section .rodata,"a",@progbits
25002 #ifdef CONFIG_EARLY_PRINTK
25003 early_idt_msg:
25004 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
25005@@ -449,29 +486,52 @@ NEXT_PAGE(early_level4_pgt)
25006 NEXT_PAGE(early_dynamic_pgts)
25007 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
25008
25009- .data
25010+ .section .rodata,"a",@progbits
25011
25012-#ifndef CONFIG_XEN
25013 NEXT_PAGE(init_level4_pgt)
25014- .fill 512,8,0
25015-#else
25016-NEXT_PAGE(init_level4_pgt)
25017- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25018 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
25019 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25020+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
25021+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
25022+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
25023+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
25024+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
25025+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25026 .org init_level4_pgt + L4_START_KERNEL*8, 0
25027 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
25028 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
25029
25030+#ifdef CONFIG_PAX_PER_CPU_PGD
25031+NEXT_PAGE(cpu_pgd)
25032+ .rept 2*NR_CPUS
25033+ .fill 512,8,0
25034+ .endr
25035+#endif
25036+
25037 NEXT_PAGE(level3_ident_pgt)
25038 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
25039+#ifdef CONFIG_XEN
25040 .fill 511, 8, 0
25041+#else
25042+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
25043+ .fill 510,8,0
25044+#endif
25045+
25046+NEXT_PAGE(level3_vmalloc_start_pgt)
25047+ .fill 512,8,0
25048+
25049+NEXT_PAGE(level3_vmalloc_end_pgt)
25050+ .fill 512,8,0
25051+
25052+NEXT_PAGE(level3_vmemmap_pgt)
25053+ .fill L3_VMEMMAP_START,8,0
25054+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
25055+
25056 NEXT_PAGE(level2_ident_pgt)
25057- /* Since I easily can, map the first 1G.
25058+ /* Since I easily can, map the first 2G.
25059 * Don't set NX because code runs from these pages.
25060 */
25061- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
25062-#endif
25063+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
25064
25065 NEXT_PAGE(level3_kernel_pgt)
25066 .fill L3_START_KERNEL,8,0
25067@@ -479,6 +539,9 @@ NEXT_PAGE(level3_kernel_pgt)
25068 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
25069 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25070
25071+NEXT_PAGE(level2_vmemmap_pgt)
25072+ .fill 512,8,0
25073+
25074 NEXT_PAGE(level2_kernel_pgt)
25075 /*
25076 * 512 MB kernel mapping. We spend a full page on this pagetable
25077@@ -494,31 +557,69 @@ NEXT_PAGE(level2_kernel_pgt)
25078 KERNEL_IMAGE_SIZE/PMD_SIZE)
25079
25080 NEXT_PAGE(level2_fixmap_pgt)
25081- .fill 506,8,0
25082- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
25083- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
25084- .fill 5,8,0
25085+ .fill 504,8,0
25086+ .quad level1_fixmap_pgt - __START_KERNEL_map + 0 * PAGE_SIZE + _PAGE_TABLE
25087+ .quad level1_fixmap_pgt - __START_KERNEL_map + 1 * PAGE_SIZE + _PAGE_TABLE
25088+ .quad level1_fixmap_pgt - __START_KERNEL_map + 2 * PAGE_SIZE + _PAGE_TABLE
25089+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
25090+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25091+ .fill 4,8,0
25092
25093 NEXT_PAGE(level1_fixmap_pgt)
25094+ .fill 3*512,8,0
25095+
25096+NEXT_PAGE(level1_vsyscall_pgt)
25097 .fill 512,8,0
25098
25099 #undef PMDS
25100
25101- .data
25102+ .align PAGE_SIZE
25103+ENTRY(cpu_gdt_table)
25104+ .rept NR_CPUS
25105+ .quad 0x0000000000000000 /* NULL descriptor */
25106+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25107+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25108+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25109+ .quad 0x00cffb000000ffff /* __USER32_CS */
25110+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25111+ .quad 0x00affb000000ffff /* __USER_CS */
25112+
25113+#ifdef CONFIG_PAX_KERNEXEC
25114+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25115+#else
25116+ .quad 0x0 /* unused */
25117+#endif
25118+
25119+ .quad 0,0 /* TSS */
25120+ .quad 0,0 /* LDT */
25121+ .quad 0,0,0 /* three TLS descriptors */
25122+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25123+ /* asm/segment.h:GDT_ENTRIES must match this */
25124+
25125+#ifdef CONFIG_PAX_MEMORY_UDEREF
25126+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25127+#else
25128+ .quad 0x0 /* unused */
25129+#endif
25130+
25131+ /* zero the remaining page */
25132+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25133+ .endr
25134+
25135 .align 16
25136 .globl early_gdt_descr
25137 early_gdt_descr:
25138 .word GDT_ENTRIES*8-1
25139 early_gdt_descr_base:
25140- .quad INIT_PER_CPU_VAR(gdt_page)
25141+ .quad cpu_gdt_table
25142
25143 ENTRY(phys_base)
25144 /* This must match the first entry in level2_kernel_pgt */
25145 .quad 0x0000000000000000
25146
25147 #include "../../x86/xen/xen-head.S"
25148-
25149- __PAGE_ALIGNED_BSS
25150+
25151+ .section .rodata,"a",@progbits
25152 NEXT_PAGE(empty_zero_page)
25153 .skip PAGE_SIZE
25154
25155diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25156index 05fd74f..c3548b1 100644
25157--- a/arch/x86/kernel/i386_ksyms_32.c
25158+++ b/arch/x86/kernel/i386_ksyms_32.c
25159@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25160 EXPORT_SYMBOL(cmpxchg8b_emu);
25161 #endif
25162
25163+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25164+
25165 /* Networking helper routines. */
25166 EXPORT_SYMBOL(csum_partial_copy_generic);
25167+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25168+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25169
25170 EXPORT_SYMBOL(__get_user_1);
25171 EXPORT_SYMBOL(__get_user_2);
25172@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25173 EXPORT_SYMBOL(___preempt_schedule_context);
25174 #endif
25175 #endif
25176+
25177+#ifdef CONFIG_PAX_KERNEXEC
25178+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25179+#endif
25180+
25181+#ifdef CONFIG_PAX_PER_CPU_PGD
25182+EXPORT_SYMBOL(cpu_pgd);
25183+#endif
25184diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25185index e7cc537..67d7372 100644
25186--- a/arch/x86/kernel/i8259.c
25187+++ b/arch/x86/kernel/i8259.c
25188@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25189 static void make_8259A_irq(unsigned int irq)
25190 {
25191 disable_irq_nosync(irq);
25192- io_apic_irqs &= ~(1<<irq);
25193+ io_apic_irqs &= ~(1UL<<irq);
25194 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25195 enable_irq(irq);
25196 }
25197@@ -208,7 +208,7 @@ spurious_8259A_irq:
25198 "spurious 8259A interrupt: IRQ%d.\n", irq);
25199 spurious_irq_mask |= irqmask;
25200 }
25201- atomic_inc(&irq_err_count);
25202+ atomic_inc_unchecked(&irq_err_count);
25203 /*
25204 * Theoretically we do not have to handle this IRQ,
25205 * but in Linux this does not cause problems and is
25206@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25207 /* (slave's support for AEOI in flat mode is to be investigated) */
25208 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25209
25210+ pax_open_kernel();
25211 if (auto_eoi)
25212 /*
25213 * In AEOI mode we just have to mask the interrupt
25214 * when acking.
25215 */
25216- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25217+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25218 else
25219- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25220+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25221+ pax_close_kernel();
25222
25223 udelay(100); /* wait for 8259A to initialize */
25224
25225diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25226index a979b5b..1d6db75 100644
25227--- a/arch/x86/kernel/io_delay.c
25228+++ b/arch/x86/kernel/io_delay.c
25229@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25230 * Quirk table for systems that misbehave (lock up, etc.) if port
25231 * 0x80 is used:
25232 */
25233-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25234+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25235 {
25236 .callback = dmi_io_delay_0xed_port,
25237 .ident = "Compaq Presario V6000",
25238diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25239index 37dae79..620dd84 100644
25240--- a/arch/x86/kernel/ioport.c
25241+++ b/arch/x86/kernel/ioport.c
25242@@ -6,6 +6,7 @@
25243 #include <linux/sched.h>
25244 #include <linux/kernel.h>
25245 #include <linux/capability.h>
25246+#include <linux/security.h>
25247 #include <linux/errno.h>
25248 #include <linux/types.h>
25249 #include <linux/ioport.h>
25250@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25251 return -EINVAL;
25252 if (turn_on && !capable(CAP_SYS_RAWIO))
25253 return -EPERM;
25254+#ifdef CONFIG_GRKERNSEC_IO
25255+ if (turn_on && grsec_disable_privio) {
25256+ gr_handle_ioperm();
25257+ return -ENODEV;
25258+ }
25259+#endif
25260
25261 /*
25262 * If it's the first ioperm() call in this thread's lifetime, set the
25263@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25264 * because the ->io_bitmap_max value must match the bitmap
25265 * contents:
25266 */
25267- tss = &per_cpu(cpu_tss, get_cpu());
25268+ tss = cpu_tss + get_cpu();
25269
25270 if (turn_on)
25271 bitmap_clear(t->io_bitmap_ptr, from, num);
25272@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25273 if (level > old) {
25274 if (!capable(CAP_SYS_RAWIO))
25275 return -EPERM;
25276+#ifdef CONFIG_GRKERNSEC_IO
25277+ if (grsec_disable_privio) {
25278+ gr_handle_iopl();
25279+ return -ENODEV;
25280+ }
25281+#endif
25282 }
25283 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25284 t->iopl = level << 12;
25285diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25286index e5952c2..11c3a54 100644
25287--- a/arch/x86/kernel/irq.c
25288+++ b/arch/x86/kernel/irq.c
25289@@ -22,7 +22,7 @@
25290 #define CREATE_TRACE_POINTS
25291 #include <asm/trace/irq_vectors.h>
25292
25293-atomic_t irq_err_count;
25294+atomic_unchecked_t irq_err_count;
25295
25296 /* Function pointer for generic interrupt vector handling */
25297 void (*x86_platform_ipi_callback)(void) = NULL;
25298@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25299 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25300 seq_puts(p, " Hypervisor callback interrupts\n");
25301 #endif
25302- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25303+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25304 #if defined(CONFIG_X86_IO_APIC)
25305- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25306+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25307 #endif
25308 return 0;
25309 }
25310@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25311
25312 u64 arch_irq_stat(void)
25313 {
25314- u64 sum = atomic_read(&irq_err_count);
25315+ u64 sum = atomic_read_unchecked(&irq_err_count);
25316 return sum;
25317 }
25318
25319diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25320index f9fd86a..e6cc9ae 100644
25321--- a/arch/x86/kernel/irq_32.c
25322+++ b/arch/x86/kernel/irq_32.c
25323@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25324
25325 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25326
25327+extern void gr_handle_kernel_exploit(void);
25328+
25329 int sysctl_panic_on_stackoverflow __read_mostly;
25330
25331 /* Debugging check for stack overflow: is there less than 1KB free? */
25332@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25333 __asm__ __volatile__("andl %%esp,%0" :
25334 "=r" (sp) : "0" (THREAD_SIZE - 1));
25335
25336- return sp < (sizeof(struct thread_info) + STACK_WARN);
25337+ return sp < STACK_WARN;
25338 }
25339
25340 static void print_stack_overflow(void)
25341 {
25342 printk(KERN_WARNING "low stack detected by irq handler\n");
25343 dump_stack();
25344+ gr_handle_kernel_exploit();
25345 if (sysctl_panic_on_stackoverflow)
25346 panic("low stack detected by irq handler - check messages\n");
25347 }
25348@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25349 static inline int
25350 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25351 {
25352- struct irq_stack *curstk, *irqstk;
25353+ struct irq_stack *irqstk;
25354 u32 *isp, *prev_esp, arg1, arg2;
25355
25356- curstk = (struct irq_stack *) current_stack();
25357 irqstk = __this_cpu_read(hardirq_stack);
25358
25359 /*
25360@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25361 * handler) we can't do that and just have to keep using the
25362 * current stack (which is the irq stack already after all)
25363 */
25364- if (unlikely(curstk == irqstk))
25365+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25366 return 0;
25367
25368- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25369+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25370
25371 /* Save the next esp at the bottom of the stack */
25372 prev_esp = (u32 *)irqstk;
25373 *prev_esp = current_stack_pointer();
25374
25375+#ifdef CONFIG_PAX_MEMORY_UDEREF
25376+ __set_fs(MAKE_MM_SEG(0));
25377+#endif
25378+
25379 if (unlikely(overflow))
25380 call_on_stack(print_stack_overflow, isp);
25381
25382@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25383 : "0" (irq), "1" (desc), "2" (isp),
25384 "D" (desc->handle_irq)
25385 : "memory", "cc", "ecx");
25386+
25387+#ifdef CONFIG_PAX_MEMORY_UDEREF
25388+ __set_fs(current_thread_info()->addr_limit);
25389+#endif
25390+
25391 return 1;
25392 }
25393
25394@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25395 */
25396 void irq_ctx_init(int cpu)
25397 {
25398- struct irq_stack *irqstk;
25399-
25400 if (per_cpu(hardirq_stack, cpu))
25401 return;
25402
25403- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25404- THREADINFO_GFP,
25405- THREAD_SIZE_ORDER));
25406- per_cpu(hardirq_stack, cpu) = irqstk;
25407-
25408- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25409- THREADINFO_GFP,
25410- THREAD_SIZE_ORDER));
25411- per_cpu(softirq_stack, cpu) = irqstk;
25412-
25413- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25414- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25415+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25416+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25417 }
25418
25419 void do_softirq_own_stack(void)
25420 {
25421- struct thread_info *curstk;
25422 struct irq_stack *irqstk;
25423 u32 *isp, *prev_esp;
25424
25425- curstk = current_stack();
25426 irqstk = __this_cpu_read(softirq_stack);
25427
25428 /* build the stack frame on the softirq stack */
25429@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25430 prev_esp = (u32 *)irqstk;
25431 *prev_esp = current_stack_pointer();
25432
25433+#ifdef CONFIG_PAX_MEMORY_UDEREF
25434+ __set_fs(MAKE_MM_SEG(0));
25435+#endif
25436+
25437 call_on_stack(__do_softirq, isp);
25438+
25439+#ifdef CONFIG_PAX_MEMORY_UDEREF
25440+ __set_fs(current_thread_info()->addr_limit);
25441+#endif
25442+
25443 }
25444
25445 bool handle_irq(unsigned irq, struct pt_regs *regs)
25446diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25447index 394e643..824fce8 100644
25448--- a/arch/x86/kernel/irq_64.c
25449+++ b/arch/x86/kernel/irq_64.c
25450@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25451 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25452 EXPORT_PER_CPU_SYMBOL(irq_regs);
25453
25454+extern void gr_handle_kernel_exploit(void);
25455+
25456 int sysctl_panic_on_stackoverflow;
25457
25458 /*
25459@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25460 irq_stack_top, irq_stack_bottom,
25461 estack_top, estack_bottom);
25462
25463+ gr_handle_kernel_exploit();
25464+
25465 if (sysctl_panic_on_stackoverflow)
25466 panic("low stack detected by irq handler - check messages\n");
25467 #endif
25468diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25469index 26d5a55..bf8b49b 100644
25470--- a/arch/x86/kernel/jump_label.c
25471+++ b/arch/x86/kernel/jump_label.c
25472@@ -31,6 +31,8 @@ static void bug_at(unsigned char *ip, int line)
25473 * Something went wrong. Crash the box, as something could be
25474 * corrupting the kernel.
25475 */
25476+ ip = ktla_ktva(ip);
25477+ pr_warning("Unexpected op at %pS [%p] %s:%d\n", ip, ip, __FILE__, line);
25478 pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n",
25479 ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line);
25480 BUG();
25481@@ -51,7 +53,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25482 * Jump label is enabled for the first time.
25483 * So we expect a default_nop...
25484 */
25485- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25486+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25487 != 0))
25488 bug_at((void *)entry->code, __LINE__);
25489 } else {
25490@@ -59,7 +61,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25491 * ...otherwise expect an ideal_nop. Otherwise
25492 * something went horribly wrong.
25493 */
25494- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25495+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25496 != 0))
25497 bug_at((void *)entry->code, __LINE__);
25498 }
25499@@ -75,13 +77,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25500 * are converting the default nop to the ideal nop.
25501 */
25502 if (init) {
25503- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25504+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25505 bug_at((void *)entry->code, __LINE__);
25506 } else {
25507 code.jump = 0xe9;
25508 code.offset = entry->target -
25509 (entry->code + JUMP_LABEL_NOP_SIZE);
25510- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25511+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25512 bug_at((void *)entry->code, __LINE__);
25513 }
25514 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25515diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25516index d6178d9..e12482f 100644
25517--- a/arch/x86/kernel/kgdb.c
25518+++ b/arch/x86/kernel/kgdb.c
25519@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25520 bp->attr.bp_addr = breakinfo[breakno].addr;
25521 bp->attr.bp_len = breakinfo[breakno].len;
25522 bp->attr.bp_type = breakinfo[breakno].type;
25523- info->address = breakinfo[breakno].addr;
25524+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25525+ info->address = ktla_ktva(breakinfo[breakno].addr);
25526+ else
25527+ info->address = breakinfo[breakno].addr;
25528 info->len = breakinfo[breakno].len;
25529 info->type = breakinfo[breakno].type;
25530 val = arch_install_hw_breakpoint(bp);
25531@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25532 case 'k':
25533 /* clear the trace bit */
25534 linux_regs->flags &= ~X86_EFLAGS_TF;
25535- atomic_set(&kgdb_cpu_doing_single_step, -1);
25536+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25537
25538 /* set the trace bit if we're stepping */
25539 if (remcomInBuffer[0] == 's') {
25540 linux_regs->flags |= X86_EFLAGS_TF;
25541- atomic_set(&kgdb_cpu_doing_single_step,
25542+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25543 raw_smp_processor_id());
25544 }
25545
25546@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25547
25548 switch (cmd) {
25549 case DIE_DEBUG:
25550- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25551+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25552 if (user_mode(regs))
25553 return single_step_cont(regs, args);
25554 break;
25555@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25556 #endif /* CONFIG_DEBUG_RODATA */
25557
25558 bpt->type = BP_BREAKPOINT;
25559- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25560+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25561 BREAK_INSTR_SIZE);
25562 if (err)
25563 return err;
25564- err = probe_kernel_write((char *)bpt->bpt_addr,
25565+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25566 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25567 #ifdef CONFIG_DEBUG_RODATA
25568 if (!err)
25569@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25570 return -EBUSY;
25571 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25572 BREAK_INSTR_SIZE);
25573- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25574+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25575 if (err)
25576 return err;
25577 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25578@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25579 if (mutex_is_locked(&text_mutex))
25580 goto knl_write;
25581 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25582- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25583+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25584 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25585 goto knl_write;
25586 return err;
25587 knl_write:
25588 #endif /* CONFIG_DEBUG_RODATA */
25589- return probe_kernel_write((char *)bpt->bpt_addr,
25590+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25591 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25592 }
25593
25594diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25595index 1deffe6..4705700 100644
25596--- a/arch/x86/kernel/kprobes/core.c
25597+++ b/arch/x86/kernel/kprobes/core.c
25598@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25599 s32 raddr;
25600 } __packed *insn;
25601
25602- insn = (struct __arch_relative_insn *)from;
25603+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25604+
25605+ pax_open_kernel();
25606 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25607 insn->op = op;
25608+ pax_close_kernel();
25609 }
25610
25611 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25612@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25613 kprobe_opcode_t opcode;
25614 kprobe_opcode_t *orig_opcodes = opcodes;
25615
25616- if (search_exception_tables((unsigned long)opcodes))
25617+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25618 return 0; /* Page fault may occur on this address. */
25619
25620 retry:
25621@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25622 * Fortunately, we know that the original code is the ideal 5-byte
25623 * long NOP.
25624 */
25625- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25626+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25627 if (faddr)
25628 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25629 else
25630 buf[0] = kp->opcode;
25631- return (unsigned long)buf;
25632+ return ktva_ktla((unsigned long)buf);
25633 }
25634
25635 /*
25636@@ -367,7 +370,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25637 /* Another subsystem puts a breakpoint, failed to recover */
25638 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25639 return 0;
25640+ pax_open_kernel();
25641 memcpy(dest, insn.kaddr, length);
25642+ pax_close_kernel();
25643
25644 #ifdef CONFIG_X86_64
25645 if (insn_rip_relative(&insn)) {
25646@@ -394,7 +399,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25647 return 0;
25648 }
25649 disp = (u8 *) dest + insn_offset_displacement(&insn);
25650+ pax_open_kernel();
25651 *(s32 *) disp = (s32) newdisp;
25652+ pax_close_kernel();
25653 }
25654 #endif
25655 return length;
25656@@ -536,7 +543,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25657 * nor set current_kprobe, because it doesn't use single
25658 * stepping.
25659 */
25660- regs->ip = (unsigned long)p->ainsn.insn;
25661+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25662 preempt_enable_no_resched();
25663 return;
25664 }
25665@@ -553,9 +560,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25666 regs->flags &= ~X86_EFLAGS_IF;
25667 /* single step inline if the instruction is an int3 */
25668 if (p->opcode == BREAKPOINT_INSTRUCTION)
25669- regs->ip = (unsigned long)p->addr;
25670+ regs->ip = ktla_ktva((unsigned long)p->addr);
25671 else
25672- regs->ip = (unsigned long)p->ainsn.insn;
25673+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25674 }
25675 NOKPROBE_SYMBOL(setup_singlestep);
25676
25677@@ -640,7 +647,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25678 setup_singlestep(p, regs, kcb, 0);
25679 return 1;
25680 }
25681- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25682+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25683 /*
25684 * The breakpoint instruction was removed right
25685 * after we hit it. Another cpu has removed
25686@@ -687,6 +694,9 @@ static void __used kretprobe_trampoline_holder(void)
25687 " movq %rax, 152(%rsp)\n"
25688 RESTORE_REGS_STRING
25689 " popfq\n"
25690+#ifdef KERNEXEC_PLUGIN
25691+ " btsq $63,(%rsp)\n"
25692+#endif
25693 #else
25694 " pushf\n"
25695 SAVE_REGS_STRING
25696@@ -827,7 +837,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25697 struct kprobe_ctlblk *kcb)
25698 {
25699 unsigned long *tos = stack_addr(regs);
25700- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25701+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25702 unsigned long orig_ip = (unsigned long)p->addr;
25703 kprobe_opcode_t *insn = p->ainsn.insn;
25704
25705diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25706index 7b3b9d1..e2478b91 100644
25707--- a/arch/x86/kernel/kprobes/opt.c
25708+++ b/arch/x86/kernel/kprobes/opt.c
25709@@ -79,6 +79,7 @@ found:
25710 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25711 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25712 {
25713+ pax_open_kernel();
25714 #ifdef CONFIG_X86_64
25715 *addr++ = 0x48;
25716 *addr++ = 0xbf;
25717@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25718 *addr++ = 0xb8;
25719 #endif
25720 *(unsigned long *)addr = val;
25721+ pax_close_kernel();
25722 }
25723
25724 asm (
25725@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25726 * Verify if the address gap is in 2GB range, because this uses
25727 * a relative jump.
25728 */
25729- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25730+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25731 if (abs(rel) > 0x7fffffff) {
25732 __arch_remove_optimized_kprobe(op, 0);
25733 return -ERANGE;
25734@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25735 op->optinsn.size = ret;
25736
25737 /* Copy arch-dep-instance from template */
25738- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25739+ pax_open_kernel();
25740+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25741+ pax_close_kernel();
25742
25743 /* Set probe information */
25744 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25745
25746 /* Set probe function call */
25747- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25748+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25749
25750 /* Set returning jmp instruction at the tail of out-of-line buffer */
25751- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25752+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25753 (u8 *)op->kp.addr + op->optinsn.size);
25754
25755 flush_icache_range((unsigned long) buf,
25756@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25757 WARN_ON(kprobe_disabled(&op->kp));
25758
25759 /* Backup instructions which will be replaced by jump address */
25760- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25761+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25762 RELATIVE_ADDR_SIZE);
25763
25764 insn_buf[0] = RELATIVEJUMP_OPCODE;
25765@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25766 /* This kprobe is really able to run optimized path. */
25767 op = container_of(p, struct optimized_kprobe, kp);
25768 /* Detour through copied instructions */
25769- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25770+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25771 if (!reenter)
25772 reset_current_kprobe();
25773 preempt_enable_no_resched();
25774diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25775index c2bedae..25e7ab60 100644
25776--- a/arch/x86/kernel/ksysfs.c
25777+++ b/arch/x86/kernel/ksysfs.c
25778@@ -184,7 +184,7 @@ out:
25779
25780 static struct kobj_attribute type_attr = __ATTR_RO(type);
25781
25782-static struct bin_attribute data_attr = {
25783+static bin_attribute_no_const data_attr __read_only = {
25784 .attr = {
25785 .name = "data",
25786 .mode = S_IRUGO,
25787diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25788index c37886d..f43b63d 100644
25789--- a/arch/x86/kernel/ldt.c
25790+++ b/arch/x86/kernel/ldt.c
25791@@ -11,6 +11,7 @@
25792 #include <linux/sched.h>
25793 #include <linux/string.h>
25794 #include <linux/mm.h>
25795+#include <linux/ratelimit.h>
25796 #include <linux/smp.h>
25797 #include <linux/vmalloc.h>
25798 #include <linux/uaccess.h>
25799@@ -20,6 +21,14 @@
25800 #include <asm/mmu_context.h>
25801 #include <asm/syscalls.h>
25802
25803+#ifdef CONFIG_GRKERNSEC
25804+int sysctl_modify_ldt __read_only = 0;
25805+#elif defined(CONFIG_DEFAULT_MODIFY_LDT_SYSCALL)
25806+int sysctl_modify_ldt __read_only = 1;
25807+#else
25808+int sysctl_modify_ldt __read_only = 0;
25809+#endif
25810+
25811 #ifdef CONFIG_SMP
25812 static void flush_ldt(void *current_mm)
25813 {
25814@@ -66,13 +75,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25815 if (reload) {
25816 #ifdef CONFIG_SMP
25817 preempt_disable();
25818- load_LDT(pc);
25819+ load_LDT_nolock(pc);
25820 if (!cpumask_equal(mm_cpumask(current->mm),
25821 cpumask_of(smp_processor_id())))
25822 smp_call_function(flush_ldt, current->mm, 1);
25823 preempt_enable();
25824 #else
25825- load_LDT(pc);
25826+ load_LDT_nolock(pc);
25827 #endif
25828 }
25829 if (oldsize) {
25830@@ -94,7 +103,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25831 return err;
25832
25833 for (i = 0; i < old->size; i++)
25834- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25835+ write_ldt_entry(new->ldt, i, old->ldt + i);
25836 return 0;
25837 }
25838
25839@@ -115,6 +124,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25840 retval = copy_ldt(&mm->context, &old_mm->context);
25841 mutex_unlock(&old_mm->context.lock);
25842 }
25843+
25844+ if (tsk == current) {
25845+ mm->context.vdso = 0;
25846+
25847+#ifdef CONFIG_X86_32
25848+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25849+ mm->context.user_cs_base = 0UL;
25850+ mm->context.user_cs_limit = ~0UL;
25851+
25852+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25853+ cpumask_clear(&mm->context.cpu_user_cs_mask);
25854+#endif
25855+
25856+#endif
25857+#endif
25858+
25859+ }
25860+
25861 return retval;
25862 }
25863
25864@@ -229,6 +256,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25865 }
25866 }
25867
25868+#ifdef CONFIG_PAX_SEGMEXEC
25869+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25870+ error = -EINVAL;
25871+ goto out_unlock;
25872+ }
25873+#endif
25874+
25875 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25876 error = -EINVAL;
25877 goto out_unlock;
25878@@ -254,6 +288,15 @@ asmlinkage int sys_modify_ldt(int func, void __user *ptr,
25879 {
25880 int ret = -ENOSYS;
25881
25882+ if (!sysctl_modify_ldt) {
25883+ printk_ratelimited(KERN_INFO
25884+ "Denied a call to modify_ldt() from %s[%d] (uid: %d)."
25885+ " Adjust sysctl if this was not an exploit attempt.\n",
25886+ current->comm, task_pid_nr(current),
25887+ from_kuid_munged(current_user_ns(), current_uid()));
25888+ return ret;
25889+ }
25890+
25891 switch (func) {
25892 case 0:
25893 ret = read_ldt(ptr, bytecount);
25894diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
25895index ff3c3101d..d7c0cd8 100644
25896--- a/arch/x86/kernel/livepatch.c
25897+++ b/arch/x86/kernel/livepatch.c
25898@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25899 int ret, numpages, size = 4;
25900 bool readonly;
25901 unsigned long val;
25902- unsigned long core = (unsigned long)mod->module_core;
25903- unsigned long core_ro_size = mod->core_ro_size;
25904- unsigned long core_size = mod->core_size;
25905+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
25906+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
25907+ unsigned long core_size_rx = mod->core_size_rx;
25908+ unsigned long core_size_rw = mod->core_size_rw;
25909
25910 switch (type) {
25911 case R_X86_64_NONE:
25912@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25913 return -EINVAL;
25914 }
25915
25916- if (loc < core || loc >= core + core_size)
25917+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
25918+ (loc < core_rw || loc >= core_rw + core_size_rw))
25919 /* loc does not point to any symbol inside the module */
25920 return -EINVAL;
25921
25922- if (loc < core + core_ro_size)
25923+ if (loc < core_rx + core_size_rx)
25924 readonly = true;
25925 else
25926 readonly = false;
25927diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25928index 469b23d..5449cfe 100644
25929--- a/arch/x86/kernel/machine_kexec_32.c
25930+++ b/arch/x86/kernel/machine_kexec_32.c
25931@@ -26,7 +26,7 @@
25932 #include <asm/cacheflush.h>
25933 #include <asm/debugreg.h>
25934
25935-static void set_idt(void *newidt, __u16 limit)
25936+static void set_idt(struct desc_struct *newidt, __u16 limit)
25937 {
25938 struct desc_ptr curidt;
25939
25940@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
25941 }
25942
25943
25944-static void set_gdt(void *newgdt, __u16 limit)
25945+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25946 {
25947 struct desc_ptr curgdt;
25948
25949@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
25950 }
25951
25952 control_page = page_address(image->control_code_page);
25953- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25954+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25955
25956 relocate_kernel_ptr = control_page;
25957 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25958diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25959index 94ea120..4154cea 100644
25960--- a/arch/x86/kernel/mcount_64.S
25961+++ b/arch/x86/kernel/mcount_64.S
25962@@ -7,7 +7,7 @@
25963 #include <linux/linkage.h>
25964 #include <asm/ptrace.h>
25965 #include <asm/ftrace.h>
25966-
25967+#include <asm/alternative-asm.h>
25968
25969 .code64
25970 .section .entry.text, "ax"
25971@@ -148,8 +148,9 @@
25972 #ifdef CONFIG_DYNAMIC_FTRACE
25973
25974 ENTRY(function_hook)
25975+ pax_force_retaddr
25976 retq
25977-END(function_hook)
25978+ENDPROC(function_hook)
25979
25980 ENTRY(ftrace_caller)
25981 /* save_mcount_regs fills in first two parameters */
25982@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
25983 #endif
25984
25985 GLOBAL(ftrace_stub)
25986+ pax_force_retaddr
25987 retq
25988-END(ftrace_caller)
25989+ENDPROC(ftrace_caller)
25990
25991 ENTRY(ftrace_regs_caller)
25992 /* Save the current flags before any operations that can change them */
25993@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
25994
25995 jmp ftrace_return
25996
25997-END(ftrace_regs_caller)
25998+ENDPROC(ftrace_regs_caller)
25999
26000
26001 #else /* ! CONFIG_DYNAMIC_FTRACE */
26002@@ -272,18 +274,20 @@ fgraph_trace:
26003 #endif
26004
26005 GLOBAL(ftrace_stub)
26006+ pax_force_retaddr
26007 retq
26008
26009 trace:
26010 /* save_mcount_regs fills in first two parameters */
26011 save_mcount_regs
26012
26013+ pax_force_fptr ftrace_trace_function
26014 call *ftrace_trace_function
26015
26016 restore_mcount_regs
26017
26018 jmp fgraph_trace
26019-END(function_hook)
26020+ENDPROC(function_hook)
26021 #endif /* CONFIG_DYNAMIC_FTRACE */
26022 #endif /* CONFIG_FUNCTION_TRACER */
26023
26024@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
26025
26026 restore_mcount_regs
26027
26028+ pax_force_retaddr
26029 retq
26030-END(ftrace_graph_caller)
26031+ENDPROC(ftrace_graph_caller)
26032
26033 GLOBAL(return_to_handler)
26034 subq $24, %rsp
26035@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
26036 movq 8(%rsp), %rdx
26037 movq (%rsp), %rax
26038 addq $24, %rsp
26039+ pax_force_fptr %rdi
26040 jmp *%rdi
26041+ENDPROC(return_to_handler)
26042 #endif
26043diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
26044index 005c03e..2f440cd 100644
26045--- a/arch/x86/kernel/module.c
26046+++ b/arch/x86/kernel/module.c
26047@@ -75,17 +75,17 @@ static unsigned long int get_module_load_offset(void)
26048 }
26049 #endif
26050
26051-void *module_alloc(unsigned long size)
26052+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
26053 {
26054 void *p;
26055
26056- if (PAGE_ALIGN(size) > MODULES_LEN)
26057+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
26058 return NULL;
26059
26060 p = __vmalloc_node_range(size, MODULE_ALIGN,
26061 MODULES_VADDR + get_module_load_offset(),
26062- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
26063- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
26064+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
26065+ prot, 0, NUMA_NO_NODE,
26066 __builtin_return_address(0));
26067 if (p && (kasan_module_alloc(p, size) < 0)) {
26068 vfree(p);
26069@@ -95,6 +95,51 @@ void *module_alloc(unsigned long size)
26070 return p;
26071 }
26072
26073+void *module_alloc(unsigned long size)
26074+{
26075+
26076+#ifdef CONFIG_PAX_KERNEXEC
26077+ return __module_alloc(size, PAGE_KERNEL);
26078+#else
26079+ return __module_alloc(size, PAGE_KERNEL_EXEC);
26080+#endif
26081+
26082+}
26083+
26084+#ifdef CONFIG_PAX_KERNEXEC
26085+#ifdef CONFIG_X86_32
26086+void *module_alloc_exec(unsigned long size)
26087+{
26088+ struct vm_struct *area;
26089+
26090+ if (size == 0)
26091+ return NULL;
26092+
26093+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
26094+return area ? area->addr : NULL;
26095+}
26096+EXPORT_SYMBOL(module_alloc_exec);
26097+
26098+void module_memfree_exec(void *module_region)
26099+{
26100+ vunmap(module_region);
26101+}
26102+EXPORT_SYMBOL(module_memfree_exec);
26103+#else
26104+void module_memfree_exec(void *module_region)
26105+{
26106+ module_memfree(module_region);
26107+}
26108+EXPORT_SYMBOL(module_memfree_exec);
26109+
26110+void *module_alloc_exec(unsigned long size)
26111+{
26112+ return __module_alloc(size, PAGE_KERNEL_RX);
26113+}
26114+EXPORT_SYMBOL(module_alloc_exec);
26115+#endif
26116+#endif
26117+
26118 #ifdef CONFIG_X86_32
26119 int apply_relocate(Elf32_Shdr *sechdrs,
26120 const char *strtab,
26121@@ -105,14 +150,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26122 unsigned int i;
26123 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26124 Elf32_Sym *sym;
26125- uint32_t *location;
26126+ uint32_t *plocation, location;
26127
26128 DEBUGP("Applying relocate section %u to %u\n",
26129 relsec, sechdrs[relsec].sh_info);
26130 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26131 /* This is where to make the change */
26132- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26133- + rel[i].r_offset;
26134+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26135+ location = (uint32_t)plocation;
26136+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26137+ plocation = ktla_ktva((void *)plocation);
26138 /* This is the symbol it is referring to. Note that all
26139 undefined symbols have been resolved. */
26140 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26141@@ -121,11 +168,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26142 switch (ELF32_R_TYPE(rel[i].r_info)) {
26143 case R_386_32:
26144 /* We add the value into the location given */
26145- *location += sym->st_value;
26146+ pax_open_kernel();
26147+ *plocation += sym->st_value;
26148+ pax_close_kernel();
26149 break;
26150 case R_386_PC32:
26151 /* Add the value, subtract its position */
26152- *location += sym->st_value - (uint32_t)location;
26153+ pax_open_kernel();
26154+ *plocation += sym->st_value - location;
26155+ pax_close_kernel();
26156 break;
26157 default:
26158 pr_err("%s: Unknown relocation: %u\n",
26159@@ -170,21 +221,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26160 case R_X86_64_NONE:
26161 break;
26162 case R_X86_64_64:
26163+ pax_open_kernel();
26164 *(u64 *)loc = val;
26165+ pax_close_kernel();
26166 break;
26167 case R_X86_64_32:
26168+ pax_open_kernel();
26169 *(u32 *)loc = val;
26170+ pax_close_kernel();
26171 if (val != *(u32 *)loc)
26172 goto overflow;
26173 break;
26174 case R_X86_64_32S:
26175+ pax_open_kernel();
26176 *(s32 *)loc = val;
26177+ pax_close_kernel();
26178 if ((s64)val != *(s32 *)loc)
26179 goto overflow;
26180 break;
26181 case R_X86_64_PC32:
26182 val -= (u64)loc;
26183+ pax_open_kernel();
26184 *(u32 *)loc = val;
26185+ pax_close_kernel();
26186+
26187 #if 0
26188 if ((s64)val != *(s32 *)loc)
26189 goto overflow;
26190diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26191index 113e707..0a690e1 100644
26192--- a/arch/x86/kernel/msr.c
26193+++ b/arch/x86/kernel/msr.c
26194@@ -39,6 +39,7 @@
26195 #include <linux/notifier.h>
26196 #include <linux/uaccess.h>
26197 #include <linux/gfp.h>
26198+#include <linux/grsecurity.h>
26199
26200 #include <asm/processor.h>
26201 #include <asm/msr.h>
26202@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26203 int err = 0;
26204 ssize_t bytes = 0;
26205
26206+#ifdef CONFIG_GRKERNSEC_KMEM
26207+ gr_handle_msr_write();
26208+ return -EPERM;
26209+#endif
26210+
26211 if (count % 8)
26212 return -EINVAL; /* Invalid chunk size */
26213
26214@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26215 err = -EBADF;
26216 break;
26217 }
26218+#ifdef CONFIG_GRKERNSEC_KMEM
26219+ gr_handle_msr_write();
26220+ return -EPERM;
26221+#endif
26222 if (copy_from_user(&regs, uregs, sizeof regs)) {
26223 err = -EFAULT;
26224 break;
26225@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26226 return notifier_from_errno(err);
26227 }
26228
26229-static struct notifier_block __refdata msr_class_cpu_notifier = {
26230+static struct notifier_block msr_class_cpu_notifier = {
26231 .notifier_call = msr_class_cpu_callback,
26232 };
26233
26234diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26235index d05bd2e..f690edd 100644
26236--- a/arch/x86/kernel/nmi.c
26237+++ b/arch/x86/kernel/nmi.c
26238@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26239
26240 static void nmi_max_handler(struct irq_work *w)
26241 {
26242- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26243+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26244 int remainder_ns, decimal_msecs;
26245- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26246+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26247
26248 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26249 decimal_msecs = remainder_ns / 1000;
26250
26251 printk_ratelimited(KERN_INFO
26252 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26253- a->handler, whole_msecs, decimal_msecs);
26254+ n->action->handler, whole_msecs, decimal_msecs);
26255 }
26256
26257 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26258@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26259 delta = sched_clock() - delta;
26260 trace_nmi_handler(a->handler, (int)delta, thishandled);
26261
26262- if (delta < nmi_longest_ns || delta < a->max_duration)
26263+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26264 continue;
26265
26266- a->max_duration = delta;
26267- irq_work_queue(&a->irq_work);
26268+ a->work->max_duration = delta;
26269+ irq_work_queue(&a->work->irq_work);
26270 }
26271
26272 rcu_read_unlock();
26273@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26274 }
26275 NOKPROBE_SYMBOL(nmi_handle);
26276
26277-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26278+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26279 {
26280 struct nmi_desc *desc = nmi_to_desc(type);
26281 unsigned long flags;
26282@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26283 if (!action->handler)
26284 return -EINVAL;
26285
26286- init_irq_work(&action->irq_work, nmi_max_handler);
26287+ action->work->action = action;
26288+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26289
26290 spin_lock_irqsave(&desc->lock, flags);
26291
26292@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26293 * event confuses some handlers (kdump uses this flag)
26294 */
26295 if (action->flags & NMI_FLAG_FIRST)
26296- list_add_rcu(&action->list, &desc->head);
26297+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26298 else
26299- list_add_tail_rcu(&action->list, &desc->head);
26300+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26301
26302 spin_unlock_irqrestore(&desc->lock, flags);
26303 return 0;
26304@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26305 if (!strcmp(n->name, name)) {
26306 WARN(in_nmi(),
26307 "Trying to free NMI (%s) from NMI context!\n", n->name);
26308- list_del_rcu(&n->list);
26309+ pax_list_del_rcu((struct list_head *)&n->list);
26310 break;
26311 }
26312 }
26313@@ -481,6 +482,17 @@ static DEFINE_PER_CPU(int, update_debug_stack);
26314 dotraplinkage notrace void
26315 do_nmi(struct pt_regs *regs, long error_code)
26316 {
26317+
26318+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26319+ if (!user_mode(regs)) {
26320+ unsigned long cs = regs->cs & 0xFFFF;
26321+ unsigned long ip = ktva_ktla(regs->ip);
26322+
26323+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26324+ regs->ip = ip;
26325+ }
26326+#endif
26327+
26328 if (this_cpu_read(nmi_state) != NMI_NOT_RUNNING) {
26329 this_cpu_write(nmi_state, NMI_LATCHED);
26330 return;
26331diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26332index 6d9582e..f746287 100644
26333--- a/arch/x86/kernel/nmi_selftest.c
26334+++ b/arch/x86/kernel/nmi_selftest.c
26335@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26336 {
26337 /* trap all the unknown NMIs we may generate */
26338 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26339- __initdata);
26340+ __initconst);
26341 }
26342
26343 static void __init cleanup_nmi_testsuite(void)
26344@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26345 unsigned long timeout;
26346
26347 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26348- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26349+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26350 nmi_fail = FAILURE;
26351 return;
26352 }
26353diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26354index bbb6c73..24a58ef 100644
26355--- a/arch/x86/kernel/paravirt-spinlocks.c
26356+++ b/arch/x86/kernel/paravirt-spinlocks.c
26357@@ -8,7 +8,7 @@
26358
26359 #include <asm/paravirt.h>
26360
26361-struct pv_lock_ops pv_lock_ops = {
26362+struct pv_lock_ops pv_lock_ops __read_only = {
26363 #ifdef CONFIG_SMP
26364 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26365 .unlock_kick = paravirt_nop,
26366diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26367index c614dd4..9ad659e 100644
26368--- a/arch/x86/kernel/paravirt.c
26369+++ b/arch/x86/kernel/paravirt.c
26370@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26371 {
26372 return x;
26373 }
26374+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26375+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26376+#endif
26377
26378 void __init default_banner(void)
26379 {
26380@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26381
26382 if (opfunc == NULL)
26383 /* If there's no function, patch it with a ud2a (BUG) */
26384- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26385- else if (opfunc == _paravirt_nop)
26386+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26387+ else if (opfunc == (void *)_paravirt_nop)
26388 /* If the operation is a nop, then nop the callsite */
26389 ret = paravirt_patch_nop();
26390
26391 /* identity functions just return their single argument */
26392- else if (opfunc == _paravirt_ident_32)
26393+ else if (opfunc == (void *)_paravirt_ident_32)
26394 ret = paravirt_patch_ident_32(insnbuf, len);
26395- else if (opfunc == _paravirt_ident_64)
26396+ else if (opfunc == (void *)_paravirt_ident_64)
26397 ret = paravirt_patch_ident_64(insnbuf, len);
26398+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26399+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26400+ ret = paravirt_patch_ident_64(insnbuf, len);
26401+#endif
26402
26403 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26404 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26405@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26406 if (insn_len > len || start == NULL)
26407 insn_len = len;
26408 else
26409- memcpy(insnbuf, start, insn_len);
26410+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26411
26412 return insn_len;
26413 }
26414@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26415 return this_cpu_read(paravirt_lazy_mode);
26416 }
26417
26418-struct pv_info pv_info = {
26419+struct pv_info pv_info __read_only = {
26420 .name = "bare hardware",
26421 .paravirt_enabled = 0,
26422 .kernel_rpl = 0,
26423@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26424 #endif
26425 };
26426
26427-struct pv_init_ops pv_init_ops = {
26428+struct pv_init_ops pv_init_ops __read_only = {
26429 .patch = native_patch,
26430 };
26431
26432-struct pv_time_ops pv_time_ops = {
26433+struct pv_time_ops pv_time_ops __read_only = {
26434 .sched_clock = native_sched_clock,
26435 .steal_clock = native_steal_clock,
26436 };
26437
26438-__visible struct pv_irq_ops pv_irq_ops = {
26439+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26440 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26441 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26442 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26443@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26444 #endif
26445 };
26446
26447-__visible struct pv_cpu_ops pv_cpu_ops = {
26448+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26449 .cpuid = native_cpuid,
26450 .get_debugreg = native_get_debugreg,
26451 .set_debugreg = native_set_debugreg,
26452@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26453 NOKPROBE_SYMBOL(native_set_debugreg);
26454 NOKPROBE_SYMBOL(native_load_idt);
26455
26456-struct pv_apic_ops pv_apic_ops = {
26457+struct pv_apic_ops pv_apic_ops __read_only= {
26458 #ifdef CONFIG_X86_LOCAL_APIC
26459 .startup_ipi_hook = paravirt_nop,
26460 #endif
26461 };
26462
26463-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26464+#ifdef CONFIG_X86_32
26465+#ifdef CONFIG_X86_PAE
26466+/* 64-bit pagetable entries */
26467+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26468+#else
26469 /* 32-bit pagetable entries */
26470 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26471+#endif
26472 #else
26473 /* 64-bit pagetable entries */
26474 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26475 #endif
26476
26477-struct pv_mmu_ops pv_mmu_ops = {
26478+struct pv_mmu_ops pv_mmu_ops __read_only = {
26479
26480 .read_cr2 = native_read_cr2,
26481 .write_cr2 = native_write_cr2,
26482@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26483 .make_pud = PTE_IDENT,
26484
26485 .set_pgd = native_set_pgd,
26486+ .set_pgd_batched = native_set_pgd_batched,
26487 #endif
26488 #endif /* CONFIG_PGTABLE_LEVELS >= 3 */
26489
26490@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26491 },
26492
26493 .set_fixmap = native_set_fixmap,
26494+
26495+#ifdef CONFIG_PAX_KERNEXEC
26496+ .pax_open_kernel = native_pax_open_kernel,
26497+ .pax_close_kernel = native_pax_close_kernel,
26498+#endif
26499+
26500 };
26501
26502 EXPORT_SYMBOL_GPL(pv_time_ops);
26503diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26504index a1da673..b6f5831 100644
26505--- a/arch/x86/kernel/paravirt_patch_64.c
26506+++ b/arch/x86/kernel/paravirt_patch_64.c
26507@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26508 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26509 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26510 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26511+
26512+#ifndef CONFIG_PAX_MEMORY_UDEREF
26513 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26514+#endif
26515+
26516 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26517 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26518
26519@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26520 PATCH_SITE(pv_mmu_ops, read_cr3);
26521 PATCH_SITE(pv_mmu_ops, write_cr3);
26522 PATCH_SITE(pv_cpu_ops, clts);
26523+
26524+#ifndef CONFIG_PAX_MEMORY_UDEREF
26525 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26526+#endif
26527+
26528 PATCH_SITE(pv_cpu_ops, wbinvd);
26529
26530 patch_site:
26531diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26532index 0497f71..7186c0d 100644
26533--- a/arch/x86/kernel/pci-calgary_64.c
26534+++ b/arch/x86/kernel/pci-calgary_64.c
26535@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26536 tce_space = be64_to_cpu(readq(target));
26537 tce_space = tce_space & TAR_SW_BITS;
26538
26539- tce_space = tce_space & (~specified_table_size);
26540+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26541 info->tce_space = (u64 *)__va(tce_space);
26542 }
26543 }
26544diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26545index 35ccf75..7a15747 100644
26546--- a/arch/x86/kernel/pci-iommu_table.c
26547+++ b/arch/x86/kernel/pci-iommu_table.c
26548@@ -2,7 +2,7 @@
26549 #include <asm/iommu_table.h>
26550 #include <linux/string.h>
26551 #include <linux/kallsyms.h>
26552-
26553+#include <linux/sched.h>
26554
26555 #define DEBUG 1
26556
26557diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26558index 77dd0ad..9ec4723 100644
26559--- a/arch/x86/kernel/pci-swiotlb.c
26560+++ b/arch/x86/kernel/pci-swiotlb.c
26561@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26562 struct dma_attrs *attrs)
26563 {
26564 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26565- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26566+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26567 else
26568 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26569 }
26570diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26571index 6e338e3..82f946e 100644
26572--- a/arch/x86/kernel/process.c
26573+++ b/arch/x86/kernel/process.c
26574@@ -38,7 +38,8 @@
26575 * section. Since TSS's are completely CPU-local, we want them
26576 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26577 */
26578-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {
26579+struct tss_struct cpu_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = {
26580+ [0 ... NR_CPUS-1] = {
26581 .x86_tss = {
26582 .sp0 = TOP_OF_INIT_STACK,
26583 #ifdef CONFIG_X86_32
26584@@ -56,6 +57,7 @@ __visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss) = {
26585 */
26586 .io_bitmap = { [0 ... IO_BITMAP_LONGS] = ~0 },
26587 #endif
26588+}
26589 };
26590 EXPORT_PER_CPU_SYMBOL(cpu_tss);
26591
26592@@ -115,7 +117,7 @@ void arch_task_cache_init(void)
26593 task_xstate_cachep =
26594 kmem_cache_create("task_xstate", xstate_size,
26595 __alignof__(union thread_xstate),
26596- SLAB_PANIC | SLAB_NOTRACK, NULL);
26597+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26598 setup_xstate_comp();
26599 }
26600
26601@@ -129,7 +131,7 @@ void exit_thread(void)
26602 unsigned long *bp = t->io_bitmap_ptr;
26603
26604 if (bp) {
26605- struct tss_struct *tss = &per_cpu(cpu_tss, get_cpu());
26606+ struct tss_struct *tss = cpu_tss + get_cpu();
26607
26608 t->io_bitmap_ptr = NULL;
26609 clear_thread_flag(TIF_IO_BITMAP);
26610@@ -149,6 +151,9 @@ void flush_thread(void)
26611 {
26612 struct task_struct *tsk = current;
26613
26614+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26615+ loadsegment(gs, 0);
26616+#endif
26617 flush_ptrace_hw_breakpoint(tsk);
26618 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26619
26620@@ -302,7 +307,7 @@ static void __exit_idle(void)
26621 void exit_idle(void)
26622 {
26623 /* idle loop has pid 0 */
26624- if (current->pid)
26625+ if (task_pid_nr(current))
26626 return;
26627 __exit_idle();
26628 }
26629@@ -355,7 +360,7 @@ bool xen_set_default_idle(void)
26630 return ret;
26631 }
26632 #endif
26633-void stop_this_cpu(void *dummy)
26634+__noreturn void stop_this_cpu(void *dummy)
26635 {
26636 local_irq_disable();
26637 /*
26638@@ -531,16 +536,43 @@ static int __init idle_setup(char *str)
26639 }
26640 early_param("idle", idle_setup);
26641
26642-unsigned long arch_align_stack(unsigned long sp)
26643-{
26644- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26645- sp -= get_random_int() % 8192;
26646- return sp & ~0xf;
26647-}
26648-
26649 unsigned long arch_randomize_brk(struct mm_struct *mm)
26650 {
26651 unsigned long range_end = mm->brk + 0x02000000;
26652 return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26653 }
26654
26655+#ifdef CONFIG_PAX_RANDKSTACK
26656+void pax_randomize_kstack(struct pt_regs *regs)
26657+{
26658+ struct thread_struct *thread = &current->thread;
26659+ unsigned long time;
26660+
26661+ if (!randomize_va_space)
26662+ return;
26663+
26664+ if (v8086_mode(regs))
26665+ return;
26666+
26667+ rdtscl(time);
26668+
26669+ /* P4 seems to return a 0 LSB, ignore it */
26670+#ifdef CONFIG_MPENTIUM4
26671+ time &= 0x3EUL;
26672+ time <<= 2;
26673+#elif defined(CONFIG_X86_64)
26674+ time &= 0xFUL;
26675+ time <<= 4;
26676+#else
26677+ time &= 0x1FUL;
26678+ time <<= 3;
26679+#endif
26680+
26681+ thread->sp0 ^= time;
26682+ load_sp0(cpu_tss + smp_processor_id(), thread);
26683+
26684+#ifdef CONFIG_X86_64
26685+ this_cpu_write(kernel_stack, thread->sp0);
26686+#endif
26687+}
26688+#endif
26689diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26690index 8ed2106..1345704 100644
26691--- a/arch/x86/kernel/process_32.c
26692+++ b/arch/x86/kernel/process_32.c
26693@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26694 unsigned long thread_saved_pc(struct task_struct *tsk)
26695 {
26696 return ((unsigned long *)tsk->thread.sp)[3];
26697+//XXX return tsk->thread.eip;
26698 }
26699
26700 void __show_regs(struct pt_regs *regs, int all)
26701@@ -76,16 +77,15 @@ void __show_regs(struct pt_regs *regs, int all)
26702 if (user_mode(regs)) {
26703 sp = regs->sp;
26704 ss = regs->ss & 0xffff;
26705- gs = get_user_gs(regs);
26706 } else {
26707 sp = kernel_stack_pointer(regs);
26708 savesegment(ss, ss);
26709- savesegment(gs, gs);
26710 }
26711+ gs = get_user_gs(regs);
26712
26713 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26714 (u16)regs->cs, regs->ip, regs->flags,
26715- smp_processor_id());
26716+ raw_smp_processor_id());
26717 print_symbol("EIP is at %s\n", regs->ip);
26718
26719 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26720@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26721 int copy_thread(unsigned long clone_flags, unsigned long sp,
26722 unsigned long arg, struct task_struct *p)
26723 {
26724- struct pt_regs *childregs = task_pt_regs(p);
26725+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26726 struct task_struct *tsk;
26727 int err;
26728
26729 p->thread.sp = (unsigned long) childregs;
26730 p->thread.sp0 = (unsigned long) (childregs+1);
26731+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26732 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26733
26734 if (unlikely(p->flags & PF_KTHREAD)) {
26735 /* kernel thread */
26736 memset(childregs, 0, sizeof(struct pt_regs));
26737 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26738- task_user_gs(p) = __KERNEL_STACK_CANARY;
26739- childregs->ds = __USER_DS;
26740- childregs->es = __USER_DS;
26741+ savesegment(gs, childregs->gs);
26742+ childregs->ds = __KERNEL_DS;
26743+ childregs->es = __KERNEL_DS;
26744 childregs->fs = __KERNEL_PERCPU;
26745 childregs->bx = sp; /* function */
26746 childregs->bp = arg;
26747@@ -244,7 +245,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26748 struct thread_struct *prev = &prev_p->thread,
26749 *next = &next_p->thread;
26750 int cpu = smp_processor_id();
26751- struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
26752+ struct tss_struct *tss = cpu_tss + cpu;
26753 fpu_switch_t fpu;
26754
26755 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26756@@ -263,6 +264,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26757 */
26758 lazy_save_gs(prev->gs);
26759
26760+#ifdef CONFIG_PAX_MEMORY_UDEREF
26761+ __set_fs(task_thread_info(next_p)->addr_limit);
26762+#endif
26763+
26764 /*
26765 * Load the per-thread Thread-Local Storage descriptor.
26766 */
26767@@ -306,12 +311,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26768 * current_thread_info().
26769 */
26770 load_sp0(tss, next);
26771- this_cpu_write(kernel_stack,
26772- (unsigned long)task_stack_page(next_p) +
26773- THREAD_SIZE);
26774- this_cpu_write(cpu_current_top_of_stack,
26775- (unsigned long)task_stack_page(next_p) +
26776- THREAD_SIZE);
26777+ this_cpu_write(current_task, next_p);
26778+ this_cpu_write(current_tinfo, &next_p->tinfo);
26779+ this_cpu_write(kernel_stack, next->sp0);
26780+ this_cpu_write(cpu_current_top_of_stack, next->sp0);
26781
26782 /*
26783 * Restore %gs if needed (which is common)
26784@@ -321,8 +324,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26785
26786 switch_fpu_finish(next_p, fpu);
26787
26788- this_cpu_write(current_task, next_p);
26789-
26790 return prev_p;
26791 }
26792
26793@@ -352,4 +353,3 @@ unsigned long get_wchan(struct task_struct *p)
26794 } while (count++ < 16);
26795 return 0;
26796 }
26797-
26798diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26799index ddfdbf7..625417c 100644
26800--- a/arch/x86/kernel/process_64.c
26801+++ b/arch/x86/kernel/process_64.c
26802@@ -158,9 +158,10 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26803 struct pt_regs *childregs;
26804 struct task_struct *me = current;
26805
26806- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26807+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26808 childregs = task_pt_regs(p);
26809 p->thread.sp = (unsigned long) childregs;
26810+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26811 set_tsk_thread_flag(p, TIF_FORK);
26812 p->thread.io_bitmap_ptr = NULL;
26813
26814@@ -170,6 +171,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26815 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26816 savesegment(es, p->thread.es);
26817 savesegment(ds, p->thread.ds);
26818+ savesegment(ss, p->thread.ss);
26819+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26820 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26821
26822 if (unlikely(p->flags & PF_KTHREAD)) {
26823@@ -275,7 +278,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26824 struct thread_struct *prev = &prev_p->thread;
26825 struct thread_struct *next = &next_p->thread;
26826 int cpu = smp_processor_id();
26827- struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
26828+ struct tss_struct *tss = cpu_tss + cpu;
26829 unsigned fsindex, gsindex;
26830 fpu_switch_t fpu;
26831
26832@@ -326,6 +329,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26833 if (unlikely(next->ds | prev->ds))
26834 loadsegment(ds, next->ds);
26835
26836+ savesegment(ss, prev->ss);
26837+ if (unlikely(next->ss != prev->ss))
26838+ loadsegment(ss, next->ss);
26839+
26840 /*
26841 * Switch FS and GS.
26842 *
26843@@ -397,6 +404,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26844 * Switch the PDA and FPU contexts.
26845 */
26846 this_cpu_write(current_task, next_p);
26847+ this_cpu_write(current_tinfo, &next_p->tinfo);
26848
26849 /*
26850 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26851@@ -409,8 +417,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26852 /* Reload esp0 and ss1. This changes current_thread_info(). */
26853 load_sp0(tss, next);
26854
26855- this_cpu_write(kernel_stack,
26856- (unsigned long)task_stack_page(next_p) + THREAD_SIZE);
26857+ this_cpu_write(kernel_stack, next->sp0);
26858
26859 /*
26860 * Now maybe reload the debug registers and handle I/O bitmaps
26861@@ -508,12 +515,11 @@ unsigned long get_wchan(struct task_struct *p)
26862 if (!p || p == current || p->state == TASK_RUNNING)
26863 return 0;
26864 stack = (unsigned long)task_stack_page(p);
26865- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26866+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26867 return 0;
26868 fp = *(u64 *)(p->thread.sp);
26869 do {
26870- if (fp < (unsigned long)stack ||
26871- fp >= (unsigned long)stack+THREAD_SIZE)
26872+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26873 return 0;
26874 ip = *(u64 *)(fp+8);
26875 if (!in_sched_functions(ip))
26876diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26877index a7bc794..094ee8e 100644
26878--- a/arch/x86/kernel/ptrace.c
26879+++ b/arch/x86/kernel/ptrace.c
26880@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26881 unsigned long sp = (unsigned long)&regs->sp;
26882 u32 *prev_esp;
26883
26884- if (context == (sp & ~(THREAD_SIZE - 1)))
26885+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26886 return sp;
26887
26888- prev_esp = (u32 *)(context);
26889+ prev_esp = *(u32 **)(context);
26890 if (prev_esp)
26891 return (unsigned long)prev_esp;
26892
26893@@ -446,6 +446,20 @@ static int putreg(struct task_struct *child,
26894 if (child->thread.gs != value)
26895 return do_arch_prctl(child, ARCH_SET_GS, value);
26896 return 0;
26897+
26898+ case offsetof(struct user_regs_struct,ip):
26899+ /*
26900+ * Protect against any attempt to set ip to an
26901+ * impossible address. There are dragons lurking if the
26902+ * address is noncanonical. (This explicitly allows
26903+ * setting ip to TASK_SIZE_MAX, because user code can do
26904+ * that all by itself by running off the end of its
26905+ * address space.
26906+ */
26907+ if (value > TASK_SIZE_MAX)
26908+ return -EIO;
26909+ break;
26910+
26911 #endif
26912 }
26913
26914@@ -582,7 +596,7 @@ static void ptrace_triggered(struct perf_event *bp,
26915 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26916 {
26917 int i;
26918- int dr7 = 0;
26919+ unsigned long dr7 = 0;
26920 struct arch_hw_breakpoint *info;
26921
26922 for (i = 0; i < HBP_NUM; i++) {
26923@@ -816,7 +830,7 @@ long arch_ptrace(struct task_struct *child, long request,
26924 unsigned long addr, unsigned long data)
26925 {
26926 int ret;
26927- unsigned long __user *datap = (unsigned long __user *)data;
26928+ unsigned long __user *datap = (__force unsigned long __user *)data;
26929
26930 switch (request) {
26931 /* read the word at location addr in the USER area. */
26932@@ -901,14 +915,14 @@ long arch_ptrace(struct task_struct *child, long request,
26933 if ((int) addr < 0)
26934 return -EIO;
26935 ret = do_get_thread_area(child, addr,
26936- (struct user_desc __user *)data);
26937+ (__force struct user_desc __user *) data);
26938 break;
26939
26940 case PTRACE_SET_THREAD_AREA:
26941 if ((int) addr < 0)
26942 return -EIO;
26943 ret = do_set_thread_area(child, addr,
26944- (struct user_desc __user *)data, 0);
26945+ (__force struct user_desc __user *) data, 0);
26946 break;
26947 #endif
26948
26949@@ -1286,7 +1300,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26950
26951 #ifdef CONFIG_X86_64
26952
26953-static struct user_regset x86_64_regsets[] __read_mostly = {
26954+static user_regset_no_const x86_64_regsets[] __read_only = {
26955 [REGSET_GENERAL] = {
26956 .core_note_type = NT_PRSTATUS,
26957 .n = sizeof(struct user_regs_struct) / sizeof(long),
26958@@ -1327,7 +1341,7 @@ static const struct user_regset_view user_x86_64_view = {
26959 #endif /* CONFIG_X86_64 */
26960
26961 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26962-static struct user_regset x86_32_regsets[] __read_mostly = {
26963+static user_regset_no_const x86_32_regsets[] __read_only = {
26964 [REGSET_GENERAL] = {
26965 .core_note_type = NT_PRSTATUS,
26966 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26967@@ -1380,7 +1394,7 @@ static const struct user_regset_view user_x86_32_view = {
26968 */
26969 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26970
26971-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26972+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26973 {
26974 #ifdef CONFIG_X86_64
26975 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26976@@ -1415,7 +1429,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26977 memset(info, 0, sizeof(*info));
26978 info->si_signo = SIGTRAP;
26979 info->si_code = si_code;
26980- info->si_addr = user_mode(regs) ? (void __user *)regs->ip : NULL;
26981+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26982 }
26983
26984 void user_single_step_siginfo(struct task_struct *tsk,
26985@@ -1449,6 +1463,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26986 }
26987 }
26988
26989+#ifdef CONFIG_GRKERNSEC_SETXID
26990+extern void gr_delayed_cred_worker(void);
26991+#endif
26992+
26993 /*
26994 * We can return 0 to resume the syscall or anything else to go to phase
26995 * 2. If we resume the syscall, we need to put something appropriate in
26996@@ -1556,6 +1574,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26997
26998 BUG_ON(regs != task_pt_regs(current));
26999
27000+#ifdef CONFIG_GRKERNSEC_SETXID
27001+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
27002+ gr_delayed_cred_worker();
27003+#endif
27004+
27005 /*
27006 * If we stepped into a sysenter/syscall insn, it trapped in
27007 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
27008@@ -1614,6 +1637,11 @@ void syscall_trace_leave(struct pt_regs *regs)
27009 */
27010 user_exit();
27011
27012+#ifdef CONFIG_GRKERNSEC_SETXID
27013+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
27014+ gr_delayed_cred_worker();
27015+#endif
27016+
27017 audit_syscall_exit(regs);
27018
27019 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
27020diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
27021index 2f355d2..e75ed0a 100644
27022--- a/arch/x86/kernel/pvclock.c
27023+++ b/arch/x86/kernel/pvclock.c
27024@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
27025 reset_hung_task_detector();
27026 }
27027
27028-static atomic64_t last_value = ATOMIC64_INIT(0);
27029+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
27030
27031 void pvclock_resume(void)
27032 {
27033- atomic64_set(&last_value, 0);
27034+ atomic64_set_unchecked(&last_value, 0);
27035 }
27036
27037 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
27038@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
27039 * updating at the same time, and one of them could be slightly behind,
27040 * making the assumption that last_value always go forward fail to hold.
27041 */
27042- last = atomic64_read(&last_value);
27043+ last = atomic64_read_unchecked(&last_value);
27044 do {
27045 if (ret < last)
27046 return last;
27047- last = atomic64_cmpxchg(&last_value, last, ret);
27048+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
27049 } while (unlikely(last != ret));
27050
27051 return ret;
27052diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
27053index 86db4bc..a50a54a 100644
27054--- a/arch/x86/kernel/reboot.c
27055+++ b/arch/x86/kernel/reboot.c
27056@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
27057
27058 void __noreturn machine_real_restart(unsigned int type)
27059 {
27060+
27061+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
27062+ struct desc_struct *gdt;
27063+#endif
27064+
27065 local_irq_disable();
27066
27067 /*
27068@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
27069
27070 /* Jump to the identity-mapped low memory code */
27071 #ifdef CONFIG_X86_32
27072- asm volatile("jmpl *%0" : :
27073+
27074+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
27075+ gdt = get_cpu_gdt_table(smp_processor_id());
27076+ pax_open_kernel();
27077+#ifdef CONFIG_PAX_MEMORY_UDEREF
27078+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
27079+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
27080+ loadsegment(ds, __KERNEL_DS);
27081+ loadsegment(es, __KERNEL_DS);
27082+ loadsegment(ss, __KERNEL_DS);
27083+#endif
27084+#ifdef CONFIG_PAX_KERNEXEC
27085+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
27086+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
27087+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
27088+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
27089+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
27090+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
27091+#endif
27092+ pax_close_kernel();
27093+#endif
27094+
27095+ asm volatile("ljmpl *%0" : :
27096 "rm" (real_mode_header->machine_real_restart_asm),
27097 "a" (type));
27098 #else
27099@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
27100 /*
27101 * This is a single dmi_table handling all reboot quirks.
27102 */
27103-static struct dmi_system_id __initdata reboot_dmi_table[] = {
27104+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
27105
27106 /* Acer */
27107 { /* Handle reboot issue on Acer Aspire one */
27108@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
27109 * This means that this function can never return, it can misbehave
27110 * by not rebooting properly and hanging.
27111 */
27112-static void native_machine_emergency_restart(void)
27113+static void __noreturn native_machine_emergency_restart(void)
27114 {
27115 int i;
27116 int attempt = 0;
27117@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
27118 #endif
27119 }
27120
27121-static void __machine_emergency_restart(int emergency)
27122+static void __noreturn __machine_emergency_restart(int emergency)
27123 {
27124 reboot_emergency = emergency;
27125 machine_ops.emergency_restart();
27126 }
27127
27128-static void native_machine_restart(char *__unused)
27129+static void __noreturn native_machine_restart(char *__unused)
27130 {
27131 pr_notice("machine restart\n");
27132
27133@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27134 __machine_emergency_restart(0);
27135 }
27136
27137-static void native_machine_halt(void)
27138+static void __noreturn native_machine_halt(void)
27139 {
27140 /* Stop other cpus and apics */
27141 machine_shutdown();
27142@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27143 stop_this_cpu(NULL);
27144 }
27145
27146-static void native_machine_power_off(void)
27147+static void __noreturn native_machine_power_off(void)
27148 {
27149 if (pm_power_off) {
27150 if (!reboot_force)
27151@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27152 }
27153 /* A fallback in case there is no PM info available */
27154 tboot_shutdown(TB_SHUTDOWN_HALT);
27155+ unreachable();
27156 }
27157
27158-struct machine_ops machine_ops = {
27159+struct machine_ops machine_ops __read_only = {
27160 .power_off = native_machine_power_off,
27161 .shutdown = native_machine_shutdown,
27162 .emergency_restart = native_machine_emergency_restart,
27163diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27164index c8e41e9..64049ef 100644
27165--- a/arch/x86/kernel/reboot_fixups_32.c
27166+++ b/arch/x86/kernel/reboot_fixups_32.c
27167@@ -57,7 +57,7 @@ struct device_fixup {
27168 unsigned int vendor;
27169 unsigned int device;
27170 void (*reboot_fixup)(struct pci_dev *);
27171-};
27172+} __do_const;
27173
27174 /*
27175 * PCI ids solely used for fixups_table go here
27176diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27177index 98111b3..73ca125 100644
27178--- a/arch/x86/kernel/relocate_kernel_64.S
27179+++ b/arch/x86/kernel/relocate_kernel_64.S
27180@@ -96,8 +96,7 @@ relocate_kernel:
27181
27182 /* jump to identity mapped page */
27183 addq $(identity_mapped - relocate_kernel), %r8
27184- pushq %r8
27185- ret
27186+ jmp *%r8
27187
27188 identity_mapped:
27189 /* set return address to 0 if not preserving context */
27190diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27191index d74ac33..6d14941 100644
27192--- a/arch/x86/kernel/setup.c
27193+++ b/arch/x86/kernel/setup.c
27194@@ -111,6 +111,7 @@
27195 #include <asm/mce.h>
27196 #include <asm/alternative.h>
27197 #include <asm/prom.h>
27198+#include <asm/boot.h>
27199
27200 /*
27201 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27202@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27203 #endif
27204
27205
27206-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27207-__visible unsigned long mmu_cr4_features;
27208+#ifdef CONFIG_X86_64
27209+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27210+#elif defined(CONFIG_X86_PAE)
27211+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27212 #else
27213-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27214+__visible unsigned long mmu_cr4_features __read_only;
27215 #endif
27216
27217 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27218@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27219 * area (640->1Mb) as ram even though it is not.
27220 * take them out.
27221 */
27222- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27223+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27224
27225 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27226 }
27227@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27228 /* called before trim_bios_range() to spare extra sanitize */
27229 static void __init e820_add_kernel_range(void)
27230 {
27231- u64 start = __pa_symbol(_text);
27232+ u64 start = __pa_symbol(ktla_ktva(_text));
27233 u64 size = __pa_symbol(_end) - start;
27234
27235 /*
27236@@ -860,8 +863,8 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27237
27238 void __init setup_arch(char **cmdline_p)
27239 {
27240- memblock_reserve(__pa_symbol(_text),
27241- (unsigned long)__bss_stop - (unsigned long)_text);
27242+ memblock_reserve(__pa_symbol(ktla_ktva((unsigned long)_text)),
27243+ (unsigned long)__bss_stop - ktla_ktva((unsigned long)_text));
27244
27245 early_reserve_initrd();
27246
27247@@ -959,16 +962,16 @@ void __init setup_arch(char **cmdline_p)
27248
27249 if (!boot_params.hdr.root_flags)
27250 root_mountflags &= ~MS_RDONLY;
27251- init_mm.start_code = (unsigned long) _text;
27252- init_mm.end_code = (unsigned long) _etext;
27253+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27254+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27255 init_mm.end_data = (unsigned long) _edata;
27256 init_mm.brk = _brk_end;
27257
27258 mpx_mm_init(&init_mm);
27259
27260- code_resource.start = __pa_symbol(_text);
27261- code_resource.end = __pa_symbol(_etext)-1;
27262- data_resource.start = __pa_symbol(_etext);
27263+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27264+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27265+ data_resource.start = __pa_symbol(_sdata);
27266 data_resource.end = __pa_symbol(_edata)-1;
27267 bss_resource.start = __pa_symbol(__bss_start);
27268 bss_resource.end = __pa_symbol(__bss_stop)-1;
27269diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27270index e4fcb87..9c06c55 100644
27271--- a/arch/x86/kernel/setup_percpu.c
27272+++ b/arch/x86/kernel/setup_percpu.c
27273@@ -21,19 +21,17 @@
27274 #include <asm/cpu.h>
27275 #include <asm/stackprotector.h>
27276
27277-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27278+#ifdef CONFIG_SMP
27279+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27280 EXPORT_PER_CPU_SYMBOL(cpu_number);
27281+#endif
27282
27283-#ifdef CONFIG_X86_64
27284 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27285-#else
27286-#define BOOT_PERCPU_OFFSET 0
27287-#endif
27288
27289 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27290 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27291
27292-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27293+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27294 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27295 };
27296 EXPORT_SYMBOL(__per_cpu_offset);
27297@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27298 {
27299 #ifdef CONFIG_NEED_MULTIPLE_NODES
27300 pg_data_t *last = NULL;
27301- unsigned int cpu;
27302+ int cpu;
27303
27304 for_each_possible_cpu(cpu) {
27305 int node = early_cpu_to_node(cpu);
27306@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27307 {
27308 #ifdef CONFIG_X86_32
27309 struct desc_struct gdt;
27310+ unsigned long base = per_cpu_offset(cpu);
27311
27312- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27313- 0x2 | DESCTYPE_S, 0x8);
27314- gdt.s = 1;
27315+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27316+ 0x83 | DESCTYPE_S, 0xC);
27317 write_gdt_entry(get_cpu_gdt_table(cpu),
27318 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27319 #endif
27320@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27321 /* alrighty, percpu areas up and running */
27322 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27323 for_each_possible_cpu(cpu) {
27324+#ifdef CONFIG_CC_STACKPROTECTOR
27325+#ifdef CONFIG_X86_32
27326+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27327+#endif
27328+#endif
27329 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27330 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27331 per_cpu(cpu_number, cpu) = cpu;
27332@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27333 */
27334 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27335 #endif
27336+#ifdef CONFIG_CC_STACKPROTECTOR
27337+#ifdef CONFIG_X86_32
27338+ if (!cpu)
27339+ per_cpu(stack_canary.canary, cpu) = canary;
27340+#endif
27341+#endif
27342 /*
27343 * Up to this point, the boot CPU has been using .init.data
27344 * area. Reload any changed state for the boot CPU.
27345diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27346index 1ea14fd..b551e66 100644
27347--- a/arch/x86/kernel/signal.c
27348+++ b/arch/x86/kernel/signal.c
27349@@ -93,8 +93,15 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
27350 COPY(r15);
27351 #endif /* CONFIG_X86_64 */
27352
27353+#ifdef CONFIG_X86_32
27354 COPY_SEG_CPL3(cs);
27355 COPY_SEG_CPL3(ss);
27356+#else /* !CONFIG_X86_32 */
27357+ /* Kernel saves and restores only the CS segment register on signals,
27358+ * which is the bare minimum needed to allow mixed 32/64-bit code.
27359+ * App's signal handler can save/restore other segments if needed. */
27360+ COPY_SEG_CPL3(cs);
27361+#endif /* CONFIG_X86_32 */
27362
27363 get_user_ex(tmpflags, &sc->flags);
27364 regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
27365@@ -154,9 +161,8 @@ int setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate,
27366 #else /* !CONFIG_X86_32 */
27367 put_user_ex(regs->flags, &sc->flags);
27368 put_user_ex(regs->cs, &sc->cs);
27369- put_user_ex(0, &sc->__pad2);
27370- put_user_ex(0, &sc->__pad1);
27371- put_user_ex(regs->ss, &sc->ss);
27372+ put_user_ex(0, &sc->gs);
27373+ put_user_ex(0, &sc->fs);
27374 #endif /* CONFIG_X86_32 */
27375
27376 put_user_ex(fpstate, &sc->fpstate);
27377@@ -183,7 +189,7 @@ static unsigned long align_sigframe(unsigned long sp)
27378 * Align the stack pointer according to the i386 ABI,
27379 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27380 */
27381- sp = ((sp + 4) & -16ul) - 4;
27382+ sp = ((sp - 12) & -16ul) - 4;
27383 #else /* !CONFIG_X86_32 */
27384 sp = round_down(sp, 16) - 8;
27385 #endif
27386@@ -291,10 +297,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27387 }
27388
27389 if (current->mm->context.vdso)
27390- restorer = current->mm->context.vdso +
27391- selected_vdso32->sym___kernel_sigreturn;
27392+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27393 else
27394- restorer = &frame->retcode;
27395+ restorer = (void __user *)&frame->retcode;
27396 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27397 restorer = ksig->ka.sa.sa_restorer;
27398
27399@@ -308,7 +313,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27400 * reasons and because gdb uses it as a signature to notice
27401 * signal handler stack frames.
27402 */
27403- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27404+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27405
27406 if (err)
27407 return -EFAULT;
27408@@ -355,8 +360,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27409 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27410
27411 /* Set up to return from userspace. */
27412- restorer = current->mm->context.vdso +
27413- selected_vdso32->sym___kernel_rt_sigreturn;
27414+ if (current->mm->context.vdso)
27415+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27416+ else
27417+ restorer = (void __user *)&frame->retcode;
27418 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27419 restorer = ksig->ka.sa.sa_restorer;
27420 put_user_ex(restorer, &frame->pretcode);
27421@@ -368,7 +375,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27422 * reasons and because gdb uses it as a signature to notice
27423 * signal handler stack frames.
27424 */
27425- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27426+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27427 } put_user_catch(err);
27428
27429 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27430@@ -450,19 +457,9 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27431
27432 regs->sp = (unsigned long)frame;
27433
27434- /*
27435- * Set up the CS and SS registers to run signal handlers in
27436- * 64-bit mode, even if the handler happens to be interrupting
27437- * 32-bit or 16-bit code.
27438- *
27439- * SS is subtle. In 64-bit mode, we don't need any particular
27440- * SS descriptor, but we do need SS to be valid. It's possible
27441- * that the old SS is entirely bogus -- this can happen if the
27442- * signal we're trying to deliver is #GP or #SS caused by a bad
27443- * SS value.
27444- */
27445+ /* Set up the CS register to run signal handlers in 64-bit mode,
27446+ even if the handler happens to be interrupting 32-bit code. */
27447 regs->cs = __USER_CS;
27448- regs->ss = __USER_DS;
27449
27450 return 0;
27451 }
27452@@ -598,7 +595,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27453 {
27454 int usig = ksig->sig;
27455 sigset_t *set = sigmask_to_save();
27456- compat_sigset_t *cset = (compat_sigset_t *) set;
27457+ sigset_t sigcopy;
27458+ compat_sigset_t *cset;
27459+
27460+ sigcopy = *set;
27461+
27462+ cset = (compat_sigset_t *) &sigcopy;
27463
27464 /* Set up the stack frame */
27465 if (is_ia32_frame()) {
27466@@ -609,7 +611,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27467 } else if (is_x32_frame()) {
27468 return x32_setup_rt_frame(ksig, cset, regs);
27469 } else {
27470- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27471+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27472 }
27473 }
27474
27475diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27476index be8e1bd..a3d93fa 100644
27477--- a/arch/x86/kernel/smp.c
27478+++ b/arch/x86/kernel/smp.c
27479@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27480
27481 __setup("nonmi_ipi", nonmi_ipi_setup);
27482
27483-struct smp_ops smp_ops = {
27484+struct smp_ops smp_ops __read_only = {
27485 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27486 .smp_prepare_cpus = native_smp_prepare_cpus,
27487 .smp_cpus_done = native_smp_cpus_done,
27488diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27489index 50e547e..d59d06a 100644
27490--- a/arch/x86/kernel/smpboot.c
27491+++ b/arch/x86/kernel/smpboot.c
27492@@ -226,14 +226,17 @@ static void notrace start_secondary(void *unused)
27493
27494 enable_start_cpu0 = 0;
27495
27496-#ifdef CONFIG_X86_32
27497+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27498+ barrier();
27499+
27500 /* switch away from the initial page table */
27501+#ifdef CONFIG_PAX_PER_CPU_PGD
27502+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27503+#else
27504 load_cr3(swapper_pg_dir);
27505+#endif
27506 __flush_tlb_all();
27507-#endif
27508
27509- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27510- barrier();
27511 /*
27512 * Check TSC synchronization with the BP:
27513 */
27514@@ -782,18 +785,17 @@ void common_cpu_up(unsigned int cpu, struct task_struct *idle)
27515 alternatives_enable_smp();
27516
27517 per_cpu(current_task, cpu) = idle;
27518+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27519
27520 #ifdef CONFIG_X86_32
27521 /* Stack for startup_32 can be just as for start_secondary onwards */
27522 irq_ctx_init(cpu);
27523- per_cpu(cpu_current_top_of_stack, cpu) =
27524- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
27525+ per_cpu(cpu_current_top_of_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27526 #else
27527 clear_tsk_thread_flag(idle, TIF_FORK);
27528 initial_gs = per_cpu_offset(cpu);
27529 #endif
27530- per_cpu(kernel_stack, cpu) =
27531- (unsigned long)task_stack_page(idle) + THREAD_SIZE;
27532+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27533 }
27534
27535 /*
27536@@ -814,9 +816,11 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27537 unsigned long timeout;
27538
27539 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27540- (THREAD_SIZE + task_stack_page(idle))) - 1);
27541+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27542
27543+ pax_open_kernel();
27544 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27545+ pax_close_kernel();
27546 initial_code = (unsigned long)start_secondary;
27547 stack_start = idle->thread.sp;
27548
27549@@ -961,6 +965,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27550
27551 common_cpu_up(cpu, tidle);
27552
27553+#ifdef CONFIG_PAX_PER_CPU_PGD
27554+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27555+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27556+ KERNEL_PGD_PTRS);
27557+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27558+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27559+ KERNEL_PGD_PTRS);
27560+#endif
27561+
27562 err = do_boot_cpu(apicid, cpu, tidle);
27563 if (err) {
27564 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27565diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27566index 9b4d51d..5d28b58 100644
27567--- a/arch/x86/kernel/step.c
27568+++ b/arch/x86/kernel/step.c
27569@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27570 struct desc_struct *desc;
27571 unsigned long base;
27572
27573- seg &= ~7UL;
27574+ seg >>= 3;
27575
27576 mutex_lock(&child->mm->context.lock);
27577- if (unlikely((seg >> 3) >= child->mm->context.size))
27578+ if (unlikely(seg >= child->mm->context.size))
27579 addr = -1L; /* bogus selector, access would fault */
27580 else {
27581 desc = child->mm->context.ldt + seg;
27582@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27583 addr += base;
27584 }
27585 mutex_unlock(&child->mm->context.lock);
27586- }
27587+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27588+ addr = ktla_ktva(addr);
27589
27590 return addr;
27591 }
27592@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27593 unsigned char opcode[15];
27594 unsigned long addr = convert_ip_to_linear(child, regs);
27595
27596+ if (addr == -EINVAL)
27597+ return 0;
27598+
27599 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27600 for (i = 0; i < copied; i++) {
27601 switch (opcode[i]) {
27602diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27603new file mode 100644
27604index 0000000..5877189
27605--- /dev/null
27606+++ b/arch/x86/kernel/sys_i386_32.c
27607@@ -0,0 +1,189 @@
27608+/*
27609+ * This file contains various random system calls that
27610+ * have a non-standard calling sequence on the Linux/i386
27611+ * platform.
27612+ */
27613+
27614+#include <linux/errno.h>
27615+#include <linux/sched.h>
27616+#include <linux/mm.h>
27617+#include <linux/fs.h>
27618+#include <linux/smp.h>
27619+#include <linux/sem.h>
27620+#include <linux/msg.h>
27621+#include <linux/shm.h>
27622+#include <linux/stat.h>
27623+#include <linux/syscalls.h>
27624+#include <linux/mman.h>
27625+#include <linux/file.h>
27626+#include <linux/utsname.h>
27627+#include <linux/ipc.h>
27628+#include <linux/elf.h>
27629+
27630+#include <linux/uaccess.h>
27631+#include <linux/unistd.h>
27632+
27633+#include <asm/syscalls.h>
27634+
27635+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27636+{
27637+ unsigned long pax_task_size = TASK_SIZE;
27638+
27639+#ifdef CONFIG_PAX_SEGMEXEC
27640+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27641+ pax_task_size = SEGMEXEC_TASK_SIZE;
27642+#endif
27643+
27644+ if (flags & MAP_FIXED)
27645+ if (len > pax_task_size || addr > pax_task_size - len)
27646+ return -EINVAL;
27647+
27648+ return 0;
27649+}
27650+
27651+/*
27652+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27653+ */
27654+static unsigned long get_align_mask(void)
27655+{
27656+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27657+ return 0;
27658+
27659+ if (!(current->flags & PF_RANDOMIZE))
27660+ return 0;
27661+
27662+ return va_align.mask;
27663+}
27664+
27665+unsigned long
27666+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27667+ unsigned long len, unsigned long pgoff, unsigned long flags)
27668+{
27669+ struct mm_struct *mm = current->mm;
27670+ struct vm_area_struct *vma;
27671+ unsigned long pax_task_size = TASK_SIZE;
27672+ struct vm_unmapped_area_info info;
27673+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27674+
27675+#ifdef CONFIG_PAX_SEGMEXEC
27676+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27677+ pax_task_size = SEGMEXEC_TASK_SIZE;
27678+#endif
27679+
27680+ pax_task_size -= PAGE_SIZE;
27681+
27682+ if (len > pax_task_size)
27683+ return -ENOMEM;
27684+
27685+ if (flags & MAP_FIXED)
27686+ return addr;
27687+
27688+#ifdef CONFIG_PAX_RANDMMAP
27689+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27690+#endif
27691+
27692+ if (addr) {
27693+ addr = PAGE_ALIGN(addr);
27694+ if (pax_task_size - len >= addr) {
27695+ vma = find_vma(mm, addr);
27696+ if (check_heap_stack_gap(vma, addr, len, offset))
27697+ return addr;
27698+ }
27699+ }
27700+
27701+ info.flags = 0;
27702+ info.length = len;
27703+ info.align_mask = filp ? get_align_mask() : 0;
27704+ info.align_offset = pgoff << PAGE_SHIFT;
27705+ info.threadstack_offset = offset;
27706+
27707+#ifdef CONFIG_PAX_PAGEEXEC
27708+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27709+ info.low_limit = 0x00110000UL;
27710+ info.high_limit = mm->start_code;
27711+
27712+#ifdef CONFIG_PAX_RANDMMAP
27713+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27714+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27715+#endif
27716+
27717+ if (info.low_limit < info.high_limit) {
27718+ addr = vm_unmapped_area(&info);
27719+ if (!IS_ERR_VALUE(addr))
27720+ return addr;
27721+ }
27722+ } else
27723+#endif
27724+
27725+ info.low_limit = mm->mmap_base;
27726+ info.high_limit = pax_task_size;
27727+
27728+ return vm_unmapped_area(&info);
27729+}
27730+
27731+unsigned long
27732+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27733+ const unsigned long len, const unsigned long pgoff,
27734+ const unsigned long flags)
27735+{
27736+ struct vm_area_struct *vma;
27737+ struct mm_struct *mm = current->mm;
27738+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27739+ struct vm_unmapped_area_info info;
27740+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27741+
27742+#ifdef CONFIG_PAX_SEGMEXEC
27743+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27744+ pax_task_size = SEGMEXEC_TASK_SIZE;
27745+#endif
27746+
27747+ pax_task_size -= PAGE_SIZE;
27748+
27749+ /* requested length too big for entire address space */
27750+ if (len > pax_task_size)
27751+ return -ENOMEM;
27752+
27753+ if (flags & MAP_FIXED)
27754+ return addr;
27755+
27756+#ifdef CONFIG_PAX_PAGEEXEC
27757+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27758+ goto bottomup;
27759+#endif
27760+
27761+#ifdef CONFIG_PAX_RANDMMAP
27762+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27763+#endif
27764+
27765+ /* requesting a specific address */
27766+ if (addr) {
27767+ addr = PAGE_ALIGN(addr);
27768+ if (pax_task_size - len >= addr) {
27769+ vma = find_vma(mm, addr);
27770+ if (check_heap_stack_gap(vma, addr, len, offset))
27771+ return addr;
27772+ }
27773+ }
27774+
27775+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27776+ info.length = len;
27777+ info.low_limit = PAGE_SIZE;
27778+ info.high_limit = mm->mmap_base;
27779+ info.align_mask = filp ? get_align_mask() : 0;
27780+ info.align_offset = pgoff << PAGE_SHIFT;
27781+ info.threadstack_offset = offset;
27782+
27783+ addr = vm_unmapped_area(&info);
27784+ if (!(addr & ~PAGE_MASK))
27785+ return addr;
27786+ VM_BUG_ON(addr != -ENOMEM);
27787+
27788+bottomup:
27789+ /*
27790+ * A failed mmap() very likely causes application failure,
27791+ * so fall back to the bottom-up function here. This scenario
27792+ * can happen with large stack limits and large mmap()
27793+ * allocations.
27794+ */
27795+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27796+}
27797diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27798index 10e0272..b4bb9a7 100644
27799--- a/arch/x86/kernel/sys_x86_64.c
27800+++ b/arch/x86/kernel/sys_x86_64.c
27801@@ -97,8 +97,8 @@ out:
27802 return error;
27803 }
27804
27805-static void find_start_end(unsigned long flags, unsigned long *begin,
27806- unsigned long *end)
27807+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27808+ unsigned long *begin, unsigned long *end)
27809 {
27810 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27811 unsigned long new_begin;
27812@@ -117,7 +117,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27813 *begin = new_begin;
27814 }
27815 } else {
27816- *begin = current->mm->mmap_legacy_base;
27817+ *begin = mm->mmap_legacy_base;
27818 *end = TASK_SIZE;
27819 }
27820 }
27821@@ -130,20 +130,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27822 struct vm_area_struct *vma;
27823 struct vm_unmapped_area_info info;
27824 unsigned long begin, end;
27825+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27826
27827 if (flags & MAP_FIXED)
27828 return addr;
27829
27830- find_start_end(flags, &begin, &end);
27831+ find_start_end(mm, flags, &begin, &end);
27832
27833 if (len > end)
27834 return -ENOMEM;
27835
27836+#ifdef CONFIG_PAX_RANDMMAP
27837+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27838+#endif
27839+
27840 if (addr) {
27841 addr = PAGE_ALIGN(addr);
27842 vma = find_vma(mm, addr);
27843- if (end - len >= addr &&
27844- (!vma || addr + len <= vma->vm_start))
27845+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27846 return addr;
27847 }
27848
27849@@ -157,6 +161,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27850 info.align_mask = get_align_mask();
27851 info.align_offset += get_align_bits();
27852 }
27853+ info.threadstack_offset = offset;
27854 return vm_unmapped_area(&info);
27855 }
27856
27857@@ -169,6 +174,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27858 struct mm_struct *mm = current->mm;
27859 unsigned long addr = addr0;
27860 struct vm_unmapped_area_info info;
27861+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27862
27863 /* requested length too big for entire address space */
27864 if (len > TASK_SIZE)
27865@@ -181,12 +187,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27866 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27867 goto bottomup;
27868
27869+#ifdef CONFIG_PAX_RANDMMAP
27870+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27871+#endif
27872+
27873 /* requesting a specific address */
27874 if (addr) {
27875 addr = PAGE_ALIGN(addr);
27876 vma = find_vma(mm, addr);
27877- if (TASK_SIZE - len >= addr &&
27878- (!vma || addr + len <= vma->vm_start))
27879+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27880 return addr;
27881 }
27882
27883@@ -200,6 +209,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27884 info.align_mask = get_align_mask();
27885 info.align_offset += get_align_bits();
27886 }
27887+ info.threadstack_offset = offset;
27888 addr = vm_unmapped_area(&info);
27889 if (!(addr & ~PAGE_MASK))
27890 return addr;
27891diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27892index 91a4496..42fc304 100644
27893--- a/arch/x86/kernel/tboot.c
27894+++ b/arch/x86/kernel/tboot.c
27895@@ -44,6 +44,7 @@
27896 #include <asm/setup.h>
27897 #include <asm/e820.h>
27898 #include <asm/io.h>
27899+#include <asm/tlbflush.h>
27900
27901 #include "../realmode/rm/wakeup.h"
27902
27903@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
27904
27905 void tboot_shutdown(u32 shutdown_type)
27906 {
27907- void (*shutdown)(void);
27908+ void (* __noreturn shutdown)(void);
27909
27910 if (!tboot_enabled())
27911 return;
27912@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
27913 tboot->shutdown_type = shutdown_type;
27914
27915 switch_to_tboot_pt();
27916+ cr4_clear_bits(X86_CR4_PCIDE);
27917
27918- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27919+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27920 shutdown();
27921
27922 /* should not reach here */
27923@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27924 return -ENODEV;
27925 }
27926
27927-static atomic_t ap_wfs_count;
27928+static atomic_unchecked_t ap_wfs_count;
27929
27930 static int tboot_wait_for_aps(int num_aps)
27931 {
27932@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27933 {
27934 switch (action) {
27935 case CPU_DYING:
27936- atomic_inc(&ap_wfs_count);
27937+ atomic_inc_unchecked(&ap_wfs_count);
27938 if (num_online_cpus() == 1)
27939- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27940+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27941 return NOTIFY_BAD;
27942 break;
27943 }
27944@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
27945
27946 tboot_create_trampoline();
27947
27948- atomic_set(&ap_wfs_count, 0);
27949+ atomic_set_unchecked(&ap_wfs_count, 0);
27950 register_hotcpu_notifier(&tboot_cpu_notifier);
27951
27952 #ifdef CONFIG_DEBUG_FS
27953diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27954index d39c091..1df4349 100644
27955--- a/arch/x86/kernel/time.c
27956+++ b/arch/x86/kernel/time.c
27957@@ -32,7 +32,7 @@ unsigned long profile_pc(struct pt_regs *regs)
27958
27959 if (!user_mode(regs) && in_lock_functions(pc)) {
27960 #ifdef CONFIG_FRAME_POINTER
27961- return *(unsigned long *)(regs->bp + sizeof(long));
27962+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27963 #else
27964 unsigned long *sp =
27965 (unsigned long *)kernel_stack_pointer(regs);
27966@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27967 * or above a saved flags. Eflags has bits 22-31 zero,
27968 * kernel addresses don't.
27969 */
27970+
27971+#ifdef CONFIG_PAX_KERNEXEC
27972+ return ktla_ktva(sp[0]);
27973+#else
27974 if (sp[0] >> 22)
27975 return sp[0];
27976 if (sp[1] >> 22)
27977 return sp[1];
27978 #endif
27979+
27980+#endif
27981 }
27982 return pc;
27983 }
27984diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27985index 7fc5e84..c6e445a 100644
27986--- a/arch/x86/kernel/tls.c
27987+++ b/arch/x86/kernel/tls.c
27988@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27989 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27990 return -EINVAL;
27991
27992+#ifdef CONFIG_PAX_SEGMEXEC
27993+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27994+ return -EINVAL;
27995+#endif
27996+
27997 set_tls_desc(p, idx, &info, 1);
27998
27999 return 0;
28000@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
28001
28002 if (kbuf)
28003 info = kbuf;
28004- else if (__copy_from_user(infobuf, ubuf, count))
28005+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
28006 return -EFAULT;
28007 else
28008 info = infobuf;
28009diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
28010index 1c113db..287b42e 100644
28011--- a/arch/x86/kernel/tracepoint.c
28012+++ b/arch/x86/kernel/tracepoint.c
28013@@ -9,11 +9,11 @@
28014 #include <linux/atomic.h>
28015
28016 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
28017-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
28018+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
28019 (unsigned long) trace_idt_table };
28020
28021 /* No need to be aligned, but done to keep all IDTs defined the same way. */
28022-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
28023+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
28024
28025 static int trace_irq_vector_refcount;
28026 static DEFINE_MUTEX(irq_vector_mutex);
28027diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
28028index 324ab52..0cfd2d05 100644
28029--- a/arch/x86/kernel/traps.c
28030+++ b/arch/x86/kernel/traps.c
28031@@ -68,7 +68,7 @@
28032 #include <asm/proto.h>
28033
28034 /* No need to be aligned, but done to keep all IDTs defined the same way. */
28035-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
28036+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
28037 #else
28038 #include <asm/processor-flags.h>
28039 #include <asm/setup.h>
28040@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
28041 #endif
28042
28043 /* Must be page-aligned because the real IDT is used in a fixmap. */
28044-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
28045+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
28046
28047 DECLARE_BITMAP(used_vectors, NR_VECTORS);
28048 EXPORT_SYMBOL_GPL(used_vectors);
28049@@ -174,7 +174,7 @@ void ist_begin_non_atomic(struct pt_regs *regs)
28050 * will catch asm bugs and any attempt to use ist_preempt_enable
28051 * from double_fault.
28052 */
28053- BUG_ON((unsigned long)(current_top_of_stack() -
28054+ BUG_ON((unsigned long)(current_top_of_stack(smp_processor_id()) -
28055 current_stack_pointer()) >= THREAD_SIZE);
28056
28057 preempt_count_sub(HARDIRQ_OFFSET);
28058@@ -191,7 +191,7 @@ void ist_end_non_atomic(void)
28059 }
28060
28061 static nokprobe_inline int
28062-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28063+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
28064 struct pt_regs *regs, long error_code)
28065 {
28066 if (v8086_mode(regs)) {
28067@@ -211,8 +211,20 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
28068 if (!fixup_exception(regs)) {
28069 tsk->thread.error_code = error_code;
28070 tsk->thread.trap_nr = trapnr;
28071+
28072+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28073+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
28074+ str = "PAX: suspicious stack segment fault";
28075+#endif
28076+
28077 die(str, regs, error_code);
28078 }
28079+
28080+#ifdef CONFIG_PAX_REFCOUNT
28081+ if (trapnr == X86_TRAP_OF)
28082+ pax_report_refcount_overflow(regs);
28083+#endif
28084+
28085 return 0;
28086 }
28087
28088@@ -251,7 +263,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
28089 }
28090
28091 static void
28092-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28093+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
28094 long error_code, siginfo_t *info)
28095 {
28096 struct task_struct *tsk = current;
28097@@ -275,7 +287,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
28098 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
28099 printk_ratelimit()) {
28100 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
28101- tsk->comm, tsk->pid, str,
28102+ tsk->comm, task_pid_nr(tsk), str,
28103 regs->ip, regs->sp, error_code);
28104 print_vma_addr(" in ", regs->ip);
28105 pr_cont("\n");
28106@@ -357,6 +369,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
28107 tsk->thread.error_code = error_code;
28108 tsk->thread.trap_nr = X86_TRAP_DF;
28109
28110+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
28111+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
28112+ die("grsec: kernel stack overflow detected", regs, error_code);
28113+#endif
28114+
28115 #ifdef CONFIG_DOUBLEFAULT
28116 df_debug(regs, error_code);
28117 #endif
28118@@ -475,11 +492,35 @@ do_general_protection(struct pt_regs *regs, long error_code)
28119 tsk->thread.error_code = error_code;
28120 tsk->thread.trap_nr = X86_TRAP_GP;
28121 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28122- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28123+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28124+
28125+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28126+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28127+ die("PAX: suspicious general protection fault", regs, error_code);
28128+ else
28129+#endif
28130+
28131 die("general protection fault", regs, error_code);
28132+ }
28133 goto exit;
28134 }
28135
28136+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28137+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28138+ struct mm_struct *mm = tsk->mm;
28139+ unsigned long limit;
28140+
28141+ down_write(&mm->mmap_sem);
28142+ limit = mm->context.user_cs_limit;
28143+ if (limit < TASK_SIZE) {
28144+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28145+ up_write(&mm->mmap_sem);
28146+ return;
28147+ }
28148+ up_write(&mm->mmap_sem);
28149+ }
28150+#endif
28151+
28152 tsk->thread.error_code = error_code;
28153 tsk->thread.trap_nr = X86_TRAP_GP;
28154
28155@@ -578,6 +619,9 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28156 container_of(task_pt_regs(current),
28157 struct bad_iret_stack, regs);
28158
28159+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28160+ new_stack = s;
28161+
28162 /* Copy the IRET target to the new stack. */
28163 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28164
28165diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28166index 5054497..139f8f8 100644
28167--- a/arch/x86/kernel/tsc.c
28168+++ b/arch/x86/kernel/tsc.c
28169@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28170 */
28171 smp_wmb();
28172
28173- ACCESS_ONCE(c2n->head) = data;
28174+ ACCESS_ONCE_RW(c2n->head) = data;
28175 }
28176
28177 /*
28178diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28179index 0b81ad6..fff670e 100644
28180--- a/arch/x86/kernel/uprobes.c
28181+++ b/arch/x86/kernel/uprobes.c
28182@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28183
28184 if (nleft != rasize) {
28185 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28186- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28187+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28188
28189 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28190 }
28191diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28192index b9242ba..50c5edd 100644
28193--- a/arch/x86/kernel/verify_cpu.S
28194+++ b/arch/x86/kernel/verify_cpu.S
28195@@ -20,6 +20,7 @@
28196 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28197 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28198 * arch/x86/kernel/head_32.S: processor startup
28199+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28200 *
28201 * verify_cpu, returns the status of longmode and SSE in register %eax.
28202 * 0: Success 1: Failure
28203diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28204index fc9db6e..2c5865d 100644
28205--- a/arch/x86/kernel/vm86_32.c
28206+++ b/arch/x86/kernel/vm86_32.c
28207@@ -44,6 +44,7 @@
28208 #include <linux/ptrace.h>
28209 #include <linux/audit.h>
28210 #include <linux/stddef.h>
28211+#include <linux/grsecurity.h>
28212
28213 #include <asm/uaccess.h>
28214 #include <asm/io.h>
28215@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28216 do_exit(SIGSEGV);
28217 }
28218
28219- tss = &per_cpu(cpu_tss, get_cpu());
28220+ tss = cpu_tss + get_cpu();
28221 current->thread.sp0 = current->thread.saved_sp0;
28222 current->thread.sysenter_cs = __KERNEL_CS;
28223 load_sp0(tss, &current->thread);
28224@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28225
28226 if (tsk->thread.saved_sp0)
28227 return -EPERM;
28228+
28229+#ifdef CONFIG_GRKERNSEC_VM86
28230+ if (!capable(CAP_SYS_RAWIO)) {
28231+ gr_handle_vm86();
28232+ return -EPERM;
28233+ }
28234+#endif
28235+
28236 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28237 offsetof(struct kernel_vm86_struct, vm86plus) -
28238 sizeof(info.regs));
28239@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28240 int tmp;
28241 struct vm86plus_struct __user *v86;
28242
28243+#ifdef CONFIG_GRKERNSEC_VM86
28244+ if (!capable(CAP_SYS_RAWIO)) {
28245+ gr_handle_vm86();
28246+ return -EPERM;
28247+ }
28248+#endif
28249+
28250 tsk = current;
28251 switch (cmd) {
28252 case VM86_REQUEST_IRQ:
28253@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28254 tsk->thread.saved_fs = info->regs32->fs;
28255 tsk->thread.saved_gs = get_user_gs(info->regs32);
28256
28257- tss = &per_cpu(cpu_tss, get_cpu());
28258+ tss = cpu_tss + get_cpu();
28259 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28260 if (cpu_has_sep)
28261 tsk->thread.sysenter_cs = 0;
28262@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28263 goto cannot_handle;
28264 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28265 goto cannot_handle;
28266- intr_ptr = (unsigned long __user *) (i << 2);
28267+ intr_ptr = (__force unsigned long __user *) (i << 2);
28268 if (get_user(segoffs, intr_ptr))
28269 goto cannot_handle;
28270 if ((segoffs >> 16) == BIOSSEG)
28271diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28272index 00bf300..129df8e 100644
28273--- a/arch/x86/kernel/vmlinux.lds.S
28274+++ b/arch/x86/kernel/vmlinux.lds.S
28275@@ -26,6 +26,13 @@
28276 #include <asm/page_types.h>
28277 #include <asm/cache.h>
28278 #include <asm/boot.h>
28279+#include <asm/segment.h>
28280+
28281+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28282+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28283+#else
28284+#define __KERNEL_TEXT_OFFSET 0
28285+#endif
28286
28287 #undef i386 /* in case the preprocessor is a 32bit one */
28288
28289@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28290
28291 PHDRS {
28292 text PT_LOAD FLAGS(5); /* R_E */
28293+#ifdef CONFIG_X86_32
28294+ module PT_LOAD FLAGS(5); /* R_E */
28295+#endif
28296+#ifdef CONFIG_XEN
28297+ rodata PT_LOAD FLAGS(5); /* R_E */
28298+#else
28299+ rodata PT_LOAD FLAGS(4); /* R__ */
28300+#endif
28301 data PT_LOAD FLAGS(6); /* RW_ */
28302-#ifdef CONFIG_X86_64
28303+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28304 #ifdef CONFIG_SMP
28305 percpu PT_LOAD FLAGS(6); /* RW_ */
28306 #endif
28307+ text.init PT_LOAD FLAGS(5); /* R_E */
28308+ text.exit PT_LOAD FLAGS(5); /* R_E */
28309 init PT_LOAD FLAGS(7); /* RWE */
28310-#endif
28311 note PT_NOTE FLAGS(0); /* ___ */
28312 }
28313
28314 SECTIONS
28315 {
28316 #ifdef CONFIG_X86_32
28317- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28318- phys_startup_32 = startup_32 - LOAD_OFFSET;
28319+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28320 #else
28321- . = __START_KERNEL;
28322- phys_startup_64 = startup_64 - LOAD_OFFSET;
28323+ . = __START_KERNEL;
28324 #endif
28325
28326 /* Text and read-only data */
28327- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28328- _text = .;
28329+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28330 /* bootstrapping code */
28331+#ifdef CONFIG_X86_32
28332+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28333+#else
28334+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28335+#endif
28336+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28337+ _text = .;
28338 HEAD_TEXT
28339 . = ALIGN(8);
28340 _stext = .;
28341@@ -104,13 +124,47 @@ SECTIONS
28342 IRQENTRY_TEXT
28343 *(.fixup)
28344 *(.gnu.warning)
28345- /* End of text section */
28346- _etext = .;
28347 } :text = 0x9090
28348
28349- NOTES :text :note
28350+ . += __KERNEL_TEXT_OFFSET;
28351
28352- EXCEPTION_TABLE(16) :text = 0x9090
28353+#ifdef CONFIG_X86_32
28354+ . = ALIGN(PAGE_SIZE);
28355+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28356+
28357+#ifdef CONFIG_PAX_KERNEXEC
28358+ MODULES_EXEC_VADDR = .;
28359+ BYTE(0)
28360+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28361+ . = ALIGN(HPAGE_SIZE) - 1;
28362+ MODULES_EXEC_END = .;
28363+#endif
28364+
28365+ } :module
28366+#endif
28367+
28368+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28369+ /* End of text section */
28370+ BYTE(0)
28371+ _etext = . - __KERNEL_TEXT_OFFSET;
28372+ }
28373+
28374+#ifdef CONFIG_X86_32
28375+ . = ALIGN(PAGE_SIZE);
28376+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28377+ . = ALIGN(PAGE_SIZE);
28378+ *(.empty_zero_page)
28379+ *(.initial_pg_fixmap)
28380+ *(.initial_pg_pmd)
28381+ *(.initial_page_table)
28382+ *(.swapper_pg_dir)
28383+ } :rodata
28384+#endif
28385+
28386+ . = ALIGN(PAGE_SIZE);
28387+ NOTES :rodata :note
28388+
28389+ EXCEPTION_TABLE(16) :rodata
28390
28391 #if defined(CONFIG_DEBUG_RODATA)
28392 /* .text should occupy whole number of pages */
28393@@ -122,16 +176,20 @@ SECTIONS
28394
28395 /* Data */
28396 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28397+
28398+#ifdef CONFIG_PAX_KERNEXEC
28399+ . = ALIGN(HPAGE_SIZE);
28400+#else
28401+ . = ALIGN(PAGE_SIZE);
28402+#endif
28403+
28404 /* Start of data section */
28405 _sdata = .;
28406
28407 /* init_task */
28408 INIT_TASK_DATA(THREAD_SIZE)
28409
28410-#ifdef CONFIG_X86_32
28411- /* 32 bit has nosave before _edata */
28412 NOSAVE_DATA
28413-#endif
28414
28415 PAGE_ALIGNED_DATA(PAGE_SIZE)
28416
28417@@ -174,12 +232,19 @@ SECTIONS
28418 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28419
28420 /* Init code and data - will be freed after init */
28421- . = ALIGN(PAGE_SIZE);
28422 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28423+ BYTE(0)
28424+
28425+#ifdef CONFIG_PAX_KERNEXEC
28426+ . = ALIGN(HPAGE_SIZE);
28427+#else
28428+ . = ALIGN(PAGE_SIZE);
28429+#endif
28430+
28431 __init_begin = .; /* paired with __init_end */
28432- }
28433+ } :init.begin
28434
28435-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28436+#ifdef CONFIG_SMP
28437 /*
28438 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28439 * output PHDR, so the next output section - .init.text - should
28440@@ -190,12 +255,27 @@ SECTIONS
28441 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28442 #endif
28443
28444- INIT_TEXT_SECTION(PAGE_SIZE)
28445-#ifdef CONFIG_X86_64
28446- :init
28447-#endif
28448+ . = ALIGN(PAGE_SIZE);
28449+ init_begin = .;
28450+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28451+ VMLINUX_SYMBOL(_sinittext) = .;
28452+ INIT_TEXT
28453+ . = ALIGN(PAGE_SIZE);
28454+ } :text.init
28455
28456- INIT_DATA_SECTION(16)
28457+ /*
28458+ * .exit.text is discard at runtime, not link time, to deal with
28459+ * references from .altinstructions and .eh_frame
28460+ */
28461+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28462+ EXIT_TEXT
28463+ VMLINUX_SYMBOL(_einittext) = .;
28464+ . = ALIGN(16);
28465+ } :text.exit
28466+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28467+
28468+ . = ALIGN(PAGE_SIZE);
28469+ INIT_DATA_SECTION(16) :init
28470
28471 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28472 __x86_cpu_dev_start = .;
28473@@ -266,19 +346,12 @@ SECTIONS
28474 }
28475
28476 . = ALIGN(8);
28477- /*
28478- * .exit.text is discard at runtime, not link time, to deal with
28479- * references from .altinstructions and .eh_frame
28480- */
28481- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28482- EXIT_TEXT
28483- }
28484
28485 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28486 EXIT_DATA
28487 }
28488
28489-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28490+#ifndef CONFIG_SMP
28491 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28492 #endif
28493
28494@@ -297,16 +370,10 @@ SECTIONS
28495 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28496 __smp_locks = .;
28497 *(.smp_locks)
28498- . = ALIGN(PAGE_SIZE);
28499 __smp_locks_end = .;
28500+ . = ALIGN(PAGE_SIZE);
28501 }
28502
28503-#ifdef CONFIG_X86_64
28504- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28505- NOSAVE_DATA
28506- }
28507-#endif
28508-
28509 /* BSS */
28510 . = ALIGN(PAGE_SIZE);
28511 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28512@@ -322,6 +389,7 @@ SECTIONS
28513 __brk_base = .;
28514 . += 64 * 1024; /* 64k alignment slop space */
28515 *(.brk_reservation) /* areas brk users have reserved */
28516+ . = ALIGN(HPAGE_SIZE);
28517 __brk_limit = .;
28518 }
28519
28520@@ -348,13 +416,12 @@ SECTIONS
28521 * for the boot processor.
28522 */
28523 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28524-INIT_PER_CPU(gdt_page);
28525 INIT_PER_CPU(irq_stack_union);
28526
28527 /*
28528 * Build-time check on the image size:
28529 */
28530-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28531+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28532 "kernel image bigger than KERNEL_IMAGE_SIZE");
28533
28534 #ifdef CONFIG_SMP
28535diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28536index 2dcc6ff..082dc7a 100644
28537--- a/arch/x86/kernel/vsyscall_64.c
28538+++ b/arch/x86/kernel/vsyscall_64.c
28539@@ -38,15 +38,13 @@
28540 #define CREATE_TRACE_POINTS
28541 #include "vsyscall_trace.h"
28542
28543-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28544+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28545
28546 static int __init vsyscall_setup(char *str)
28547 {
28548 if (str) {
28549 if (!strcmp("emulate", str))
28550 vsyscall_mode = EMULATE;
28551- else if (!strcmp("native", str))
28552- vsyscall_mode = NATIVE;
28553 else if (!strcmp("none", str))
28554 vsyscall_mode = NONE;
28555 else
28556@@ -264,8 +262,7 @@ do_ret:
28557 return true;
28558
28559 sigsegv:
28560- force_sig(SIGSEGV, current);
28561- return true;
28562+ do_group_exit(SIGKILL);
28563 }
28564
28565 /*
28566@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28567 static struct vm_area_struct gate_vma = {
28568 .vm_start = VSYSCALL_ADDR,
28569 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28570- .vm_page_prot = PAGE_READONLY_EXEC,
28571- .vm_flags = VM_READ | VM_EXEC,
28572+ .vm_page_prot = PAGE_READONLY,
28573+ .vm_flags = VM_READ,
28574 .vm_ops = &gate_vma_ops,
28575 };
28576
28577@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28578 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28579
28580 if (vsyscall_mode != NONE)
28581- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28582- vsyscall_mode == NATIVE
28583- ? PAGE_KERNEL_VSYSCALL
28584- : PAGE_KERNEL_VVAR);
28585+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28586
28587 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28588 (unsigned long)VSYSCALL_ADDR);
28589diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28590index 37d8fa4..66e319a 100644
28591--- a/arch/x86/kernel/x8664_ksyms_64.c
28592+++ b/arch/x86/kernel/x8664_ksyms_64.c
28593@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28594 EXPORT_SYMBOL(copy_user_generic_unrolled);
28595 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28596 EXPORT_SYMBOL(__copy_user_nocache);
28597-EXPORT_SYMBOL(_copy_from_user);
28598-EXPORT_SYMBOL(_copy_to_user);
28599
28600 EXPORT_SYMBOL(copy_page);
28601 EXPORT_SYMBOL(clear_page);
28602@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28603 EXPORT_SYMBOL(___preempt_schedule_context);
28604 #endif
28605 #endif
28606+
28607+#ifdef CONFIG_PAX_PER_CPU_PGD
28608+EXPORT_SYMBOL(cpu_pgd);
28609+#endif
28610diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28611index 234b072..b7ab191 100644
28612--- a/arch/x86/kernel/x86_init.c
28613+++ b/arch/x86/kernel/x86_init.c
28614@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28615 static void default_nmi_init(void) { };
28616 static int default_i8042_detect(void) { return 1; };
28617
28618-struct x86_platform_ops x86_platform = {
28619+struct x86_platform_ops x86_platform __read_only = {
28620 .calibrate_tsc = native_calibrate_tsc,
28621 .get_wallclock = mach_get_cmos_time,
28622 .set_wallclock = mach_set_rtc_mmss,
28623@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28624 EXPORT_SYMBOL_GPL(x86_platform);
28625
28626 #if defined(CONFIG_PCI_MSI)
28627-struct x86_msi_ops x86_msi = {
28628+struct x86_msi_ops x86_msi __read_only = {
28629 .setup_msi_irqs = native_setup_msi_irqs,
28630 .compose_msi_msg = native_compose_msi_msg,
28631 .teardown_msi_irq = native_teardown_msi_irq,
28632@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28633 }
28634 #endif
28635
28636-struct x86_io_apic_ops x86_io_apic_ops = {
28637+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28638 .init = native_io_apic_init_mappings,
28639 .read = native_io_apic_read,
28640 .write = native_io_apic_write,
28641diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28642index 87a815b..727dbe6 100644
28643--- a/arch/x86/kernel/xsave.c
28644+++ b/arch/x86/kernel/xsave.c
28645@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28646
28647 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28648 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28649- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28650+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28651
28652 if (!use_xsave())
28653 return err;
28654
28655- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28656+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28657
28658 /*
28659 * Read the xstate_bv which we copied (directly from the cpu or
28660 * from the state in task struct) to the user buffers.
28661 */
28662- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28663+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28664
28665 /*
28666 * For legacy compatible, we always set FP/SSE bits in the bit
28667@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28668 */
28669 xstate_bv |= XSTATE_FPSSE;
28670
28671- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28672+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28673
28674 return err;
28675 }
28676@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28677 {
28678 int err;
28679
28680+ buf = (struct xsave_struct __user *)____m(buf);
28681 if (use_xsave())
28682 err = xsave_user(buf);
28683 else if (use_fxsr())
28684@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28685 */
28686 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28687 {
28688+ buf = (void __user *)____m(buf);
28689 if (use_xsave()) {
28690 if ((unsigned long)buf % 64 || fx_only) {
28691 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28692diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28693index 1d08ad3..c6a4faf 100644
28694--- a/arch/x86/kvm/cpuid.c
28695+++ b/arch/x86/kvm/cpuid.c
28696@@ -204,15 +204,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28697 struct kvm_cpuid2 *cpuid,
28698 struct kvm_cpuid_entry2 __user *entries)
28699 {
28700- int r;
28701+ int r, i;
28702
28703 r = -E2BIG;
28704 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28705 goto out;
28706 r = -EFAULT;
28707- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28708- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28709+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28710 goto out;
28711+ for (i = 0; i < cpuid->nent; ++i) {
28712+ struct kvm_cpuid_entry2 cpuid_entry;
28713+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28714+ goto out;
28715+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28716+ }
28717 vcpu->arch.cpuid_nent = cpuid->nent;
28718 kvm_apic_set_version(vcpu);
28719 kvm_x86_ops->cpuid_update(vcpu);
28720@@ -225,15 +230,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28721 struct kvm_cpuid2 *cpuid,
28722 struct kvm_cpuid_entry2 __user *entries)
28723 {
28724- int r;
28725+ int r, i;
28726
28727 r = -E2BIG;
28728 if (cpuid->nent < vcpu->arch.cpuid_nent)
28729 goto out;
28730 r = -EFAULT;
28731- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28732- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28733+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28734 goto out;
28735+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28736+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28737+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28738+ goto out;
28739+ }
28740 return 0;
28741
28742 out:
28743diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28744index 630bcb0..a7f6d9e 100644
28745--- a/arch/x86/kvm/emulate.c
28746+++ b/arch/x86/kvm/emulate.c
28747@@ -3569,7 +3569,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28748 int cr = ctxt->modrm_reg;
28749 u64 efer = 0;
28750
28751- static u64 cr_reserved_bits[] = {
28752+ static const u64 cr_reserved_bits[] = {
28753 0xffffffff00000000ULL,
28754 0, 0, 0, /* CR3 checked later */
28755 CR4_RESERVED_BITS,
28756diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28757index 67d07e0..10769d5 100644
28758--- a/arch/x86/kvm/lapic.c
28759+++ b/arch/x86/kvm/lapic.c
28760@@ -56,7 +56,7 @@
28761 #define APIC_BUS_CYCLE_NS 1
28762
28763 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28764-#define apic_debug(fmt, arg...)
28765+#define apic_debug(fmt, arg...) do {} while (0)
28766
28767 #define APIC_LVT_NUM 6
28768 /* 14 is the version for Xeon and Pentium 8.4.8*/
28769diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28770index 6e6d115..43fecbf 100644
28771--- a/arch/x86/kvm/paging_tmpl.h
28772+++ b/arch/x86/kvm/paging_tmpl.h
28773@@ -343,7 +343,7 @@ retry_walk:
28774 if (unlikely(kvm_is_error_hva(host_addr)))
28775 goto error;
28776
28777- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28778+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28779 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28780 goto error;
28781 walker->ptep_user[walker->level - 1] = ptep_user;
28782diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28783index 4911bf1..e7d3ed2 100644
28784--- a/arch/x86/kvm/svm.c
28785+++ b/arch/x86/kvm/svm.c
28786@@ -3577,7 +3577,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28787 int cpu = raw_smp_processor_id();
28788
28789 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28790+
28791+ pax_open_kernel();
28792 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28793+ pax_close_kernel();
28794+
28795 load_TR_desc();
28796 }
28797
28798@@ -3973,6 +3977,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28799 #endif
28800 #endif
28801
28802+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28803+ __set_fs(current_thread_info()->addr_limit);
28804+#endif
28805+
28806 reload_tss(vcpu);
28807
28808 local_irq_disable();
28809diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28810index 2d73807..84a0e59 100644
28811--- a/arch/x86/kvm/vmx.c
28812+++ b/arch/x86/kvm/vmx.c
28813@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28814 #endif
28815 }
28816
28817-static void vmcs_clear_bits(unsigned long field, u32 mask)
28818+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28819 {
28820 vmcs_writel(field, vmcs_readl(field) & ~mask);
28821 }
28822
28823-static void vmcs_set_bits(unsigned long field, u32 mask)
28824+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28825 {
28826 vmcs_writel(field, vmcs_readl(field) | mask);
28827 }
28828@@ -1705,7 +1705,11 @@ static void reload_tss(void)
28829 struct desc_struct *descs;
28830
28831 descs = (void *)gdt->address;
28832+
28833+ pax_open_kernel();
28834 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28835+ pax_close_kernel();
28836+
28837 load_TR_desc();
28838 }
28839
28840@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28841 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28842 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28843
28844+#ifdef CONFIG_PAX_PER_CPU_PGD
28845+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28846+#endif
28847+
28848 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28849 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28850 vmx->loaded_vmcs->cpu = cpu;
28851@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28852 * reads and returns guest's timestamp counter "register"
28853 * guest_tsc = host_tsc + tsc_offset -- 21.3
28854 */
28855-static u64 guest_read_tsc(void)
28856+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28857 {
28858 u64 host_tsc, tsc_offset;
28859
28860@@ -4467,7 +4475,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28861 unsigned long cr4;
28862
28863 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28864+
28865+#ifndef CONFIG_PAX_PER_CPU_PGD
28866 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28867+#endif
28868
28869 /* Save the most likely value for this task's CR4 in the VMCS. */
28870 cr4 = cr4_read_shadow();
28871@@ -4494,7 +4505,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28872 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28873 vmx->host_idt_base = dt.address;
28874
28875- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28876+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28877
28878 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28879 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28880@@ -6107,11 +6118,17 @@ static __init int hardware_setup(void)
28881 * page upon invalidation. No need to do anything if not
28882 * using the APIC_ACCESS_ADDR VMCS field.
28883 */
28884- if (!flexpriority_enabled)
28885- kvm_x86_ops->set_apic_access_page_addr = NULL;
28886+ if (!flexpriority_enabled) {
28887+ pax_open_kernel();
28888+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28889+ pax_close_kernel();
28890+ }
28891
28892- if (!cpu_has_vmx_tpr_shadow())
28893- kvm_x86_ops->update_cr8_intercept = NULL;
28894+ if (!cpu_has_vmx_tpr_shadow()) {
28895+ pax_open_kernel();
28896+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28897+ pax_close_kernel();
28898+ }
28899
28900 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28901 kvm_disable_largepages();
28902@@ -6122,14 +6139,16 @@ static __init int hardware_setup(void)
28903 if (!cpu_has_vmx_apicv())
28904 enable_apicv = 0;
28905
28906+ pax_open_kernel();
28907 if (enable_apicv)
28908- kvm_x86_ops->update_cr8_intercept = NULL;
28909+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28910 else {
28911- kvm_x86_ops->hwapic_irr_update = NULL;
28912- kvm_x86_ops->hwapic_isr_update = NULL;
28913- kvm_x86_ops->deliver_posted_interrupt = NULL;
28914- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28915+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28916+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
28917+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28918+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28919 }
28920+ pax_close_kernel();
28921
28922 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
28923 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
28924@@ -6182,10 +6201,12 @@ static __init int hardware_setup(void)
28925 enable_pml = 0;
28926
28927 if (!enable_pml) {
28928- kvm_x86_ops->slot_enable_log_dirty = NULL;
28929- kvm_x86_ops->slot_disable_log_dirty = NULL;
28930- kvm_x86_ops->flush_log_dirty = NULL;
28931- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28932+ pax_open_kernel();
28933+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
28934+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
28935+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
28936+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28937+ pax_close_kernel();
28938 }
28939
28940 return alloc_kvm_area();
28941@@ -8230,6 +8251,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28942 "jmp 2f \n\t"
28943 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28944 "2: "
28945+
28946+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28947+ "ljmp %[cs],$3f\n\t"
28948+ "3: "
28949+#endif
28950+
28951 /* Save guest registers, load host registers, keep flags */
28952 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28953 "pop %0 \n\t"
28954@@ -8282,6 +8309,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28955 #endif
28956 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28957 [wordsize]"i"(sizeof(ulong))
28958+
28959+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28960+ ,[cs]"i"(__KERNEL_CS)
28961+#endif
28962+
28963 : "cc", "memory"
28964 #ifdef CONFIG_X86_64
28965 , "rax", "rbx", "rdi", "rsi"
28966@@ -8295,7 +8327,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28967 if (debugctlmsr)
28968 update_debugctlmsr(debugctlmsr);
28969
28970-#ifndef CONFIG_X86_64
28971+#ifdef CONFIG_X86_32
28972 /*
28973 * The sysexit path does not restore ds/es, so we must set them to
28974 * a reasonable value ourselves.
28975@@ -8304,8 +8336,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28976 * may be executed in interrupt context, which saves and restore segments
28977 * around it, nullifying its effect.
28978 */
28979- loadsegment(ds, __USER_DS);
28980- loadsegment(es, __USER_DS);
28981+ loadsegment(ds, __KERNEL_DS);
28982+ loadsegment(es, __KERNEL_DS);
28983+ loadsegment(ss, __KERNEL_DS);
28984+
28985+#ifdef CONFIG_PAX_KERNEXEC
28986+ loadsegment(fs, __KERNEL_PERCPU);
28987+#endif
28988+
28989+#ifdef CONFIG_PAX_MEMORY_UDEREF
28990+ __set_fs(current_thread_info()->addr_limit);
28991+#endif
28992+
28993 #endif
28994
28995 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28996diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28997index ea306ad..669f42d 100644
28998--- a/arch/x86/kvm/x86.c
28999+++ b/arch/x86/kvm/x86.c
29000@@ -1929,8 +1929,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
29001 {
29002 struct kvm *kvm = vcpu->kvm;
29003 int lm = is_long_mode(vcpu);
29004- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29005- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29006+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
29007+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
29008 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
29009 : kvm->arch.xen_hvm_config.blob_size_32;
29010 u32 page_num = data & ~PAGE_MASK;
29011@@ -2867,6 +2867,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
29012 if (n < msr_list.nmsrs)
29013 goto out;
29014 r = -EFAULT;
29015+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
29016+ goto out;
29017 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
29018 num_msrs_to_save * sizeof(u32)))
29019 goto out;
29020@@ -5784,7 +5786,7 @@ static struct notifier_block pvclock_gtod_notifier = {
29021 };
29022 #endif
29023
29024-int kvm_arch_init(void *opaque)
29025+int kvm_arch_init(const void *opaque)
29026 {
29027 int r;
29028 struct kvm_x86_ops *ops = opaque;
29029diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
29030index 8f9a133..3c7694b 100644
29031--- a/arch/x86/lguest/boot.c
29032+++ b/arch/x86/lguest/boot.c
29033@@ -1341,9 +1341,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
29034 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
29035 * Launcher to reboot us.
29036 */
29037-static void lguest_restart(char *reason)
29038+static __noreturn void lguest_restart(char *reason)
29039 {
29040 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
29041+ BUG();
29042 }
29043
29044 /*G:050
29045diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
29046index 00933d5..3a64af9 100644
29047--- a/arch/x86/lib/atomic64_386_32.S
29048+++ b/arch/x86/lib/atomic64_386_32.S
29049@@ -48,6 +48,10 @@ BEGIN(read)
29050 movl (v), %eax
29051 movl 4(v), %edx
29052 RET_ENDP
29053+BEGIN(read_unchecked)
29054+ movl (v), %eax
29055+ movl 4(v), %edx
29056+RET_ENDP
29057 #undef v
29058
29059 #define v %esi
29060@@ -55,6 +59,10 @@ BEGIN(set)
29061 movl %ebx, (v)
29062 movl %ecx, 4(v)
29063 RET_ENDP
29064+BEGIN(set_unchecked)
29065+ movl %ebx, (v)
29066+ movl %ecx, 4(v)
29067+RET_ENDP
29068 #undef v
29069
29070 #define v %esi
29071@@ -70,6 +78,20 @@ RET_ENDP
29072 BEGIN(add)
29073 addl %eax, (v)
29074 adcl %edx, 4(v)
29075+
29076+#ifdef CONFIG_PAX_REFCOUNT
29077+ jno 0f
29078+ subl %eax, (v)
29079+ sbbl %edx, 4(v)
29080+ int $4
29081+0:
29082+ _ASM_EXTABLE(0b, 0b)
29083+#endif
29084+
29085+RET_ENDP
29086+BEGIN(add_unchecked)
29087+ addl %eax, (v)
29088+ adcl %edx, 4(v)
29089 RET_ENDP
29090 #undef v
29091
29092@@ -77,6 +99,24 @@ RET_ENDP
29093 BEGIN(add_return)
29094 addl (v), %eax
29095 adcl 4(v), %edx
29096+
29097+#ifdef CONFIG_PAX_REFCOUNT
29098+ into
29099+1234:
29100+ _ASM_EXTABLE(1234b, 2f)
29101+#endif
29102+
29103+ movl %eax, (v)
29104+ movl %edx, 4(v)
29105+
29106+#ifdef CONFIG_PAX_REFCOUNT
29107+2:
29108+#endif
29109+
29110+RET_ENDP
29111+BEGIN(add_return_unchecked)
29112+ addl (v), %eax
29113+ adcl 4(v), %edx
29114 movl %eax, (v)
29115 movl %edx, 4(v)
29116 RET_ENDP
29117@@ -86,6 +126,20 @@ RET_ENDP
29118 BEGIN(sub)
29119 subl %eax, (v)
29120 sbbl %edx, 4(v)
29121+
29122+#ifdef CONFIG_PAX_REFCOUNT
29123+ jno 0f
29124+ addl %eax, (v)
29125+ adcl %edx, 4(v)
29126+ int $4
29127+0:
29128+ _ASM_EXTABLE(0b, 0b)
29129+#endif
29130+
29131+RET_ENDP
29132+BEGIN(sub_unchecked)
29133+ subl %eax, (v)
29134+ sbbl %edx, 4(v)
29135 RET_ENDP
29136 #undef v
29137
29138@@ -96,6 +150,27 @@ BEGIN(sub_return)
29139 sbbl $0, %edx
29140 addl (v), %eax
29141 adcl 4(v), %edx
29142+
29143+#ifdef CONFIG_PAX_REFCOUNT
29144+ into
29145+1234:
29146+ _ASM_EXTABLE(1234b, 2f)
29147+#endif
29148+
29149+ movl %eax, (v)
29150+ movl %edx, 4(v)
29151+
29152+#ifdef CONFIG_PAX_REFCOUNT
29153+2:
29154+#endif
29155+
29156+RET_ENDP
29157+BEGIN(sub_return_unchecked)
29158+ negl %edx
29159+ negl %eax
29160+ sbbl $0, %edx
29161+ addl (v), %eax
29162+ adcl 4(v), %edx
29163 movl %eax, (v)
29164 movl %edx, 4(v)
29165 RET_ENDP
29166@@ -105,6 +180,20 @@ RET_ENDP
29167 BEGIN(inc)
29168 addl $1, (v)
29169 adcl $0, 4(v)
29170+
29171+#ifdef CONFIG_PAX_REFCOUNT
29172+ jno 0f
29173+ subl $1, (v)
29174+ sbbl $0, 4(v)
29175+ int $4
29176+0:
29177+ _ASM_EXTABLE(0b, 0b)
29178+#endif
29179+
29180+RET_ENDP
29181+BEGIN(inc_unchecked)
29182+ addl $1, (v)
29183+ adcl $0, 4(v)
29184 RET_ENDP
29185 #undef v
29186
29187@@ -114,6 +203,26 @@ BEGIN(inc_return)
29188 movl 4(v), %edx
29189 addl $1, %eax
29190 adcl $0, %edx
29191+
29192+#ifdef CONFIG_PAX_REFCOUNT
29193+ into
29194+1234:
29195+ _ASM_EXTABLE(1234b, 2f)
29196+#endif
29197+
29198+ movl %eax, (v)
29199+ movl %edx, 4(v)
29200+
29201+#ifdef CONFIG_PAX_REFCOUNT
29202+2:
29203+#endif
29204+
29205+RET_ENDP
29206+BEGIN(inc_return_unchecked)
29207+ movl (v), %eax
29208+ movl 4(v), %edx
29209+ addl $1, %eax
29210+ adcl $0, %edx
29211 movl %eax, (v)
29212 movl %edx, 4(v)
29213 RET_ENDP
29214@@ -123,6 +232,20 @@ RET_ENDP
29215 BEGIN(dec)
29216 subl $1, (v)
29217 sbbl $0, 4(v)
29218+
29219+#ifdef CONFIG_PAX_REFCOUNT
29220+ jno 0f
29221+ addl $1, (v)
29222+ adcl $0, 4(v)
29223+ int $4
29224+0:
29225+ _ASM_EXTABLE(0b, 0b)
29226+#endif
29227+
29228+RET_ENDP
29229+BEGIN(dec_unchecked)
29230+ subl $1, (v)
29231+ sbbl $0, 4(v)
29232 RET_ENDP
29233 #undef v
29234
29235@@ -132,6 +255,26 @@ BEGIN(dec_return)
29236 movl 4(v), %edx
29237 subl $1, %eax
29238 sbbl $0, %edx
29239+
29240+#ifdef CONFIG_PAX_REFCOUNT
29241+ into
29242+1234:
29243+ _ASM_EXTABLE(1234b, 2f)
29244+#endif
29245+
29246+ movl %eax, (v)
29247+ movl %edx, 4(v)
29248+
29249+#ifdef CONFIG_PAX_REFCOUNT
29250+2:
29251+#endif
29252+
29253+RET_ENDP
29254+BEGIN(dec_return_unchecked)
29255+ movl (v), %eax
29256+ movl 4(v), %edx
29257+ subl $1, %eax
29258+ sbbl $0, %edx
29259 movl %eax, (v)
29260 movl %edx, 4(v)
29261 RET_ENDP
29262@@ -143,6 +286,13 @@ BEGIN(add_unless)
29263 adcl %edx, %edi
29264 addl (v), %eax
29265 adcl 4(v), %edx
29266+
29267+#ifdef CONFIG_PAX_REFCOUNT
29268+ into
29269+1234:
29270+ _ASM_EXTABLE(1234b, 2f)
29271+#endif
29272+
29273 cmpl %eax, %ecx
29274 je 3f
29275 1:
29276@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29277 1:
29278 addl $1, %eax
29279 adcl $0, %edx
29280+
29281+#ifdef CONFIG_PAX_REFCOUNT
29282+ into
29283+1234:
29284+ _ASM_EXTABLE(1234b, 2f)
29285+#endif
29286+
29287 movl %eax, (v)
29288 movl %edx, 4(v)
29289 movl $1, %eax
29290@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29291 movl 4(v), %edx
29292 subl $1, %eax
29293 sbbl $0, %edx
29294+
29295+#ifdef CONFIG_PAX_REFCOUNT
29296+ into
29297+1234:
29298+ _ASM_EXTABLE(1234b, 1f)
29299+#endif
29300+
29301 js 1f
29302 movl %eax, (v)
29303 movl %edx, 4(v)
29304diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29305index 082a851..6a963bc 100644
29306--- a/arch/x86/lib/atomic64_cx8_32.S
29307+++ b/arch/x86/lib/atomic64_cx8_32.S
29308@@ -25,10 +25,20 @@ ENTRY(atomic64_read_cx8)
29309 CFI_STARTPROC
29310
29311 read64 %ecx
29312+ pax_force_retaddr
29313 ret
29314 CFI_ENDPROC
29315 ENDPROC(atomic64_read_cx8)
29316
29317+ENTRY(atomic64_read_unchecked_cx8)
29318+ CFI_STARTPROC
29319+
29320+ read64 %ecx
29321+ pax_force_retaddr
29322+ ret
29323+ CFI_ENDPROC
29324+ENDPROC(atomic64_read_unchecked_cx8)
29325+
29326 ENTRY(atomic64_set_cx8)
29327 CFI_STARTPROC
29328
29329@@ -38,10 +48,25 @@ ENTRY(atomic64_set_cx8)
29330 cmpxchg8b (%esi)
29331 jne 1b
29332
29333+ pax_force_retaddr
29334 ret
29335 CFI_ENDPROC
29336 ENDPROC(atomic64_set_cx8)
29337
29338+ENTRY(atomic64_set_unchecked_cx8)
29339+ CFI_STARTPROC
29340+
29341+1:
29342+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29343+ * are atomic on 586 and newer */
29344+ cmpxchg8b (%esi)
29345+ jne 1b
29346+
29347+ pax_force_retaddr
29348+ ret
29349+ CFI_ENDPROC
29350+ENDPROC(atomic64_set_unchecked_cx8)
29351+
29352 ENTRY(atomic64_xchg_cx8)
29353 CFI_STARTPROC
29354
29355@@ -50,12 +75,13 @@ ENTRY(atomic64_xchg_cx8)
29356 cmpxchg8b (%esi)
29357 jne 1b
29358
29359+ pax_force_retaddr
29360 ret
29361 CFI_ENDPROC
29362 ENDPROC(atomic64_xchg_cx8)
29363
29364-.macro addsub_return func ins insc
29365-ENTRY(atomic64_\func\()_return_cx8)
29366+.macro addsub_return func ins insc unchecked=""
29367+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29368 CFI_STARTPROC
29369 pushl_cfi_reg ebp
29370 pushl_cfi_reg ebx
29371@@ -72,27 +98,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29372 movl %edx, %ecx
29373 \ins\()l %esi, %ebx
29374 \insc\()l %edi, %ecx
29375+
29376+.ifb \unchecked
29377+#ifdef CONFIG_PAX_REFCOUNT
29378+ into
29379+2:
29380+ _ASM_EXTABLE(2b, 3f)
29381+#endif
29382+.endif
29383+
29384 LOCK_PREFIX
29385 cmpxchg8b (%ebp)
29386 jne 1b
29387-
29388-10:
29389 movl %ebx, %eax
29390 movl %ecx, %edx
29391+
29392+.ifb \unchecked
29393+#ifdef CONFIG_PAX_REFCOUNT
29394+3:
29395+#endif
29396+.endif
29397+
29398 popl_cfi_reg edi
29399 popl_cfi_reg esi
29400 popl_cfi_reg ebx
29401 popl_cfi_reg ebp
29402+ pax_force_retaddr
29403 ret
29404 CFI_ENDPROC
29405-ENDPROC(atomic64_\func\()_return_cx8)
29406+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29407 .endm
29408
29409 addsub_return add add adc
29410 addsub_return sub sub sbb
29411+addsub_return add add adc _unchecked
29412+addsub_return sub sub sbb _unchecked
29413
29414-.macro incdec_return func ins insc
29415-ENTRY(atomic64_\func\()_return_cx8)
29416+.macro incdec_return func ins insc unchecked=""
29417+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29418 CFI_STARTPROC
29419 pushl_cfi_reg ebx
29420
29421@@ -102,21 +145,38 @@ ENTRY(atomic64_\func\()_return_cx8)
29422 movl %edx, %ecx
29423 \ins\()l $1, %ebx
29424 \insc\()l $0, %ecx
29425+
29426+.ifb \unchecked
29427+#ifdef CONFIG_PAX_REFCOUNT
29428+ into
29429+2:
29430+ _ASM_EXTABLE(2b, 3f)
29431+#endif
29432+.endif
29433+
29434 LOCK_PREFIX
29435 cmpxchg8b (%esi)
29436 jne 1b
29437-
29438-10:
29439 movl %ebx, %eax
29440 movl %ecx, %edx
29441+
29442+.ifb \unchecked
29443+#ifdef CONFIG_PAX_REFCOUNT
29444+3:
29445+#endif
29446+.endif
29447+
29448 popl_cfi_reg ebx
29449+ pax_force_retaddr
29450 ret
29451 CFI_ENDPROC
29452-ENDPROC(atomic64_\func\()_return_cx8)
29453+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29454 .endm
29455
29456 incdec_return inc add adc
29457 incdec_return dec sub sbb
29458+incdec_return inc add adc _unchecked
29459+incdec_return dec sub sbb _unchecked
29460
29461 ENTRY(atomic64_dec_if_positive_cx8)
29462 CFI_STARTPROC
29463@@ -128,6 +188,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29464 movl %edx, %ecx
29465 subl $1, %ebx
29466 sbb $0, %ecx
29467+
29468+#ifdef CONFIG_PAX_REFCOUNT
29469+ into
29470+1234:
29471+ _ASM_EXTABLE(1234b, 2f)
29472+#endif
29473+
29474 js 2f
29475 LOCK_PREFIX
29476 cmpxchg8b (%esi)
29477@@ -137,6 +204,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29478 movl %ebx, %eax
29479 movl %ecx, %edx
29480 popl_cfi_reg ebx
29481+ pax_force_retaddr
29482 ret
29483 CFI_ENDPROC
29484 ENDPROC(atomic64_dec_if_positive_cx8)
29485@@ -161,6 +229,13 @@ ENTRY(atomic64_add_unless_cx8)
29486 movl %edx, %ecx
29487 addl %ebp, %ebx
29488 adcl %edi, %ecx
29489+
29490+#ifdef CONFIG_PAX_REFCOUNT
29491+ into
29492+1234:
29493+ _ASM_EXTABLE(1234b, 3f)
29494+#endif
29495+
29496 LOCK_PREFIX
29497 cmpxchg8b (%esi)
29498 jne 1b
29499@@ -171,6 +246,7 @@ ENTRY(atomic64_add_unless_cx8)
29500 CFI_ADJUST_CFA_OFFSET -8
29501 popl_cfi_reg ebx
29502 popl_cfi_reg ebp
29503+ pax_force_retaddr
29504 ret
29505 4:
29506 cmpl %edx, 4(%esp)
29507@@ -193,6 +269,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29508 xorl %ecx, %ecx
29509 addl $1, %ebx
29510 adcl %edx, %ecx
29511+
29512+#ifdef CONFIG_PAX_REFCOUNT
29513+ into
29514+1234:
29515+ _ASM_EXTABLE(1234b, 3f)
29516+#endif
29517+
29518 LOCK_PREFIX
29519 cmpxchg8b (%esi)
29520 jne 1b
29521@@ -200,6 +283,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29522 movl $1, %eax
29523 3:
29524 popl_cfi_reg ebx
29525+ pax_force_retaddr
29526 ret
29527 CFI_ENDPROC
29528 ENDPROC(atomic64_inc_not_zero_cx8)
29529diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29530index 9bc944a..e52be6c 100644
29531--- a/arch/x86/lib/checksum_32.S
29532+++ b/arch/x86/lib/checksum_32.S
29533@@ -29,7 +29,8 @@
29534 #include <asm/dwarf2.h>
29535 #include <asm/errno.h>
29536 #include <asm/asm.h>
29537-
29538+#include <asm/segment.h>
29539+
29540 /*
29541 * computes a partial checksum, e.g. for TCP/UDP fragments
29542 */
29543@@ -285,9 +286,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29544
29545 #define ARGBASE 16
29546 #define FP 12
29547-
29548-ENTRY(csum_partial_copy_generic)
29549+
29550+ENTRY(csum_partial_copy_generic_to_user)
29551 CFI_STARTPROC
29552+
29553+#ifdef CONFIG_PAX_MEMORY_UDEREF
29554+ pushl_cfi %gs
29555+ popl_cfi %es
29556+ jmp csum_partial_copy_generic
29557+#endif
29558+
29559+ENTRY(csum_partial_copy_generic_from_user)
29560+
29561+#ifdef CONFIG_PAX_MEMORY_UDEREF
29562+ pushl_cfi %gs
29563+ popl_cfi %ds
29564+#endif
29565+
29566+ENTRY(csum_partial_copy_generic)
29567 subl $4,%esp
29568 CFI_ADJUST_CFA_OFFSET 4
29569 pushl_cfi_reg edi
29570@@ -306,7 +322,7 @@ ENTRY(csum_partial_copy_generic)
29571 jmp 4f
29572 SRC(1: movw (%esi), %bx )
29573 addl $2, %esi
29574-DST( movw %bx, (%edi) )
29575+DST( movw %bx, %es:(%edi) )
29576 addl $2, %edi
29577 addw %bx, %ax
29578 adcl $0, %eax
29579@@ -318,30 +334,30 @@ DST( movw %bx, (%edi) )
29580 SRC(1: movl (%esi), %ebx )
29581 SRC( movl 4(%esi), %edx )
29582 adcl %ebx, %eax
29583-DST( movl %ebx, (%edi) )
29584+DST( movl %ebx, %es:(%edi) )
29585 adcl %edx, %eax
29586-DST( movl %edx, 4(%edi) )
29587+DST( movl %edx, %es:4(%edi) )
29588
29589 SRC( movl 8(%esi), %ebx )
29590 SRC( movl 12(%esi), %edx )
29591 adcl %ebx, %eax
29592-DST( movl %ebx, 8(%edi) )
29593+DST( movl %ebx, %es:8(%edi) )
29594 adcl %edx, %eax
29595-DST( movl %edx, 12(%edi) )
29596+DST( movl %edx, %es:12(%edi) )
29597
29598 SRC( movl 16(%esi), %ebx )
29599 SRC( movl 20(%esi), %edx )
29600 adcl %ebx, %eax
29601-DST( movl %ebx, 16(%edi) )
29602+DST( movl %ebx, %es:16(%edi) )
29603 adcl %edx, %eax
29604-DST( movl %edx, 20(%edi) )
29605+DST( movl %edx, %es:20(%edi) )
29606
29607 SRC( movl 24(%esi), %ebx )
29608 SRC( movl 28(%esi), %edx )
29609 adcl %ebx, %eax
29610-DST( movl %ebx, 24(%edi) )
29611+DST( movl %ebx, %es:24(%edi) )
29612 adcl %edx, %eax
29613-DST( movl %edx, 28(%edi) )
29614+DST( movl %edx, %es:28(%edi) )
29615
29616 lea 32(%esi), %esi
29617 lea 32(%edi), %edi
29618@@ -355,7 +371,7 @@ DST( movl %edx, 28(%edi) )
29619 shrl $2, %edx # This clears CF
29620 SRC(3: movl (%esi), %ebx )
29621 adcl %ebx, %eax
29622-DST( movl %ebx, (%edi) )
29623+DST( movl %ebx, %es:(%edi) )
29624 lea 4(%esi), %esi
29625 lea 4(%edi), %edi
29626 dec %edx
29627@@ -367,12 +383,12 @@ DST( movl %ebx, (%edi) )
29628 jb 5f
29629 SRC( movw (%esi), %cx )
29630 leal 2(%esi), %esi
29631-DST( movw %cx, (%edi) )
29632+DST( movw %cx, %es:(%edi) )
29633 leal 2(%edi), %edi
29634 je 6f
29635 shll $16,%ecx
29636 SRC(5: movb (%esi), %cl )
29637-DST( movb %cl, (%edi) )
29638+DST( movb %cl, %es:(%edi) )
29639 6: addl %ecx, %eax
29640 adcl $0, %eax
29641 7:
29642@@ -383,7 +399,7 @@ DST( movb %cl, (%edi) )
29643
29644 6001:
29645 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29646- movl $-EFAULT, (%ebx)
29647+ movl $-EFAULT, %ss:(%ebx)
29648
29649 # zero the complete destination - computing the rest
29650 # is too much work
29651@@ -396,37 +412,58 @@ DST( movb %cl, (%edi) )
29652
29653 6002:
29654 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29655- movl $-EFAULT,(%ebx)
29656+ movl $-EFAULT,%ss:(%ebx)
29657 jmp 5000b
29658
29659 .previous
29660
29661+ pushl_cfi %ss
29662+ popl_cfi %ds
29663+ pushl_cfi %ss
29664+ popl_cfi %es
29665 popl_cfi_reg ebx
29666 popl_cfi_reg esi
29667 popl_cfi_reg edi
29668 popl_cfi %ecx # equivalent to addl $4,%esp
29669 ret
29670 CFI_ENDPROC
29671-ENDPROC(csum_partial_copy_generic)
29672+ENDPROC(csum_partial_copy_generic_to_user)
29673
29674 #else
29675
29676 /* Version for PentiumII/PPro */
29677
29678 #define ROUND1(x) \
29679+ nop; nop; nop; \
29680 SRC(movl x(%esi), %ebx ) ; \
29681 addl %ebx, %eax ; \
29682- DST(movl %ebx, x(%edi) ) ;
29683+ DST(movl %ebx, %es:x(%edi)) ;
29684
29685 #define ROUND(x) \
29686+ nop; nop; nop; \
29687 SRC(movl x(%esi), %ebx ) ; \
29688 adcl %ebx, %eax ; \
29689- DST(movl %ebx, x(%edi) ) ;
29690+ DST(movl %ebx, %es:x(%edi)) ;
29691
29692 #define ARGBASE 12
29693-
29694-ENTRY(csum_partial_copy_generic)
29695+
29696+ENTRY(csum_partial_copy_generic_to_user)
29697 CFI_STARTPROC
29698+
29699+#ifdef CONFIG_PAX_MEMORY_UDEREF
29700+ pushl_cfi %gs
29701+ popl_cfi %es
29702+ jmp csum_partial_copy_generic
29703+#endif
29704+
29705+ENTRY(csum_partial_copy_generic_from_user)
29706+
29707+#ifdef CONFIG_PAX_MEMORY_UDEREF
29708+ pushl_cfi %gs
29709+ popl_cfi %ds
29710+#endif
29711+
29712+ENTRY(csum_partial_copy_generic)
29713 pushl_cfi_reg ebx
29714 pushl_cfi_reg edi
29715 pushl_cfi_reg esi
29716@@ -444,7 +481,7 @@ ENTRY(csum_partial_copy_generic)
29717 subl %ebx, %edi
29718 lea -1(%esi),%edx
29719 andl $-32,%edx
29720- lea 3f(%ebx,%ebx), %ebx
29721+ lea 3f(%ebx,%ebx,2), %ebx
29722 testl %esi, %esi
29723 jmp *%ebx
29724 1: addl $64,%esi
29725@@ -465,19 +502,19 @@ ENTRY(csum_partial_copy_generic)
29726 jb 5f
29727 SRC( movw (%esi), %dx )
29728 leal 2(%esi), %esi
29729-DST( movw %dx, (%edi) )
29730+DST( movw %dx, %es:(%edi) )
29731 leal 2(%edi), %edi
29732 je 6f
29733 shll $16,%edx
29734 5:
29735 SRC( movb (%esi), %dl )
29736-DST( movb %dl, (%edi) )
29737+DST( movb %dl, %es:(%edi) )
29738 6: addl %edx, %eax
29739 adcl $0, %eax
29740 7:
29741 .section .fixup, "ax"
29742 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29743- movl $-EFAULT, (%ebx)
29744+ movl $-EFAULT, %ss:(%ebx)
29745 # zero the complete destination (computing the rest is too much work)
29746 movl ARGBASE+8(%esp),%edi # dst
29747 movl ARGBASE+12(%esp),%ecx # len
29748@@ -485,16 +522,23 @@ DST( movb %dl, (%edi) )
29749 rep; stosb
29750 jmp 7b
29751 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29752- movl $-EFAULT, (%ebx)
29753+ movl $-EFAULT, %ss:(%ebx)
29754 jmp 7b
29755 .previous
29756
29757+#ifdef CONFIG_PAX_MEMORY_UDEREF
29758+ pushl_cfi %ss
29759+ popl_cfi %ds
29760+ pushl_cfi %ss
29761+ popl_cfi %es
29762+#endif
29763+
29764 popl_cfi_reg esi
29765 popl_cfi_reg edi
29766 popl_cfi_reg ebx
29767 ret
29768 CFI_ENDPROC
29769-ENDPROC(csum_partial_copy_generic)
29770+ENDPROC(csum_partial_copy_generic_to_user)
29771
29772 #undef ROUND
29773 #undef ROUND1
29774diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29775index e67e579..4782449 100644
29776--- a/arch/x86/lib/clear_page_64.S
29777+++ b/arch/x86/lib/clear_page_64.S
29778@@ -23,6 +23,7 @@ ENTRY(clear_page)
29779 movl $4096/8,%ecx
29780 xorl %eax,%eax
29781 rep stosq
29782+ pax_force_retaddr
29783 ret
29784 CFI_ENDPROC
29785 ENDPROC(clear_page)
29786@@ -47,6 +48,7 @@ ENTRY(clear_page_orig)
29787 leaq 64(%rdi),%rdi
29788 jnz .Lloop
29789 nop
29790+ pax_force_retaddr
29791 ret
29792 CFI_ENDPROC
29793 ENDPROC(clear_page_orig)
29794@@ -56,6 +58,7 @@ ENTRY(clear_page_c_e)
29795 movl $4096,%ecx
29796 xorl %eax,%eax
29797 rep stosb
29798+ pax_force_retaddr
29799 ret
29800 CFI_ENDPROC
29801 ENDPROC(clear_page_c_e)
29802diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29803index 40a1725..5d12ac4 100644
29804--- a/arch/x86/lib/cmpxchg16b_emu.S
29805+++ b/arch/x86/lib/cmpxchg16b_emu.S
29806@@ -8,6 +8,7 @@
29807 #include <linux/linkage.h>
29808 #include <asm/dwarf2.h>
29809 #include <asm/percpu.h>
29810+#include <asm/alternative-asm.h>
29811
29812 .text
29813
29814@@ -46,12 +47,14 @@ CFI_STARTPROC
29815 CFI_REMEMBER_STATE
29816 popfq_cfi
29817 mov $1, %al
29818+ pax_force_retaddr
29819 ret
29820
29821 CFI_RESTORE_STATE
29822 .Lnot_same:
29823 popfq_cfi
29824 xor %al,%al
29825+ pax_force_retaddr
29826 ret
29827
29828 CFI_ENDPROC
29829diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29830index 8239dbc..e714d2a 100644
29831--- a/arch/x86/lib/copy_page_64.S
29832+++ b/arch/x86/lib/copy_page_64.S
29833@@ -17,6 +17,7 @@ ENTRY(copy_page)
29834 ALTERNATIVE "jmp copy_page_regs", "", X86_FEATURE_REP_GOOD
29835 movl $4096/8, %ecx
29836 rep movsq
29837+ pax_force_retaddr
29838 ret
29839 CFI_ENDPROC
29840 ENDPROC(copy_page)
29841@@ -27,8 +28,8 @@ ENTRY(copy_page_regs)
29842 CFI_ADJUST_CFA_OFFSET 2*8
29843 movq %rbx, (%rsp)
29844 CFI_REL_OFFSET rbx, 0
29845- movq %r12, 1*8(%rsp)
29846- CFI_REL_OFFSET r12, 1*8
29847+ movq %r13, 1*8(%rsp)
29848+ CFI_REL_OFFSET r13, 1*8
29849
29850 movl $(4096/64)-5, %ecx
29851 .p2align 4
29852@@ -41,7 +42,7 @@ ENTRY(copy_page_regs)
29853 movq 0x8*4(%rsi), %r9
29854 movq 0x8*5(%rsi), %r10
29855 movq 0x8*6(%rsi), %r11
29856- movq 0x8*7(%rsi), %r12
29857+ movq 0x8*7(%rsi), %r13
29858
29859 prefetcht0 5*64(%rsi)
29860
29861@@ -52,7 +53,7 @@ ENTRY(copy_page_regs)
29862 movq %r9, 0x8*4(%rdi)
29863 movq %r10, 0x8*5(%rdi)
29864 movq %r11, 0x8*6(%rdi)
29865- movq %r12, 0x8*7(%rdi)
29866+ movq %r13, 0x8*7(%rdi)
29867
29868 leaq 64 (%rsi), %rsi
29869 leaq 64 (%rdi), %rdi
29870@@ -71,7 +72,7 @@ ENTRY(copy_page_regs)
29871 movq 0x8*4(%rsi), %r9
29872 movq 0x8*5(%rsi), %r10
29873 movq 0x8*6(%rsi), %r11
29874- movq 0x8*7(%rsi), %r12
29875+ movq 0x8*7(%rsi), %r13
29876
29877 movq %rax, 0x8*0(%rdi)
29878 movq %rbx, 0x8*1(%rdi)
29879@@ -80,7 +81,7 @@ ENTRY(copy_page_regs)
29880 movq %r9, 0x8*4(%rdi)
29881 movq %r10, 0x8*5(%rdi)
29882 movq %r11, 0x8*6(%rdi)
29883- movq %r12, 0x8*7(%rdi)
29884+ movq %r13, 0x8*7(%rdi)
29885
29886 leaq 64(%rdi), %rdi
29887 leaq 64(%rsi), %rsi
29888@@ -88,10 +89,11 @@ ENTRY(copy_page_regs)
29889
29890 movq (%rsp), %rbx
29891 CFI_RESTORE rbx
29892- movq 1*8(%rsp), %r12
29893- CFI_RESTORE r12
29894+ movq 1*8(%rsp), %r13
29895+ CFI_RESTORE r13
29896 addq $2*8, %rsp
29897 CFI_ADJUST_CFA_OFFSET -2*8
29898+ pax_force_retaddr
29899 ret
29900 CFI_ENDPROC
29901 ENDPROC(copy_page_regs)
29902diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29903index fa997df..060ab18 100644
29904--- a/arch/x86/lib/copy_user_64.S
29905+++ b/arch/x86/lib/copy_user_64.S
29906@@ -15,6 +15,7 @@
29907 #include <asm/alternative-asm.h>
29908 #include <asm/asm.h>
29909 #include <asm/smap.h>
29910+#include <asm/pgtable.h>
29911
29912 .macro ALIGN_DESTINATION
29913 /* check for bad alignment of destination */
29914@@ -40,56 +41,6 @@
29915 _ASM_EXTABLE(101b,103b)
29916 .endm
29917
29918-/* Standard copy_to_user with segment limit checking */
29919-ENTRY(_copy_to_user)
29920- CFI_STARTPROC
29921- GET_THREAD_INFO(%rax)
29922- movq %rdi,%rcx
29923- addq %rdx,%rcx
29924- jc bad_to_user
29925- cmpq TI_addr_limit(%rax),%rcx
29926- ja bad_to_user
29927- ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
29928- "jmp copy_user_generic_string", \
29929- X86_FEATURE_REP_GOOD, \
29930- "jmp copy_user_enhanced_fast_string", \
29931- X86_FEATURE_ERMS
29932- CFI_ENDPROC
29933-ENDPROC(_copy_to_user)
29934-
29935-/* Standard copy_from_user with segment limit checking */
29936-ENTRY(_copy_from_user)
29937- CFI_STARTPROC
29938- GET_THREAD_INFO(%rax)
29939- movq %rsi,%rcx
29940- addq %rdx,%rcx
29941- jc bad_from_user
29942- cmpq TI_addr_limit(%rax),%rcx
29943- ja bad_from_user
29944- ALTERNATIVE_2 "jmp copy_user_generic_unrolled", \
29945- "jmp copy_user_generic_string", \
29946- X86_FEATURE_REP_GOOD, \
29947- "jmp copy_user_enhanced_fast_string", \
29948- X86_FEATURE_ERMS
29949- CFI_ENDPROC
29950-ENDPROC(_copy_from_user)
29951-
29952- .section .fixup,"ax"
29953- /* must zero dest */
29954-ENTRY(bad_from_user)
29955-bad_from_user:
29956- CFI_STARTPROC
29957- movl %edx,%ecx
29958- xorl %eax,%eax
29959- rep
29960- stosb
29961-bad_to_user:
29962- movl %edx,%eax
29963- ret
29964- CFI_ENDPROC
29965-ENDPROC(bad_from_user)
29966- .previous
29967-
29968 /*
29969 * copy_user_generic_unrolled - memory copy with exception handling.
29970 * This version is for CPUs like P4 that don't have efficient micro
29971@@ -105,6 +56,7 @@ ENDPROC(bad_from_user)
29972 */
29973 ENTRY(copy_user_generic_unrolled)
29974 CFI_STARTPROC
29975+ ASM_PAX_OPEN_USERLAND
29976 ASM_STAC
29977 cmpl $8,%edx
29978 jb 20f /* less then 8 bytes, go to byte copy loop */
29979@@ -154,6 +106,8 @@ ENTRY(copy_user_generic_unrolled)
29980 jnz 21b
29981 23: xor %eax,%eax
29982 ASM_CLAC
29983+ ASM_PAX_CLOSE_USERLAND
29984+ pax_force_retaddr
29985 ret
29986
29987 .section .fixup,"ax"
29988@@ -209,6 +163,7 @@ ENDPROC(copy_user_generic_unrolled)
29989 */
29990 ENTRY(copy_user_generic_string)
29991 CFI_STARTPROC
29992+ ASM_PAX_OPEN_USERLAND
29993 ASM_STAC
29994 cmpl $8,%edx
29995 jb 2f /* less than 8 bytes, go to byte copy loop */
29996@@ -223,6 +178,8 @@ ENTRY(copy_user_generic_string)
29997 movsb
29998 xorl %eax,%eax
29999 ASM_CLAC
30000+ ASM_PAX_CLOSE_USERLAND
30001+ pax_force_retaddr
30002 ret
30003
30004 .section .fixup,"ax"
30005@@ -250,12 +207,15 @@ ENDPROC(copy_user_generic_string)
30006 */
30007 ENTRY(copy_user_enhanced_fast_string)
30008 CFI_STARTPROC
30009+ ASM_PAX_OPEN_USERLAND
30010 ASM_STAC
30011 movl %edx,%ecx
30012 1: rep
30013 movsb
30014 xorl %eax,%eax
30015 ASM_CLAC
30016+ ASM_PAX_CLOSE_USERLAND
30017+ pax_force_retaddr
30018 ret
30019
30020 .section .fixup,"ax"
30021diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30022index 6a4f43c..c70fb52 100644
30023--- a/arch/x86/lib/copy_user_nocache_64.S
30024+++ b/arch/x86/lib/copy_user_nocache_64.S
30025@@ -8,6 +8,7 @@
30026
30027 #include <linux/linkage.h>
30028 #include <asm/dwarf2.h>
30029+#include <asm/alternative-asm.h>
30030
30031 #define FIX_ALIGNMENT 1
30032
30033@@ -16,6 +17,7 @@
30034 #include <asm/thread_info.h>
30035 #include <asm/asm.h>
30036 #include <asm/smap.h>
30037+#include <asm/pgtable.h>
30038
30039 .macro ALIGN_DESTINATION
30040 #ifdef FIX_ALIGNMENT
30041@@ -49,6 +51,16 @@
30042 */
30043 ENTRY(__copy_user_nocache)
30044 CFI_STARTPROC
30045+
30046+#ifdef CONFIG_PAX_MEMORY_UDEREF
30047+ mov pax_user_shadow_base,%rcx
30048+ cmp %rcx,%rsi
30049+ jae 1f
30050+ add %rcx,%rsi
30051+1:
30052+#endif
30053+
30054+ ASM_PAX_OPEN_USERLAND
30055 ASM_STAC
30056 cmpl $8,%edx
30057 jb 20f /* less then 8 bytes, go to byte copy loop */
30058@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30059 jnz 21b
30060 23: xorl %eax,%eax
30061 ASM_CLAC
30062+ ASM_PAX_CLOSE_USERLAND
30063 sfence
30064+ pax_force_retaddr
30065 ret
30066
30067 .section .fixup,"ax"
30068diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30069index 9734182..dbee61c 100644
30070--- a/arch/x86/lib/csum-copy_64.S
30071+++ b/arch/x86/lib/csum-copy_64.S
30072@@ -9,6 +9,7 @@
30073 #include <asm/dwarf2.h>
30074 #include <asm/errno.h>
30075 #include <asm/asm.h>
30076+#include <asm/alternative-asm.h>
30077
30078 /*
30079 * Checksum copy with exception handling.
30080@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30081 CFI_ADJUST_CFA_OFFSET 7*8
30082 movq %rbx, 2*8(%rsp)
30083 CFI_REL_OFFSET rbx, 2*8
30084- movq %r12, 3*8(%rsp)
30085- CFI_REL_OFFSET r12, 3*8
30086+ movq %r15, 3*8(%rsp)
30087+ CFI_REL_OFFSET r15, 3*8
30088 movq %r14, 4*8(%rsp)
30089 CFI_REL_OFFSET r14, 4*8
30090 movq %r13, 5*8(%rsp)
30091@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30092 movl %edx, %ecx
30093
30094 xorl %r9d, %r9d
30095- movq %rcx, %r12
30096+ movq %rcx, %r15
30097
30098- shrq $6, %r12
30099+ shrq $6, %r15
30100 jz .Lhandle_tail /* < 64 */
30101
30102 clc
30103
30104 /* main loop. clear in 64 byte blocks */
30105 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30106- /* r11: temp3, rdx: temp4, r12 loopcnt */
30107+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30108 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30109 .p2align 4
30110 .Lloop:
30111@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30112 adcq %r14, %rax
30113 adcq %r13, %rax
30114
30115- decl %r12d
30116+ decl %r15d
30117
30118 dest
30119 movq %rbx, (%rsi)
30120@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30121 .Lende:
30122 movq 2*8(%rsp), %rbx
30123 CFI_RESTORE rbx
30124- movq 3*8(%rsp), %r12
30125- CFI_RESTORE r12
30126+ movq 3*8(%rsp), %r15
30127+ CFI_RESTORE r15
30128 movq 4*8(%rsp), %r14
30129 CFI_RESTORE r14
30130 movq 5*8(%rsp), %r13
30131@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30132 CFI_RESTORE rbp
30133 addq $7*8, %rsp
30134 CFI_ADJUST_CFA_OFFSET -7*8
30135+ pax_force_retaddr
30136 ret
30137 CFI_RESTORE_STATE
30138
30139diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30140index 1318f75..44c30fd 100644
30141--- a/arch/x86/lib/csum-wrappers_64.c
30142+++ b/arch/x86/lib/csum-wrappers_64.c
30143@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30144 len -= 2;
30145 }
30146 }
30147+ pax_open_userland();
30148 stac();
30149- isum = csum_partial_copy_generic((__force const void *)src,
30150+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30151 dst, len, isum, errp, NULL);
30152 clac();
30153+ pax_close_userland();
30154 if (unlikely(*errp))
30155 goto out_err;
30156
30157@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30158 }
30159
30160 *errp = 0;
30161+ pax_open_userland();
30162 stac();
30163- ret = csum_partial_copy_generic(src, (void __force *)dst,
30164+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30165 len, isum, NULL, errp);
30166 clac();
30167+ pax_close_userland();
30168 return ret;
30169 }
30170 EXPORT_SYMBOL(csum_partial_copy_to_user);
30171diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30172index a451235..a74bfa3 100644
30173--- a/arch/x86/lib/getuser.S
30174+++ b/arch/x86/lib/getuser.S
30175@@ -33,17 +33,40 @@
30176 #include <asm/thread_info.h>
30177 #include <asm/asm.h>
30178 #include <asm/smap.h>
30179+#include <asm/segment.h>
30180+#include <asm/pgtable.h>
30181+#include <asm/alternative-asm.h>
30182+
30183+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30184+#define __copyuser_seg gs;
30185+#else
30186+#define __copyuser_seg
30187+#endif
30188
30189 .text
30190 ENTRY(__get_user_1)
30191 CFI_STARTPROC
30192+
30193+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30194 GET_THREAD_INFO(%_ASM_DX)
30195 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30196 jae bad_get_user
30197+
30198+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30199+ mov pax_user_shadow_base,%_ASM_DX
30200+ cmp %_ASM_DX,%_ASM_AX
30201+ jae 1234f
30202+ add %_ASM_DX,%_ASM_AX
30203+1234:
30204+#endif
30205+
30206+#endif
30207+
30208 ASM_STAC
30209-1: movzbl (%_ASM_AX),%edx
30210+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30211 xor %eax,%eax
30212 ASM_CLAC
30213+ pax_force_retaddr
30214 ret
30215 CFI_ENDPROC
30216 ENDPROC(__get_user_1)
30217@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30218 ENTRY(__get_user_2)
30219 CFI_STARTPROC
30220 add $1,%_ASM_AX
30221+
30222+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30223 jc bad_get_user
30224 GET_THREAD_INFO(%_ASM_DX)
30225 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30226 jae bad_get_user
30227+
30228+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30229+ mov pax_user_shadow_base,%_ASM_DX
30230+ cmp %_ASM_DX,%_ASM_AX
30231+ jae 1234f
30232+ add %_ASM_DX,%_ASM_AX
30233+1234:
30234+#endif
30235+
30236+#endif
30237+
30238 ASM_STAC
30239-2: movzwl -1(%_ASM_AX),%edx
30240+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30241 xor %eax,%eax
30242 ASM_CLAC
30243+ pax_force_retaddr
30244 ret
30245 CFI_ENDPROC
30246 ENDPROC(__get_user_2)
30247@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30248 ENTRY(__get_user_4)
30249 CFI_STARTPROC
30250 add $3,%_ASM_AX
30251+
30252+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30253 jc bad_get_user
30254 GET_THREAD_INFO(%_ASM_DX)
30255 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30256 jae bad_get_user
30257+
30258+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30259+ mov pax_user_shadow_base,%_ASM_DX
30260+ cmp %_ASM_DX,%_ASM_AX
30261+ jae 1234f
30262+ add %_ASM_DX,%_ASM_AX
30263+1234:
30264+#endif
30265+
30266+#endif
30267+
30268 ASM_STAC
30269-3: movl -3(%_ASM_AX),%edx
30270+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30271 xor %eax,%eax
30272 ASM_CLAC
30273+ pax_force_retaddr
30274 ret
30275 CFI_ENDPROC
30276 ENDPROC(__get_user_4)
30277@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30278 GET_THREAD_INFO(%_ASM_DX)
30279 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30280 jae bad_get_user
30281+
30282+#ifdef CONFIG_PAX_MEMORY_UDEREF
30283+ mov pax_user_shadow_base,%_ASM_DX
30284+ cmp %_ASM_DX,%_ASM_AX
30285+ jae 1234f
30286+ add %_ASM_DX,%_ASM_AX
30287+1234:
30288+#endif
30289+
30290 ASM_STAC
30291 4: movq -7(%_ASM_AX),%rdx
30292 xor %eax,%eax
30293 ASM_CLAC
30294+ pax_force_retaddr
30295 ret
30296 #else
30297 add $7,%_ASM_AX
30298@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30299 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30300 jae bad_get_user_8
30301 ASM_STAC
30302-4: movl -7(%_ASM_AX),%edx
30303-5: movl -3(%_ASM_AX),%ecx
30304+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30305+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30306 xor %eax,%eax
30307 ASM_CLAC
30308+ pax_force_retaddr
30309 ret
30310 #endif
30311 CFI_ENDPROC
30312@@ -113,6 +175,7 @@ bad_get_user:
30313 xor %edx,%edx
30314 mov $(-EFAULT),%_ASM_AX
30315 ASM_CLAC
30316+ pax_force_retaddr
30317 ret
30318 CFI_ENDPROC
30319 END(bad_get_user)
30320@@ -124,6 +187,7 @@ bad_get_user_8:
30321 xor %ecx,%ecx
30322 mov $(-EFAULT),%_ASM_AX
30323 ASM_CLAC
30324+ pax_force_retaddr
30325 ret
30326 CFI_ENDPROC
30327 END(bad_get_user_8)
30328diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30329index 8f72b33..a43d9969 100644
30330--- a/arch/x86/lib/insn.c
30331+++ b/arch/x86/lib/insn.c
30332@@ -20,8 +20,10 @@
30333
30334 #ifdef __KERNEL__
30335 #include <linux/string.h>
30336+#include <asm/pgtable_types.h>
30337 #else
30338 #include <string.h>
30339+#define ktla_ktva(addr) addr
30340 #endif
30341 #include <asm/inat.h>
30342 #include <asm/insn.h>
30343@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30344 buf_len = MAX_INSN_SIZE;
30345
30346 memset(insn, 0, sizeof(*insn));
30347- insn->kaddr = kaddr;
30348- insn->end_kaddr = kaddr + buf_len;
30349- insn->next_byte = kaddr;
30350+ insn->kaddr = ktla_ktva(kaddr);
30351+ insn->end_kaddr = insn->kaddr + buf_len;
30352+ insn->next_byte = insn->kaddr;
30353 insn->x86_64 = x86_64 ? 1 : 0;
30354 insn->opnd_bytes = 4;
30355 if (x86_64)
30356diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30357index 05a95e7..326f2fa 100644
30358--- a/arch/x86/lib/iomap_copy_64.S
30359+++ b/arch/x86/lib/iomap_copy_64.S
30360@@ -17,6 +17,7 @@
30361
30362 #include <linux/linkage.h>
30363 #include <asm/dwarf2.h>
30364+#include <asm/alternative-asm.h>
30365
30366 /*
30367 * override generic version in lib/iomap_copy.c
30368@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30369 CFI_STARTPROC
30370 movl %edx,%ecx
30371 rep movsd
30372+ pax_force_retaddr
30373 ret
30374 CFI_ENDPROC
30375 ENDPROC(__iowrite32_copy)
30376diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30377index b046664..dec9465 100644
30378--- a/arch/x86/lib/memcpy_64.S
30379+++ b/arch/x86/lib/memcpy_64.S
30380@@ -37,6 +37,7 @@ ENTRY(memcpy)
30381 rep movsq
30382 movl %edx, %ecx
30383 rep movsb
30384+ pax_force_retaddr
30385 ret
30386 ENDPROC(memcpy)
30387 ENDPROC(__memcpy)
30388@@ -49,6 +50,7 @@ ENTRY(memcpy_erms)
30389 movq %rdi, %rax
30390 movq %rdx, %rcx
30391 rep movsb
30392+ pax_force_retaddr
30393 ret
30394 ENDPROC(memcpy_erms)
30395
30396@@ -134,6 +136,7 @@ ENTRY(memcpy_orig)
30397 movq %r9, 1*8(%rdi)
30398 movq %r10, -2*8(%rdi, %rdx)
30399 movq %r11, -1*8(%rdi, %rdx)
30400+ pax_force_retaddr
30401 retq
30402 .p2align 4
30403 .Lless_16bytes:
30404@@ -146,6 +149,7 @@ ENTRY(memcpy_orig)
30405 movq -1*8(%rsi, %rdx), %r9
30406 movq %r8, 0*8(%rdi)
30407 movq %r9, -1*8(%rdi, %rdx)
30408+ pax_force_retaddr
30409 retq
30410 .p2align 4
30411 .Lless_8bytes:
30412@@ -159,6 +163,7 @@ ENTRY(memcpy_orig)
30413 movl -4(%rsi, %rdx), %r8d
30414 movl %ecx, (%rdi)
30415 movl %r8d, -4(%rdi, %rdx)
30416+ pax_force_retaddr
30417 retq
30418 .p2align 4
30419 .Lless_3bytes:
30420@@ -177,6 +182,7 @@ ENTRY(memcpy_orig)
30421 movb %cl, (%rdi)
30422
30423 .Lend:
30424+ pax_force_retaddr
30425 retq
30426 CFI_ENDPROC
30427 ENDPROC(memcpy_orig)
30428diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30429index 0f8a0d0..f6e0ea4 100644
30430--- a/arch/x86/lib/memmove_64.S
30431+++ b/arch/x86/lib/memmove_64.S
30432@@ -43,7 +43,7 @@ ENTRY(__memmove)
30433 jg 2f
30434
30435 .Lmemmove_begin_forward:
30436- ALTERNATIVE "", "movq %rdx, %rcx; rep movsb; retq", X86_FEATURE_ERMS
30437+ ALTERNATIVE "", "movq %rdx, %rcx; rep movsb; pax_force_retaddr; retq", X86_FEATURE_ERMS
30438
30439 /*
30440 * movsq instruction have many startup latency
30441@@ -206,6 +206,7 @@ ENTRY(__memmove)
30442 movb (%rsi), %r11b
30443 movb %r11b, (%rdi)
30444 13:
30445+ pax_force_retaddr
30446 retq
30447 CFI_ENDPROC
30448 ENDPROC(__memmove)
30449diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30450index 93118fb..386ed2a 100644
30451--- a/arch/x86/lib/memset_64.S
30452+++ b/arch/x86/lib/memset_64.S
30453@@ -41,6 +41,7 @@ ENTRY(__memset)
30454 movl %edx,%ecx
30455 rep stosb
30456 movq %r9,%rax
30457+ pax_force_retaddr
30458 ret
30459 ENDPROC(memset)
30460 ENDPROC(__memset)
30461@@ -62,6 +63,7 @@ ENTRY(memset_erms)
30462 movq %rdx,%rcx
30463 rep stosb
30464 movq %r9,%rax
30465+ pax_force_retaddr
30466 ret
30467 ENDPROC(memset_erms)
30468
30469@@ -126,6 +128,7 @@ ENTRY(memset_orig)
30470
30471 .Lende:
30472 movq %r10,%rax
30473+ pax_force_retaddr
30474 ret
30475
30476 CFI_RESTORE_STATE
30477diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30478index c9f2d9b..e7fd2c0 100644
30479--- a/arch/x86/lib/mmx_32.c
30480+++ b/arch/x86/lib/mmx_32.c
30481@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30482 {
30483 void *p;
30484 int i;
30485+ unsigned long cr0;
30486
30487 if (unlikely(in_interrupt()))
30488 return __memcpy(to, from, len);
30489@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30490 kernel_fpu_begin();
30491
30492 __asm__ __volatile__ (
30493- "1: prefetch (%0)\n" /* This set is 28 bytes */
30494- " prefetch 64(%0)\n"
30495- " prefetch 128(%0)\n"
30496- " prefetch 192(%0)\n"
30497- " prefetch 256(%0)\n"
30498+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30499+ " prefetch 64(%1)\n"
30500+ " prefetch 128(%1)\n"
30501+ " prefetch 192(%1)\n"
30502+ " prefetch 256(%1)\n"
30503 "2: \n"
30504 ".section .fixup, \"ax\"\n"
30505- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30506+ "3: \n"
30507+
30508+#ifdef CONFIG_PAX_KERNEXEC
30509+ " movl %%cr0, %0\n"
30510+ " movl %0, %%eax\n"
30511+ " andl $0xFFFEFFFF, %%eax\n"
30512+ " movl %%eax, %%cr0\n"
30513+#endif
30514+
30515+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30516+
30517+#ifdef CONFIG_PAX_KERNEXEC
30518+ " movl %0, %%cr0\n"
30519+#endif
30520+
30521 " jmp 2b\n"
30522 ".previous\n"
30523 _ASM_EXTABLE(1b, 3b)
30524- : : "r" (from));
30525+ : "=&r" (cr0) : "r" (from) : "ax");
30526
30527 for ( ; i > 5; i--) {
30528 __asm__ __volatile__ (
30529- "1: prefetch 320(%0)\n"
30530- "2: movq (%0), %%mm0\n"
30531- " movq 8(%0), %%mm1\n"
30532- " movq 16(%0), %%mm2\n"
30533- " movq 24(%0), %%mm3\n"
30534- " movq %%mm0, (%1)\n"
30535- " movq %%mm1, 8(%1)\n"
30536- " movq %%mm2, 16(%1)\n"
30537- " movq %%mm3, 24(%1)\n"
30538- " movq 32(%0), %%mm0\n"
30539- " movq 40(%0), %%mm1\n"
30540- " movq 48(%0), %%mm2\n"
30541- " movq 56(%0), %%mm3\n"
30542- " movq %%mm0, 32(%1)\n"
30543- " movq %%mm1, 40(%1)\n"
30544- " movq %%mm2, 48(%1)\n"
30545- " movq %%mm3, 56(%1)\n"
30546+ "1: prefetch 320(%1)\n"
30547+ "2: movq (%1), %%mm0\n"
30548+ " movq 8(%1), %%mm1\n"
30549+ " movq 16(%1), %%mm2\n"
30550+ " movq 24(%1), %%mm3\n"
30551+ " movq %%mm0, (%2)\n"
30552+ " movq %%mm1, 8(%2)\n"
30553+ " movq %%mm2, 16(%2)\n"
30554+ " movq %%mm3, 24(%2)\n"
30555+ " movq 32(%1), %%mm0\n"
30556+ " movq 40(%1), %%mm1\n"
30557+ " movq 48(%1), %%mm2\n"
30558+ " movq 56(%1), %%mm3\n"
30559+ " movq %%mm0, 32(%2)\n"
30560+ " movq %%mm1, 40(%2)\n"
30561+ " movq %%mm2, 48(%2)\n"
30562+ " movq %%mm3, 56(%2)\n"
30563 ".section .fixup, \"ax\"\n"
30564- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30565+ "3:\n"
30566+
30567+#ifdef CONFIG_PAX_KERNEXEC
30568+ " movl %%cr0, %0\n"
30569+ " movl %0, %%eax\n"
30570+ " andl $0xFFFEFFFF, %%eax\n"
30571+ " movl %%eax, %%cr0\n"
30572+#endif
30573+
30574+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30575+
30576+#ifdef CONFIG_PAX_KERNEXEC
30577+ " movl %0, %%cr0\n"
30578+#endif
30579+
30580 " jmp 2b\n"
30581 ".previous\n"
30582 _ASM_EXTABLE(1b, 3b)
30583- : : "r" (from), "r" (to) : "memory");
30584+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30585
30586 from += 64;
30587 to += 64;
30588@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30589 static void fast_copy_page(void *to, void *from)
30590 {
30591 int i;
30592+ unsigned long cr0;
30593
30594 kernel_fpu_begin();
30595
30596@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30597 * but that is for later. -AV
30598 */
30599 __asm__ __volatile__(
30600- "1: prefetch (%0)\n"
30601- " prefetch 64(%0)\n"
30602- " prefetch 128(%0)\n"
30603- " prefetch 192(%0)\n"
30604- " prefetch 256(%0)\n"
30605+ "1: prefetch (%1)\n"
30606+ " prefetch 64(%1)\n"
30607+ " prefetch 128(%1)\n"
30608+ " prefetch 192(%1)\n"
30609+ " prefetch 256(%1)\n"
30610 "2: \n"
30611 ".section .fixup, \"ax\"\n"
30612- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30613+ "3: \n"
30614+
30615+#ifdef CONFIG_PAX_KERNEXEC
30616+ " movl %%cr0, %0\n"
30617+ " movl %0, %%eax\n"
30618+ " andl $0xFFFEFFFF, %%eax\n"
30619+ " movl %%eax, %%cr0\n"
30620+#endif
30621+
30622+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30623+
30624+#ifdef CONFIG_PAX_KERNEXEC
30625+ " movl %0, %%cr0\n"
30626+#endif
30627+
30628 " jmp 2b\n"
30629 ".previous\n"
30630- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30631+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30632
30633 for (i = 0; i < (4096-320)/64; i++) {
30634 __asm__ __volatile__ (
30635- "1: prefetch 320(%0)\n"
30636- "2: movq (%0), %%mm0\n"
30637- " movntq %%mm0, (%1)\n"
30638- " movq 8(%0), %%mm1\n"
30639- " movntq %%mm1, 8(%1)\n"
30640- " movq 16(%0), %%mm2\n"
30641- " movntq %%mm2, 16(%1)\n"
30642- " movq 24(%0), %%mm3\n"
30643- " movntq %%mm3, 24(%1)\n"
30644- " movq 32(%0), %%mm4\n"
30645- " movntq %%mm4, 32(%1)\n"
30646- " movq 40(%0), %%mm5\n"
30647- " movntq %%mm5, 40(%1)\n"
30648- " movq 48(%0), %%mm6\n"
30649- " movntq %%mm6, 48(%1)\n"
30650- " movq 56(%0), %%mm7\n"
30651- " movntq %%mm7, 56(%1)\n"
30652+ "1: prefetch 320(%1)\n"
30653+ "2: movq (%1), %%mm0\n"
30654+ " movntq %%mm0, (%2)\n"
30655+ " movq 8(%1), %%mm1\n"
30656+ " movntq %%mm1, 8(%2)\n"
30657+ " movq 16(%1), %%mm2\n"
30658+ " movntq %%mm2, 16(%2)\n"
30659+ " movq 24(%1), %%mm3\n"
30660+ " movntq %%mm3, 24(%2)\n"
30661+ " movq 32(%1), %%mm4\n"
30662+ " movntq %%mm4, 32(%2)\n"
30663+ " movq 40(%1), %%mm5\n"
30664+ " movntq %%mm5, 40(%2)\n"
30665+ " movq 48(%1), %%mm6\n"
30666+ " movntq %%mm6, 48(%2)\n"
30667+ " movq 56(%1), %%mm7\n"
30668+ " movntq %%mm7, 56(%2)\n"
30669 ".section .fixup, \"ax\"\n"
30670- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30671+ "3:\n"
30672+
30673+#ifdef CONFIG_PAX_KERNEXEC
30674+ " movl %%cr0, %0\n"
30675+ " movl %0, %%eax\n"
30676+ " andl $0xFFFEFFFF, %%eax\n"
30677+ " movl %%eax, %%cr0\n"
30678+#endif
30679+
30680+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30681+
30682+#ifdef CONFIG_PAX_KERNEXEC
30683+ " movl %0, %%cr0\n"
30684+#endif
30685+
30686 " jmp 2b\n"
30687 ".previous\n"
30688- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30689+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30690
30691 from += 64;
30692 to += 64;
30693@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30694 static void fast_copy_page(void *to, void *from)
30695 {
30696 int i;
30697+ unsigned long cr0;
30698
30699 kernel_fpu_begin();
30700
30701 __asm__ __volatile__ (
30702- "1: prefetch (%0)\n"
30703- " prefetch 64(%0)\n"
30704- " prefetch 128(%0)\n"
30705- " prefetch 192(%0)\n"
30706- " prefetch 256(%0)\n"
30707+ "1: prefetch (%1)\n"
30708+ " prefetch 64(%1)\n"
30709+ " prefetch 128(%1)\n"
30710+ " prefetch 192(%1)\n"
30711+ " prefetch 256(%1)\n"
30712 "2: \n"
30713 ".section .fixup, \"ax\"\n"
30714- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30715+ "3: \n"
30716+
30717+#ifdef CONFIG_PAX_KERNEXEC
30718+ " movl %%cr0, %0\n"
30719+ " movl %0, %%eax\n"
30720+ " andl $0xFFFEFFFF, %%eax\n"
30721+ " movl %%eax, %%cr0\n"
30722+#endif
30723+
30724+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30725+
30726+#ifdef CONFIG_PAX_KERNEXEC
30727+ " movl %0, %%cr0\n"
30728+#endif
30729+
30730 " jmp 2b\n"
30731 ".previous\n"
30732- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30733+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30734
30735 for (i = 0; i < 4096/64; i++) {
30736 __asm__ __volatile__ (
30737- "1: prefetch 320(%0)\n"
30738- "2: movq (%0), %%mm0\n"
30739- " movq 8(%0), %%mm1\n"
30740- " movq 16(%0), %%mm2\n"
30741- " movq 24(%0), %%mm3\n"
30742- " movq %%mm0, (%1)\n"
30743- " movq %%mm1, 8(%1)\n"
30744- " movq %%mm2, 16(%1)\n"
30745- " movq %%mm3, 24(%1)\n"
30746- " movq 32(%0), %%mm0\n"
30747- " movq 40(%0), %%mm1\n"
30748- " movq 48(%0), %%mm2\n"
30749- " movq 56(%0), %%mm3\n"
30750- " movq %%mm0, 32(%1)\n"
30751- " movq %%mm1, 40(%1)\n"
30752- " movq %%mm2, 48(%1)\n"
30753- " movq %%mm3, 56(%1)\n"
30754+ "1: prefetch 320(%1)\n"
30755+ "2: movq (%1), %%mm0\n"
30756+ " movq 8(%1), %%mm1\n"
30757+ " movq 16(%1), %%mm2\n"
30758+ " movq 24(%1), %%mm3\n"
30759+ " movq %%mm0, (%2)\n"
30760+ " movq %%mm1, 8(%2)\n"
30761+ " movq %%mm2, 16(%2)\n"
30762+ " movq %%mm3, 24(%2)\n"
30763+ " movq 32(%1), %%mm0\n"
30764+ " movq 40(%1), %%mm1\n"
30765+ " movq 48(%1), %%mm2\n"
30766+ " movq 56(%1), %%mm3\n"
30767+ " movq %%mm0, 32(%2)\n"
30768+ " movq %%mm1, 40(%2)\n"
30769+ " movq %%mm2, 48(%2)\n"
30770+ " movq %%mm3, 56(%2)\n"
30771 ".section .fixup, \"ax\"\n"
30772- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30773+ "3:\n"
30774+
30775+#ifdef CONFIG_PAX_KERNEXEC
30776+ " movl %%cr0, %0\n"
30777+ " movl %0, %%eax\n"
30778+ " andl $0xFFFEFFFF, %%eax\n"
30779+ " movl %%eax, %%cr0\n"
30780+#endif
30781+
30782+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30783+
30784+#ifdef CONFIG_PAX_KERNEXEC
30785+ " movl %0, %%cr0\n"
30786+#endif
30787+
30788 " jmp 2b\n"
30789 ".previous\n"
30790 _ASM_EXTABLE(1b, 3b)
30791- : : "r" (from), "r" (to) : "memory");
30792+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30793
30794 from += 64;
30795 to += 64;
30796diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30797index 3ca5218..c2ae6bc 100644
30798--- a/arch/x86/lib/msr-reg.S
30799+++ b/arch/x86/lib/msr-reg.S
30800@@ -3,6 +3,7 @@
30801 #include <asm/dwarf2.h>
30802 #include <asm/asm.h>
30803 #include <asm/msr.h>
30804+#include <asm/alternative-asm.h>
30805
30806 #ifdef CONFIG_X86_64
30807 /*
30808@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30809 movl %edi, 28(%r10)
30810 popq_cfi_reg rbp
30811 popq_cfi_reg rbx
30812+ pax_force_retaddr
30813 ret
30814 3:
30815 CFI_RESTORE_STATE
30816diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30817index fc6ba17..14ad9a5 100644
30818--- a/arch/x86/lib/putuser.S
30819+++ b/arch/x86/lib/putuser.S
30820@@ -16,7 +16,9 @@
30821 #include <asm/errno.h>
30822 #include <asm/asm.h>
30823 #include <asm/smap.h>
30824-
30825+#include <asm/segment.h>
30826+#include <asm/pgtable.h>
30827+#include <asm/alternative-asm.h>
30828
30829 /*
30830 * __put_user_X
30831@@ -30,57 +32,125 @@
30832 * as they get called from within inline assembly.
30833 */
30834
30835-#define ENTER CFI_STARTPROC ; \
30836- GET_THREAD_INFO(%_ASM_BX)
30837-#define EXIT ASM_CLAC ; \
30838- ret ; \
30839+#define ENTER CFI_STARTPROC
30840+#define EXIT ASM_CLAC ; \
30841+ pax_force_retaddr ; \
30842+ ret ; \
30843 CFI_ENDPROC
30844
30845+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30846+#define _DEST %_ASM_CX,%_ASM_BX
30847+#else
30848+#define _DEST %_ASM_CX
30849+#endif
30850+
30851+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30852+#define __copyuser_seg gs;
30853+#else
30854+#define __copyuser_seg
30855+#endif
30856+
30857 .text
30858 ENTRY(__put_user_1)
30859 ENTER
30860+
30861+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30862+ GET_THREAD_INFO(%_ASM_BX)
30863 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30864 jae bad_put_user
30865+
30866+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30867+ mov pax_user_shadow_base,%_ASM_BX
30868+ cmp %_ASM_BX,%_ASM_CX
30869+ jb 1234f
30870+ xor %ebx,%ebx
30871+1234:
30872+#endif
30873+
30874+#endif
30875+
30876 ASM_STAC
30877-1: movb %al,(%_ASM_CX)
30878+1: __copyuser_seg movb %al,(_DEST)
30879 xor %eax,%eax
30880 EXIT
30881 ENDPROC(__put_user_1)
30882
30883 ENTRY(__put_user_2)
30884 ENTER
30885+
30886+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30887+ GET_THREAD_INFO(%_ASM_BX)
30888 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30889 sub $1,%_ASM_BX
30890 cmp %_ASM_BX,%_ASM_CX
30891 jae bad_put_user
30892+
30893+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30894+ mov pax_user_shadow_base,%_ASM_BX
30895+ cmp %_ASM_BX,%_ASM_CX
30896+ jb 1234f
30897+ xor %ebx,%ebx
30898+1234:
30899+#endif
30900+
30901+#endif
30902+
30903 ASM_STAC
30904-2: movw %ax,(%_ASM_CX)
30905+2: __copyuser_seg movw %ax,(_DEST)
30906 xor %eax,%eax
30907 EXIT
30908 ENDPROC(__put_user_2)
30909
30910 ENTRY(__put_user_4)
30911 ENTER
30912+
30913+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30914+ GET_THREAD_INFO(%_ASM_BX)
30915 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30916 sub $3,%_ASM_BX
30917 cmp %_ASM_BX,%_ASM_CX
30918 jae bad_put_user
30919+
30920+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30921+ mov pax_user_shadow_base,%_ASM_BX
30922+ cmp %_ASM_BX,%_ASM_CX
30923+ jb 1234f
30924+ xor %ebx,%ebx
30925+1234:
30926+#endif
30927+
30928+#endif
30929+
30930 ASM_STAC
30931-3: movl %eax,(%_ASM_CX)
30932+3: __copyuser_seg movl %eax,(_DEST)
30933 xor %eax,%eax
30934 EXIT
30935 ENDPROC(__put_user_4)
30936
30937 ENTRY(__put_user_8)
30938 ENTER
30939+
30940+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30941+ GET_THREAD_INFO(%_ASM_BX)
30942 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30943 sub $7,%_ASM_BX
30944 cmp %_ASM_BX,%_ASM_CX
30945 jae bad_put_user
30946+
30947+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30948+ mov pax_user_shadow_base,%_ASM_BX
30949+ cmp %_ASM_BX,%_ASM_CX
30950+ jb 1234f
30951+ xor %ebx,%ebx
30952+1234:
30953+#endif
30954+
30955+#endif
30956+
30957 ASM_STAC
30958-4: mov %_ASM_AX,(%_ASM_CX)
30959+4: __copyuser_seg mov %_ASM_AX,(_DEST)
30960 #ifdef CONFIG_X86_32
30961-5: movl %edx,4(%_ASM_CX)
30962+5: __copyuser_seg movl %edx,4(_DEST)
30963 #endif
30964 xor %eax,%eax
30965 EXIT
30966diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30967index 2322abe..1e78a75 100644
30968--- a/arch/x86/lib/rwsem.S
30969+++ b/arch/x86/lib/rwsem.S
30970@@ -92,6 +92,7 @@ ENTRY(call_rwsem_down_read_failed)
30971 call rwsem_down_read_failed
30972 __ASM_SIZE(pop,_cfi_reg) __ASM_REG(dx)
30973 restore_common_regs
30974+ pax_force_retaddr
30975 ret
30976 CFI_ENDPROC
30977 ENDPROC(call_rwsem_down_read_failed)
30978@@ -102,6 +103,7 @@ ENTRY(call_rwsem_down_write_failed)
30979 movq %rax,%rdi
30980 call rwsem_down_write_failed
30981 restore_common_regs
30982+ pax_force_retaddr
30983 ret
30984 CFI_ENDPROC
30985 ENDPROC(call_rwsem_down_write_failed)
30986@@ -115,7 +117,8 @@ ENTRY(call_rwsem_wake)
30987 movq %rax,%rdi
30988 call rwsem_wake
30989 restore_common_regs
30990-1: ret
30991+1: pax_force_retaddr
30992+ ret
30993 CFI_ENDPROC
30994 ENDPROC(call_rwsem_wake)
30995
30996@@ -127,6 +130,7 @@ ENTRY(call_rwsem_downgrade_wake)
30997 call rwsem_downgrade_wake
30998 __ASM_SIZE(pop,_cfi_reg) __ASM_REG(dx)
30999 restore_common_regs
31000+ pax_force_retaddr
31001 ret
31002 CFI_ENDPROC
31003 ENDPROC(call_rwsem_downgrade_wake)
31004diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31005index f89ba4e9..512b2de 100644
31006--- a/arch/x86/lib/thunk_64.S
31007+++ b/arch/x86/lib/thunk_64.S
31008@@ -9,6 +9,7 @@
31009 #include <asm/dwarf2.h>
31010 #include <asm/calling.h>
31011 #include <asm/asm.h>
31012+#include <asm/alternative-asm.h>
31013
31014 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31015 .macro THUNK name, func, put_ret_addr_in_rdi=0
31016@@ -69,6 +70,7 @@ restore:
31017 popq_cfi_reg rdx
31018 popq_cfi_reg rsi
31019 popq_cfi_reg rdi
31020+ pax_force_retaddr
31021 ret
31022 CFI_ENDPROC
31023 _ASM_NOKPROBE(restore)
31024diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c
31025index ddf9ecb..e342586 100644
31026--- a/arch/x86/lib/usercopy.c
31027+++ b/arch/x86/lib/usercopy.c
31028@@ -20,7 +20,7 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
31029 unsigned long ret;
31030
31031 if (__range_not_ok(from, n, TASK_SIZE))
31032- return 0;
31033+ return n;
31034
31035 /*
31036 * Even though this function is typically called from NMI/IRQ context
31037diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31038index e2f5e21..4b22130 100644
31039--- a/arch/x86/lib/usercopy_32.c
31040+++ b/arch/x86/lib/usercopy_32.c
31041@@ -42,11 +42,13 @@ do { \
31042 int __d0; \
31043 might_fault(); \
31044 __asm__ __volatile__( \
31045+ __COPYUSER_SET_ES \
31046 ASM_STAC "\n" \
31047 "0: rep; stosl\n" \
31048 " movl %2,%0\n" \
31049 "1: rep; stosb\n" \
31050 "2: " ASM_CLAC "\n" \
31051+ __COPYUSER_RESTORE_ES \
31052 ".section .fixup,\"ax\"\n" \
31053 "3: lea 0(%2,%0,4),%0\n" \
31054 " jmp 2b\n" \
31055@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31056
31057 #ifdef CONFIG_X86_INTEL_USERCOPY
31058 static unsigned long
31059-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31060+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31061 {
31062 int d0, d1;
31063 __asm__ __volatile__(
31064@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31065 " .align 2,0x90\n"
31066 "3: movl 0(%4), %%eax\n"
31067 "4: movl 4(%4), %%edx\n"
31068- "5: movl %%eax, 0(%3)\n"
31069- "6: movl %%edx, 4(%3)\n"
31070+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31071+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31072 "7: movl 8(%4), %%eax\n"
31073 "8: movl 12(%4),%%edx\n"
31074- "9: movl %%eax, 8(%3)\n"
31075- "10: movl %%edx, 12(%3)\n"
31076+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31077+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31078 "11: movl 16(%4), %%eax\n"
31079 "12: movl 20(%4), %%edx\n"
31080- "13: movl %%eax, 16(%3)\n"
31081- "14: movl %%edx, 20(%3)\n"
31082+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31083+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31084 "15: movl 24(%4), %%eax\n"
31085 "16: movl 28(%4), %%edx\n"
31086- "17: movl %%eax, 24(%3)\n"
31087- "18: movl %%edx, 28(%3)\n"
31088+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31089+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31090 "19: movl 32(%4), %%eax\n"
31091 "20: movl 36(%4), %%edx\n"
31092- "21: movl %%eax, 32(%3)\n"
31093- "22: movl %%edx, 36(%3)\n"
31094+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31095+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31096 "23: movl 40(%4), %%eax\n"
31097 "24: movl 44(%4), %%edx\n"
31098- "25: movl %%eax, 40(%3)\n"
31099- "26: movl %%edx, 44(%3)\n"
31100+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31101+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31102 "27: movl 48(%4), %%eax\n"
31103 "28: movl 52(%4), %%edx\n"
31104- "29: movl %%eax, 48(%3)\n"
31105- "30: movl %%edx, 52(%3)\n"
31106+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31107+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31108 "31: movl 56(%4), %%eax\n"
31109 "32: movl 60(%4), %%edx\n"
31110- "33: movl %%eax, 56(%3)\n"
31111- "34: movl %%edx, 60(%3)\n"
31112+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31113+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31114 " addl $-64, %0\n"
31115 " addl $64, %4\n"
31116 " addl $64, %3\n"
31117@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31118 " shrl $2, %0\n"
31119 " andl $3, %%eax\n"
31120 " cld\n"
31121+ __COPYUSER_SET_ES
31122 "99: rep; movsl\n"
31123 "36: movl %%eax, %0\n"
31124 "37: rep; movsb\n"
31125 "100:\n"
31126+ __COPYUSER_RESTORE_ES
31127+ ".section .fixup,\"ax\"\n"
31128+ "101: lea 0(%%eax,%0,4),%0\n"
31129+ " jmp 100b\n"
31130+ ".previous\n"
31131+ _ASM_EXTABLE(1b,100b)
31132+ _ASM_EXTABLE(2b,100b)
31133+ _ASM_EXTABLE(3b,100b)
31134+ _ASM_EXTABLE(4b,100b)
31135+ _ASM_EXTABLE(5b,100b)
31136+ _ASM_EXTABLE(6b,100b)
31137+ _ASM_EXTABLE(7b,100b)
31138+ _ASM_EXTABLE(8b,100b)
31139+ _ASM_EXTABLE(9b,100b)
31140+ _ASM_EXTABLE(10b,100b)
31141+ _ASM_EXTABLE(11b,100b)
31142+ _ASM_EXTABLE(12b,100b)
31143+ _ASM_EXTABLE(13b,100b)
31144+ _ASM_EXTABLE(14b,100b)
31145+ _ASM_EXTABLE(15b,100b)
31146+ _ASM_EXTABLE(16b,100b)
31147+ _ASM_EXTABLE(17b,100b)
31148+ _ASM_EXTABLE(18b,100b)
31149+ _ASM_EXTABLE(19b,100b)
31150+ _ASM_EXTABLE(20b,100b)
31151+ _ASM_EXTABLE(21b,100b)
31152+ _ASM_EXTABLE(22b,100b)
31153+ _ASM_EXTABLE(23b,100b)
31154+ _ASM_EXTABLE(24b,100b)
31155+ _ASM_EXTABLE(25b,100b)
31156+ _ASM_EXTABLE(26b,100b)
31157+ _ASM_EXTABLE(27b,100b)
31158+ _ASM_EXTABLE(28b,100b)
31159+ _ASM_EXTABLE(29b,100b)
31160+ _ASM_EXTABLE(30b,100b)
31161+ _ASM_EXTABLE(31b,100b)
31162+ _ASM_EXTABLE(32b,100b)
31163+ _ASM_EXTABLE(33b,100b)
31164+ _ASM_EXTABLE(34b,100b)
31165+ _ASM_EXTABLE(35b,100b)
31166+ _ASM_EXTABLE(36b,100b)
31167+ _ASM_EXTABLE(37b,100b)
31168+ _ASM_EXTABLE(99b,101b)
31169+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31170+ : "1"(to), "2"(from), "0"(size)
31171+ : "eax", "edx", "memory");
31172+ return size;
31173+}
31174+
31175+static unsigned long
31176+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31177+{
31178+ int d0, d1;
31179+ __asm__ __volatile__(
31180+ " .align 2,0x90\n"
31181+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31182+ " cmpl $67, %0\n"
31183+ " jbe 3f\n"
31184+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31185+ " .align 2,0x90\n"
31186+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31187+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31188+ "5: movl %%eax, 0(%3)\n"
31189+ "6: movl %%edx, 4(%3)\n"
31190+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31191+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31192+ "9: movl %%eax, 8(%3)\n"
31193+ "10: movl %%edx, 12(%3)\n"
31194+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31195+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31196+ "13: movl %%eax, 16(%3)\n"
31197+ "14: movl %%edx, 20(%3)\n"
31198+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31199+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31200+ "17: movl %%eax, 24(%3)\n"
31201+ "18: movl %%edx, 28(%3)\n"
31202+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31203+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31204+ "21: movl %%eax, 32(%3)\n"
31205+ "22: movl %%edx, 36(%3)\n"
31206+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31207+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31208+ "25: movl %%eax, 40(%3)\n"
31209+ "26: movl %%edx, 44(%3)\n"
31210+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31211+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31212+ "29: movl %%eax, 48(%3)\n"
31213+ "30: movl %%edx, 52(%3)\n"
31214+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31215+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31216+ "33: movl %%eax, 56(%3)\n"
31217+ "34: movl %%edx, 60(%3)\n"
31218+ " addl $-64, %0\n"
31219+ " addl $64, %4\n"
31220+ " addl $64, %3\n"
31221+ " cmpl $63, %0\n"
31222+ " ja 1b\n"
31223+ "35: movl %0, %%eax\n"
31224+ " shrl $2, %0\n"
31225+ " andl $3, %%eax\n"
31226+ " cld\n"
31227+ "99: rep; "__copyuser_seg" movsl\n"
31228+ "36: movl %%eax, %0\n"
31229+ "37: rep; "__copyuser_seg" movsb\n"
31230+ "100:\n"
31231 ".section .fixup,\"ax\"\n"
31232 "101: lea 0(%%eax,%0,4),%0\n"
31233 " jmp 100b\n"
31234@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31235 int d0, d1;
31236 __asm__ __volatile__(
31237 " .align 2,0x90\n"
31238- "0: movl 32(%4), %%eax\n"
31239+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31240 " cmpl $67, %0\n"
31241 " jbe 2f\n"
31242- "1: movl 64(%4), %%eax\n"
31243+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31244 " .align 2,0x90\n"
31245- "2: movl 0(%4), %%eax\n"
31246- "21: movl 4(%4), %%edx\n"
31247+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31248+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31249 " movl %%eax, 0(%3)\n"
31250 " movl %%edx, 4(%3)\n"
31251- "3: movl 8(%4), %%eax\n"
31252- "31: movl 12(%4),%%edx\n"
31253+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31254+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31255 " movl %%eax, 8(%3)\n"
31256 " movl %%edx, 12(%3)\n"
31257- "4: movl 16(%4), %%eax\n"
31258- "41: movl 20(%4), %%edx\n"
31259+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31260+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31261 " movl %%eax, 16(%3)\n"
31262 " movl %%edx, 20(%3)\n"
31263- "10: movl 24(%4), %%eax\n"
31264- "51: movl 28(%4), %%edx\n"
31265+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31266+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31267 " movl %%eax, 24(%3)\n"
31268 " movl %%edx, 28(%3)\n"
31269- "11: movl 32(%4), %%eax\n"
31270- "61: movl 36(%4), %%edx\n"
31271+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31272+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31273 " movl %%eax, 32(%3)\n"
31274 " movl %%edx, 36(%3)\n"
31275- "12: movl 40(%4), %%eax\n"
31276- "71: movl 44(%4), %%edx\n"
31277+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31278+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31279 " movl %%eax, 40(%3)\n"
31280 " movl %%edx, 44(%3)\n"
31281- "13: movl 48(%4), %%eax\n"
31282- "81: movl 52(%4), %%edx\n"
31283+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31284+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31285 " movl %%eax, 48(%3)\n"
31286 " movl %%edx, 52(%3)\n"
31287- "14: movl 56(%4), %%eax\n"
31288- "91: movl 60(%4), %%edx\n"
31289+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31290+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31291 " movl %%eax, 56(%3)\n"
31292 " movl %%edx, 60(%3)\n"
31293 " addl $-64, %0\n"
31294@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31295 " shrl $2, %0\n"
31296 " andl $3, %%eax\n"
31297 " cld\n"
31298- "6: rep; movsl\n"
31299+ "6: rep; "__copyuser_seg" movsl\n"
31300 " movl %%eax,%0\n"
31301- "7: rep; movsb\n"
31302+ "7: rep; "__copyuser_seg" movsb\n"
31303 "8:\n"
31304 ".section .fixup,\"ax\"\n"
31305 "9: lea 0(%%eax,%0,4),%0\n"
31306@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31307
31308 __asm__ __volatile__(
31309 " .align 2,0x90\n"
31310- "0: movl 32(%4), %%eax\n"
31311+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31312 " cmpl $67, %0\n"
31313 " jbe 2f\n"
31314- "1: movl 64(%4), %%eax\n"
31315+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31316 " .align 2,0x90\n"
31317- "2: movl 0(%4), %%eax\n"
31318- "21: movl 4(%4), %%edx\n"
31319+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31320+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31321 " movnti %%eax, 0(%3)\n"
31322 " movnti %%edx, 4(%3)\n"
31323- "3: movl 8(%4), %%eax\n"
31324- "31: movl 12(%4),%%edx\n"
31325+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31326+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31327 " movnti %%eax, 8(%3)\n"
31328 " movnti %%edx, 12(%3)\n"
31329- "4: movl 16(%4), %%eax\n"
31330- "41: movl 20(%4), %%edx\n"
31331+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31332+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31333 " movnti %%eax, 16(%3)\n"
31334 " movnti %%edx, 20(%3)\n"
31335- "10: movl 24(%4), %%eax\n"
31336- "51: movl 28(%4), %%edx\n"
31337+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31338+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31339 " movnti %%eax, 24(%3)\n"
31340 " movnti %%edx, 28(%3)\n"
31341- "11: movl 32(%4), %%eax\n"
31342- "61: movl 36(%4), %%edx\n"
31343+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31344+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31345 " movnti %%eax, 32(%3)\n"
31346 " movnti %%edx, 36(%3)\n"
31347- "12: movl 40(%4), %%eax\n"
31348- "71: movl 44(%4), %%edx\n"
31349+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31350+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31351 " movnti %%eax, 40(%3)\n"
31352 " movnti %%edx, 44(%3)\n"
31353- "13: movl 48(%4), %%eax\n"
31354- "81: movl 52(%4), %%edx\n"
31355+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31356+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31357 " movnti %%eax, 48(%3)\n"
31358 " movnti %%edx, 52(%3)\n"
31359- "14: movl 56(%4), %%eax\n"
31360- "91: movl 60(%4), %%edx\n"
31361+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31362+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31363 " movnti %%eax, 56(%3)\n"
31364 " movnti %%edx, 60(%3)\n"
31365 " addl $-64, %0\n"
31366@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31367 " shrl $2, %0\n"
31368 " andl $3, %%eax\n"
31369 " cld\n"
31370- "6: rep; movsl\n"
31371+ "6: rep; "__copyuser_seg" movsl\n"
31372 " movl %%eax,%0\n"
31373- "7: rep; movsb\n"
31374+ "7: rep; "__copyuser_seg" movsb\n"
31375 "8:\n"
31376 ".section .fixup,\"ax\"\n"
31377 "9: lea 0(%%eax,%0,4),%0\n"
31378@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31379
31380 __asm__ __volatile__(
31381 " .align 2,0x90\n"
31382- "0: movl 32(%4), %%eax\n"
31383+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31384 " cmpl $67, %0\n"
31385 " jbe 2f\n"
31386- "1: movl 64(%4), %%eax\n"
31387+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31388 " .align 2,0x90\n"
31389- "2: movl 0(%4), %%eax\n"
31390- "21: movl 4(%4), %%edx\n"
31391+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31392+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31393 " movnti %%eax, 0(%3)\n"
31394 " movnti %%edx, 4(%3)\n"
31395- "3: movl 8(%4), %%eax\n"
31396- "31: movl 12(%4),%%edx\n"
31397+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31398+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31399 " movnti %%eax, 8(%3)\n"
31400 " movnti %%edx, 12(%3)\n"
31401- "4: movl 16(%4), %%eax\n"
31402- "41: movl 20(%4), %%edx\n"
31403+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31404+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31405 " movnti %%eax, 16(%3)\n"
31406 " movnti %%edx, 20(%3)\n"
31407- "10: movl 24(%4), %%eax\n"
31408- "51: movl 28(%4), %%edx\n"
31409+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31410+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31411 " movnti %%eax, 24(%3)\n"
31412 " movnti %%edx, 28(%3)\n"
31413- "11: movl 32(%4), %%eax\n"
31414- "61: movl 36(%4), %%edx\n"
31415+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31416+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31417 " movnti %%eax, 32(%3)\n"
31418 " movnti %%edx, 36(%3)\n"
31419- "12: movl 40(%4), %%eax\n"
31420- "71: movl 44(%4), %%edx\n"
31421+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31422+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31423 " movnti %%eax, 40(%3)\n"
31424 " movnti %%edx, 44(%3)\n"
31425- "13: movl 48(%4), %%eax\n"
31426- "81: movl 52(%4), %%edx\n"
31427+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31428+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31429 " movnti %%eax, 48(%3)\n"
31430 " movnti %%edx, 52(%3)\n"
31431- "14: movl 56(%4), %%eax\n"
31432- "91: movl 60(%4), %%edx\n"
31433+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31434+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31435 " movnti %%eax, 56(%3)\n"
31436 " movnti %%edx, 60(%3)\n"
31437 " addl $-64, %0\n"
31438@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31439 " shrl $2, %0\n"
31440 " andl $3, %%eax\n"
31441 " cld\n"
31442- "6: rep; movsl\n"
31443+ "6: rep; "__copyuser_seg" movsl\n"
31444 " movl %%eax,%0\n"
31445- "7: rep; movsb\n"
31446+ "7: rep; "__copyuser_seg" movsb\n"
31447 "8:\n"
31448 ".section .fixup,\"ax\"\n"
31449 "9: lea 0(%%eax,%0,4),%0\n"
31450@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31451 */
31452 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31453 unsigned long size);
31454-unsigned long __copy_user_intel(void __user *to, const void *from,
31455+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31456+ unsigned long size);
31457+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31458 unsigned long size);
31459 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31460 const void __user *from, unsigned long size);
31461 #endif /* CONFIG_X86_INTEL_USERCOPY */
31462
31463 /* Generic arbitrary sized copy. */
31464-#define __copy_user(to, from, size) \
31465+#define __copy_user(to, from, size, prefix, set, restore) \
31466 do { \
31467 int __d0, __d1, __d2; \
31468 __asm__ __volatile__( \
31469+ set \
31470 " cmp $7,%0\n" \
31471 " jbe 1f\n" \
31472 " movl %1,%0\n" \
31473 " negl %0\n" \
31474 " andl $7,%0\n" \
31475 " subl %0,%3\n" \
31476- "4: rep; movsb\n" \
31477+ "4: rep; "prefix"movsb\n" \
31478 " movl %3,%0\n" \
31479 " shrl $2,%0\n" \
31480 " andl $3,%3\n" \
31481 " .align 2,0x90\n" \
31482- "0: rep; movsl\n" \
31483+ "0: rep; "prefix"movsl\n" \
31484 " movl %3,%0\n" \
31485- "1: rep; movsb\n" \
31486+ "1: rep; "prefix"movsb\n" \
31487 "2:\n" \
31488+ restore \
31489 ".section .fixup,\"ax\"\n" \
31490 "5: addl %3,%0\n" \
31491 " jmp 2b\n" \
31492@@ -538,14 +650,14 @@ do { \
31493 " negl %0\n" \
31494 " andl $7,%0\n" \
31495 " subl %0,%3\n" \
31496- "4: rep; movsb\n" \
31497+ "4: rep; "__copyuser_seg"movsb\n" \
31498 " movl %3,%0\n" \
31499 " shrl $2,%0\n" \
31500 " andl $3,%3\n" \
31501 " .align 2,0x90\n" \
31502- "0: rep; movsl\n" \
31503+ "0: rep; "__copyuser_seg"movsl\n" \
31504 " movl %3,%0\n" \
31505- "1: rep; movsb\n" \
31506+ "1: rep; "__copyuser_seg"movsb\n" \
31507 "2:\n" \
31508 ".section .fixup,\"ax\"\n" \
31509 "5: addl %3,%0\n" \
31510@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31511 {
31512 stac();
31513 if (movsl_is_ok(to, from, n))
31514- __copy_user(to, from, n);
31515+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31516 else
31517- n = __copy_user_intel(to, from, n);
31518+ n = __generic_copy_to_user_intel(to, from, n);
31519 clac();
31520 return n;
31521 }
31522@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31523 {
31524 stac();
31525 if (movsl_is_ok(to, from, n))
31526- __copy_user(to, from, n);
31527+ __copy_user(to, from, n, __copyuser_seg, "", "");
31528 else
31529- n = __copy_user_intel((void __user *)to,
31530- (const void *)from, n);
31531+ n = __generic_copy_from_user_intel(to, from, n);
31532 clac();
31533 return n;
31534 }
31535@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31536 if (n > 64 && cpu_has_xmm2)
31537 n = __copy_user_intel_nocache(to, from, n);
31538 else
31539- __copy_user(to, from, n);
31540+ __copy_user(to, from, n, __copyuser_seg, "", "");
31541 #else
31542- __copy_user(to, from, n);
31543+ __copy_user(to, from, n, __copyuser_seg, "", "");
31544 #endif
31545 clac();
31546 return n;
31547 }
31548 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31549
31550-/**
31551- * copy_to_user: - Copy a block of data into user space.
31552- * @to: Destination address, in user space.
31553- * @from: Source address, in kernel space.
31554- * @n: Number of bytes to copy.
31555- *
31556- * Context: User context only. This function may sleep.
31557- *
31558- * Copy data from kernel space to user space.
31559- *
31560- * Returns number of bytes that could not be copied.
31561- * On success, this will be zero.
31562- */
31563-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31564+#ifdef CONFIG_PAX_MEMORY_UDEREF
31565+void __set_fs(mm_segment_t x)
31566 {
31567- if (access_ok(VERIFY_WRITE, to, n))
31568- n = __copy_to_user(to, from, n);
31569- return n;
31570+ switch (x.seg) {
31571+ case 0:
31572+ loadsegment(gs, 0);
31573+ break;
31574+ case TASK_SIZE_MAX:
31575+ loadsegment(gs, __USER_DS);
31576+ break;
31577+ case -1UL:
31578+ loadsegment(gs, __KERNEL_DS);
31579+ break;
31580+ default:
31581+ BUG();
31582+ }
31583 }
31584-EXPORT_SYMBOL(_copy_to_user);
31585+EXPORT_SYMBOL(__set_fs);
31586
31587-/**
31588- * copy_from_user: - Copy a block of data from user space.
31589- * @to: Destination address, in kernel space.
31590- * @from: Source address, in user space.
31591- * @n: Number of bytes to copy.
31592- *
31593- * Context: User context only. This function may sleep.
31594- *
31595- * Copy data from user space to kernel space.
31596- *
31597- * Returns number of bytes that could not be copied.
31598- * On success, this will be zero.
31599- *
31600- * If some data could not be copied, this function will pad the copied
31601- * data to the requested size using zero bytes.
31602- */
31603-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31604+void set_fs(mm_segment_t x)
31605 {
31606- if (access_ok(VERIFY_READ, from, n))
31607- n = __copy_from_user(to, from, n);
31608- else
31609- memset(to, 0, n);
31610- return n;
31611+ current_thread_info()->addr_limit = x;
31612+ __set_fs(x);
31613 }
31614-EXPORT_SYMBOL(_copy_from_user);
31615+EXPORT_SYMBOL(set_fs);
31616+#endif
31617diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31618index 0a42327..7a82465 100644
31619--- a/arch/x86/lib/usercopy_64.c
31620+++ b/arch/x86/lib/usercopy_64.c
31621@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31622 might_fault();
31623 /* no memory constraint because it doesn't change any memory gcc knows
31624 about */
31625+ pax_open_userland();
31626 stac();
31627 asm volatile(
31628 " testq %[size8],%[size8]\n"
31629@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31630 _ASM_EXTABLE(0b,3b)
31631 _ASM_EXTABLE(1b,2b)
31632 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31633- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31634+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31635 [zero] "r" (0UL), [eight] "r" (8UL));
31636 clac();
31637+ pax_close_userland();
31638 return size;
31639 }
31640 EXPORT_SYMBOL(__clear_user);
31641@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31642 }
31643 EXPORT_SYMBOL(clear_user);
31644
31645-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31646+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31647 {
31648- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31649- return copy_user_generic((__force void *)to, (__force void *)from, len);
31650- }
31651- return len;
31652+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31653+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31654+ return len;
31655 }
31656 EXPORT_SYMBOL(copy_in_user);
31657
31658@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31659 * it is not necessary to optimize tail handling.
31660 */
31661 __visible unsigned long
31662-copy_user_handle_tail(char *to, char *from, unsigned len)
31663+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31664 {
31665+ clac();
31666+ pax_close_userland();
31667 for (; len; --len, to++) {
31668 char c;
31669
31670@@ -79,10 +82,9 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
31671 if (__put_user_nocheck(c, to, sizeof(char)))
31672 break;
31673 }
31674- clac();
31675
31676 /* If the destination is a kernel buffer, we always clear the end */
31677- if (!__addr_ok(to))
31678+ if (!__addr_ok(to) && (unsigned long)to >= TASK_SIZE_MAX + pax_user_shadow_base)
31679 memset(to, 0, len);
31680 return len;
31681 }
31682diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31683index a482d10..1a6edb5 100644
31684--- a/arch/x86/mm/Makefile
31685+++ b/arch/x86/mm/Makefile
31686@@ -33,3 +33,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31687 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31688
31689 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31690+
31691+quote:="
31692+obj-$(CONFIG_X86_64) += uderef_64.o
31693+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS)) -fcall-saved-rax
31694diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31695index 903ec1e..c4166b2 100644
31696--- a/arch/x86/mm/extable.c
31697+++ b/arch/x86/mm/extable.c
31698@@ -6,12 +6,24 @@
31699 static inline unsigned long
31700 ex_insn_addr(const struct exception_table_entry *x)
31701 {
31702- return (unsigned long)&x->insn + x->insn;
31703+ unsigned long reloc = 0;
31704+
31705+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31706+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31707+#endif
31708+
31709+ return (unsigned long)&x->insn + x->insn + reloc;
31710 }
31711 static inline unsigned long
31712 ex_fixup_addr(const struct exception_table_entry *x)
31713 {
31714- return (unsigned long)&x->fixup + x->fixup;
31715+ unsigned long reloc = 0;
31716+
31717+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31718+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31719+#endif
31720+
31721+ return (unsigned long)&x->fixup + x->fixup + reloc;
31722 }
31723
31724 int fixup_exception(struct pt_regs *regs)
31725@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31726 unsigned long new_ip;
31727
31728 #ifdef CONFIG_PNPBIOS
31729- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31730+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31731 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31732 extern u32 pnp_bios_is_utter_crap;
31733 pnp_bios_is_utter_crap = 1;
31734@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31735 i += 4;
31736 p->fixup -= i;
31737 i += 4;
31738+
31739+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31740+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31741+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31742+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31743+#endif
31744+
31745 }
31746 }
31747
31748diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31749index 181c53b..d336596 100644
31750--- a/arch/x86/mm/fault.c
31751+++ b/arch/x86/mm/fault.c
31752@@ -13,12 +13,19 @@
31753 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31754 #include <linux/prefetch.h> /* prefetchw */
31755 #include <linux/context_tracking.h> /* exception_enter(), ... */
31756+#include <linux/unistd.h>
31757+#include <linux/compiler.h>
31758
31759 #include <asm/traps.h> /* dotraplinkage, ... */
31760 #include <asm/pgalloc.h> /* pgd_*(), ... */
31761 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31762 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31763 #include <asm/vsyscall.h> /* emulate_vsyscall */
31764+#include <asm/tlbflush.h>
31765+
31766+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31767+#include <asm/stacktrace.h>
31768+#endif
31769
31770 #define CREATE_TRACE_POINTS
31771 #include <asm/trace/exceptions.h>
31772@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31773 return !instr_lo || (instr_lo>>1) == 1;
31774 case 0x00:
31775 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31776- if (probe_kernel_address(instr, opcode))
31777+ if (user_mode(regs)) {
31778+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31779+ return 0;
31780+ } else if (probe_kernel_address(instr, opcode))
31781 return 0;
31782
31783 *prefetch = (instr_lo == 0xF) &&
31784@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31785 while (instr < max_instr) {
31786 unsigned char opcode;
31787
31788- if (probe_kernel_address(instr, opcode))
31789+ if (user_mode(regs)) {
31790+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31791+ break;
31792+ } else if (probe_kernel_address(instr, opcode))
31793 break;
31794
31795 instr++;
31796@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31797 force_sig_info(si_signo, &info, tsk);
31798 }
31799
31800+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31801+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31802+#endif
31803+
31804+#ifdef CONFIG_PAX_EMUTRAMP
31805+static int pax_handle_fetch_fault(struct pt_regs *regs);
31806+#endif
31807+
31808+#ifdef CONFIG_PAX_PAGEEXEC
31809+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31810+{
31811+ pgd_t *pgd;
31812+ pud_t *pud;
31813+ pmd_t *pmd;
31814+
31815+ pgd = pgd_offset(mm, address);
31816+ if (!pgd_present(*pgd))
31817+ return NULL;
31818+ pud = pud_offset(pgd, address);
31819+ if (!pud_present(*pud))
31820+ return NULL;
31821+ pmd = pmd_offset(pud, address);
31822+ if (!pmd_present(*pmd))
31823+ return NULL;
31824+ return pmd;
31825+}
31826+#endif
31827+
31828 DEFINE_SPINLOCK(pgd_lock);
31829 LIST_HEAD(pgd_list);
31830
31831@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31832 for (address = VMALLOC_START & PMD_MASK;
31833 address >= TASK_SIZE && address < FIXADDR_TOP;
31834 address += PMD_SIZE) {
31835+
31836+#ifdef CONFIG_PAX_PER_CPU_PGD
31837+ unsigned long cpu;
31838+#else
31839 struct page *page;
31840+#endif
31841
31842 spin_lock(&pgd_lock);
31843+
31844+#ifdef CONFIG_PAX_PER_CPU_PGD
31845+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31846+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31847+ pmd_t *ret;
31848+
31849+ ret = vmalloc_sync_one(pgd, address);
31850+ if (!ret)
31851+ break;
31852+ pgd = get_cpu_pgd(cpu, kernel);
31853+#else
31854 list_for_each_entry(page, &pgd_list, lru) {
31855+ pgd_t *pgd;
31856 spinlock_t *pgt_lock;
31857 pmd_t *ret;
31858
31859@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31860 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31861
31862 spin_lock(pgt_lock);
31863- ret = vmalloc_sync_one(page_address(page), address);
31864+ pgd = page_address(page);
31865+#endif
31866+
31867+ ret = vmalloc_sync_one(pgd, address);
31868+
31869+#ifndef CONFIG_PAX_PER_CPU_PGD
31870 spin_unlock(pgt_lock);
31871+#endif
31872
31873 if (!ret)
31874 break;
31875@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31876 * an interrupt in the middle of a task switch..
31877 */
31878 pgd_paddr = read_cr3();
31879+
31880+#ifdef CONFIG_PAX_PER_CPU_PGD
31881+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31882+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31883+#endif
31884+
31885 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31886 if (!pmd_k)
31887 return -1;
31888@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31889 * happen within a race in page table update. In the later
31890 * case just flush:
31891 */
31892- pgd = pgd_offset(current->active_mm, address);
31893+
31894 pgd_ref = pgd_offset_k(address);
31895 if (pgd_none(*pgd_ref))
31896 return -1;
31897
31898+#ifdef CONFIG_PAX_PER_CPU_PGD
31899+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31900+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31901+ if (pgd_none(*pgd)) {
31902+ set_pgd(pgd, *pgd_ref);
31903+ arch_flush_lazy_mmu_mode();
31904+ } else {
31905+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31906+ }
31907+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31908+#else
31909+ pgd = pgd_offset(current->active_mm, address);
31910+#endif
31911+
31912 if (pgd_none(*pgd)) {
31913 set_pgd(pgd, *pgd_ref);
31914 arch_flush_lazy_mmu_mode();
31915@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31916 static int is_errata100(struct pt_regs *regs, unsigned long address)
31917 {
31918 #ifdef CONFIG_X86_64
31919- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31920+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31921 return 1;
31922 #endif
31923 return 0;
31924@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31925 }
31926
31927 static const char nx_warning[] = KERN_CRIT
31928-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31929+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31930 static const char smep_warning[] = KERN_CRIT
31931-"unable to execute userspace code (SMEP?) (uid: %d)\n";
31932+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31933
31934 static void
31935 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31936@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31937 if (!oops_may_print())
31938 return;
31939
31940- if (error_code & PF_INSTR) {
31941+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31942 unsigned int level;
31943 pgd_t *pgd;
31944 pte_t *pte;
31945@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31946 pte = lookup_address_in_pgd(pgd, address, &level);
31947
31948 if (pte && pte_present(*pte) && !pte_exec(*pte))
31949- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31950+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31951 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31952 (pgd_flags(*pgd) & _PAGE_USER) &&
31953 (__read_cr4() & X86_CR4_SMEP))
31954- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
31955+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31956 }
31957
31958+#ifdef CONFIG_PAX_KERNEXEC
31959+ if (init_mm.start_code <= address && address < init_mm.end_code) {
31960+ if (current->signal->curr_ip)
31961+ printk(KERN_EMERG "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31962+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
31963+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31964+ else
31965+ printk(KERN_EMERG "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31966+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31967+ }
31968+#endif
31969+
31970 printk(KERN_ALERT "BUG: unable to handle kernel ");
31971 if (address < PAGE_SIZE)
31972 printk(KERN_CONT "NULL pointer dereference");
31973@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31974 return;
31975 }
31976 #endif
31977+
31978+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31979+ if (pax_is_fetch_fault(regs, error_code, address)) {
31980+
31981+#ifdef CONFIG_PAX_EMUTRAMP
31982+ switch (pax_handle_fetch_fault(regs)) {
31983+ case 2:
31984+ return;
31985+ }
31986+#endif
31987+
31988+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31989+ do_group_exit(SIGKILL);
31990+ }
31991+#endif
31992+
31993 /* Kernel addresses are always protection faults: */
31994 if (address >= TASK_SIZE)
31995 error_code |= PF_PROT;
31996@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31997 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31998 printk(KERN_ERR
31999 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32000- tsk->comm, tsk->pid, address);
32001+ tsk->comm, task_pid_nr(tsk), address);
32002 code = BUS_MCEERR_AR;
32003 }
32004 #endif
32005@@ -916,6 +1028,107 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32006 return 1;
32007 }
32008
32009+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32010+static inline unsigned long get_limit(unsigned long segment)
32011+{
32012+ unsigned long __limit;
32013+
32014+ asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
32015+ return __limit + 1;
32016+}
32017+
32018+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32019+{
32020+ pte_t *pte;
32021+ pmd_t *pmd;
32022+ spinlock_t *ptl;
32023+ unsigned char pte_mask;
32024+
32025+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32026+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32027+ return 0;
32028+
32029+ /* PaX: it's our fault, let's handle it if we can */
32030+
32031+ /* PaX: take a look at read faults before acquiring any locks */
32032+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32033+ /* instruction fetch attempt from a protected page in user mode */
32034+ up_read(&mm->mmap_sem);
32035+
32036+#ifdef CONFIG_PAX_EMUTRAMP
32037+ switch (pax_handle_fetch_fault(regs)) {
32038+ case 2:
32039+ return 1;
32040+ }
32041+#endif
32042+
32043+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32044+ do_group_exit(SIGKILL);
32045+ }
32046+
32047+ pmd = pax_get_pmd(mm, address);
32048+ if (unlikely(!pmd))
32049+ return 0;
32050+
32051+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32052+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32053+ pte_unmap_unlock(pte, ptl);
32054+ return 0;
32055+ }
32056+
32057+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32058+ /* write attempt to a protected page in user mode */
32059+ pte_unmap_unlock(pte, ptl);
32060+ return 0;
32061+ }
32062+
32063+#ifdef CONFIG_SMP
32064+ if (likely(address > get_limit(regs->cs) && cpumask_test_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask)))
32065+#else
32066+ if (likely(address > get_limit(regs->cs)))
32067+#endif
32068+ {
32069+ set_pte(pte, pte_mkread(*pte));
32070+ __flush_tlb_one(address);
32071+ pte_unmap_unlock(pte, ptl);
32072+ up_read(&mm->mmap_sem);
32073+ return 1;
32074+ }
32075+
32076+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32077+
32078+ /*
32079+ * PaX: fill DTLB with user rights and retry
32080+ */
32081+ __asm__ __volatile__ (
32082+ "orb %2,(%1)\n"
32083+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32084+/*
32085+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32086+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32087+ * page fault when examined during a TLB load attempt. this is true not only
32088+ * for PTEs holding a non-present entry but also present entries that will
32089+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32090+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32091+ * for our target pages since their PTEs are simply not in the TLBs at all.
32092+
32093+ * the best thing in omitting it is that we gain around 15-20% speed in the
32094+ * fast path of the page fault handler and can get rid of tracing since we
32095+ * can no longer flush unintended entries.
32096+ */
32097+ "invlpg (%0)\n"
32098+#endif
32099+ __copyuser_seg"testb $0,(%0)\n"
32100+ "xorb %3,(%1)\n"
32101+ :
32102+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32103+ : "memory", "cc");
32104+ pte_unmap_unlock(pte, ptl);
32105+ up_read(&mm->mmap_sem);
32106+ return 1;
32107+}
32108+#endif
32109+
32110 /*
32111 * Handle a spurious fault caused by a stale TLB entry.
32112 *
32113@@ -1001,6 +1214,9 @@ int show_unhandled_signals = 1;
32114 static inline int
32115 access_error(unsigned long error_code, struct vm_area_struct *vma)
32116 {
32117+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32118+ return 1;
32119+
32120 if (error_code & PF_WRITE) {
32121 /* write, present and write, not present: */
32122 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32123@@ -1063,6 +1279,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32124 tsk = current;
32125 mm = tsk->mm;
32126
32127+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32128+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32129+ if (!search_exception_tables(regs->ip)) {
32130+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32131+ bad_area_nosemaphore(regs, error_code, address);
32132+ return;
32133+ }
32134+ if (address < pax_user_shadow_base) {
32135+ printk(KERN_EMERG "PAX: please report this to pageexec@freemail.hu\n");
32136+ printk(KERN_EMERG "PAX: faulting IP: %pS\n", (void *)regs->ip);
32137+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_EMERG);
32138+ } else
32139+ address -= pax_user_shadow_base;
32140+ }
32141+#endif
32142+
32143 /*
32144 * Detect and handle instructions that would cause a page fault for
32145 * both a tracked kernel page and a userspace page.
32146@@ -1187,6 +1419,11 @@ retry:
32147 might_sleep();
32148 }
32149
32150+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32151+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32152+ return;
32153+#endif
32154+
32155 vma = find_vma(mm, address);
32156 if (unlikely(!vma)) {
32157 bad_area(regs, error_code, address);
32158@@ -1198,18 +1435,24 @@ retry:
32159 bad_area(regs, error_code, address);
32160 return;
32161 }
32162- if (error_code & PF_USER) {
32163- /*
32164- * Accessing the stack below %sp is always a bug.
32165- * The large cushion allows instructions like enter
32166- * and pusha to work. ("enter $65535, $31" pushes
32167- * 32 pointers and then decrements %sp by 65535.)
32168- */
32169- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32170- bad_area(regs, error_code, address);
32171- return;
32172- }
32173+ /*
32174+ * Accessing the stack below %sp is always a bug.
32175+ * The large cushion allows instructions like enter
32176+ * and pusha to work. ("enter $65535, $31" pushes
32177+ * 32 pointers and then decrements %sp by 65535.)
32178+ */
32179+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32180+ bad_area(regs, error_code, address);
32181+ return;
32182 }
32183+
32184+#ifdef CONFIG_PAX_SEGMEXEC
32185+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32186+ bad_area(regs, error_code, address);
32187+ return;
32188+ }
32189+#endif
32190+
32191 if (unlikely(expand_stack(vma, address))) {
32192 bad_area(regs, error_code, address);
32193 return;
32194@@ -1329,3 +1572,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32195 }
32196 NOKPROBE_SYMBOL(trace_do_page_fault);
32197 #endif /* CONFIG_TRACING */
32198+
32199+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32200+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32201+{
32202+ struct mm_struct *mm = current->mm;
32203+ unsigned long ip = regs->ip;
32204+
32205+ if (v8086_mode(regs))
32206+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32207+
32208+#ifdef CONFIG_PAX_PAGEEXEC
32209+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32210+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32211+ return true;
32212+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32213+ return true;
32214+ return false;
32215+ }
32216+#endif
32217+
32218+#ifdef CONFIG_PAX_SEGMEXEC
32219+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32220+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32221+ return true;
32222+ return false;
32223+ }
32224+#endif
32225+
32226+ return false;
32227+}
32228+#endif
32229+
32230+#ifdef CONFIG_PAX_EMUTRAMP
32231+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32232+{
32233+ int err;
32234+
32235+ do { /* PaX: libffi trampoline emulation */
32236+ unsigned char mov, jmp;
32237+ unsigned int addr1, addr2;
32238+
32239+#ifdef CONFIG_X86_64
32240+ if ((regs->ip + 9) >> 32)
32241+ break;
32242+#endif
32243+
32244+ err = get_user(mov, (unsigned char __user *)regs->ip);
32245+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32246+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32247+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32248+
32249+ if (err)
32250+ break;
32251+
32252+ if (mov == 0xB8 && jmp == 0xE9) {
32253+ regs->ax = addr1;
32254+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32255+ return 2;
32256+ }
32257+ } while (0);
32258+
32259+ do { /* PaX: gcc trampoline emulation #1 */
32260+ unsigned char mov1, mov2;
32261+ unsigned short jmp;
32262+ unsigned int addr1, addr2;
32263+
32264+#ifdef CONFIG_X86_64
32265+ if ((regs->ip + 11) >> 32)
32266+ break;
32267+#endif
32268+
32269+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32270+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32271+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32272+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32273+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32274+
32275+ if (err)
32276+ break;
32277+
32278+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32279+ regs->cx = addr1;
32280+ regs->ax = addr2;
32281+ regs->ip = addr2;
32282+ return 2;
32283+ }
32284+ } while (0);
32285+
32286+ do { /* PaX: gcc trampoline emulation #2 */
32287+ unsigned char mov, jmp;
32288+ unsigned int addr1, addr2;
32289+
32290+#ifdef CONFIG_X86_64
32291+ if ((regs->ip + 9) >> 32)
32292+ break;
32293+#endif
32294+
32295+ err = get_user(mov, (unsigned char __user *)regs->ip);
32296+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32297+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32298+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32299+
32300+ if (err)
32301+ break;
32302+
32303+ if (mov == 0xB9 && jmp == 0xE9) {
32304+ regs->cx = addr1;
32305+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32306+ return 2;
32307+ }
32308+ } while (0);
32309+
32310+ return 1; /* PaX in action */
32311+}
32312+
32313+#ifdef CONFIG_X86_64
32314+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32315+{
32316+ int err;
32317+
32318+ do { /* PaX: libffi trampoline emulation */
32319+ unsigned short mov1, mov2, jmp1;
32320+ unsigned char stcclc, jmp2;
32321+ unsigned long addr1, addr2;
32322+
32323+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32324+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32325+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32326+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32327+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32328+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32329+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32330+
32331+ if (err)
32332+ break;
32333+
32334+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32335+ regs->r11 = addr1;
32336+ regs->r10 = addr2;
32337+ if (stcclc == 0xF8)
32338+ regs->flags &= ~X86_EFLAGS_CF;
32339+ else
32340+ regs->flags |= X86_EFLAGS_CF;
32341+ regs->ip = addr1;
32342+ return 2;
32343+ }
32344+ } while (0);
32345+
32346+ do { /* PaX: gcc trampoline emulation #1 */
32347+ unsigned short mov1, mov2, jmp1;
32348+ unsigned char jmp2;
32349+ unsigned int addr1;
32350+ unsigned long addr2;
32351+
32352+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32353+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32354+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32355+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32356+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32357+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32358+
32359+ if (err)
32360+ break;
32361+
32362+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32363+ regs->r11 = addr1;
32364+ regs->r10 = addr2;
32365+ regs->ip = addr1;
32366+ return 2;
32367+ }
32368+ } while (0);
32369+
32370+ do { /* PaX: gcc trampoline emulation #2 */
32371+ unsigned short mov1, mov2, jmp1;
32372+ unsigned char jmp2;
32373+ unsigned long addr1, addr2;
32374+
32375+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32376+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32377+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32378+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32379+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32380+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32381+
32382+ if (err)
32383+ break;
32384+
32385+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32386+ regs->r11 = addr1;
32387+ regs->r10 = addr2;
32388+ regs->ip = addr1;
32389+ return 2;
32390+ }
32391+ } while (0);
32392+
32393+ return 1; /* PaX in action */
32394+}
32395+#endif
32396+
32397+/*
32398+ * PaX: decide what to do with offenders (regs->ip = fault address)
32399+ *
32400+ * returns 1 when task should be killed
32401+ * 2 when gcc trampoline was detected
32402+ */
32403+static int pax_handle_fetch_fault(struct pt_regs *regs)
32404+{
32405+ if (v8086_mode(regs))
32406+ return 1;
32407+
32408+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32409+ return 1;
32410+
32411+#ifdef CONFIG_X86_32
32412+ return pax_handle_fetch_fault_32(regs);
32413+#else
32414+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32415+ return pax_handle_fetch_fault_32(regs);
32416+ else
32417+ return pax_handle_fetch_fault_64(regs);
32418+#endif
32419+}
32420+#endif
32421+
32422+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32423+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32424+{
32425+ long i;
32426+
32427+ printk(KERN_ERR "PAX: bytes at PC: ");
32428+ for (i = 0; i < 20; i++) {
32429+ unsigned char c;
32430+ if (get_user(c, (unsigned char __force_user *)pc+i))
32431+ printk(KERN_CONT "?? ");
32432+ else
32433+ printk(KERN_CONT "%02x ", c);
32434+ }
32435+ printk("\n");
32436+
32437+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32438+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32439+ unsigned long c;
32440+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32441+#ifdef CONFIG_X86_32
32442+ printk(KERN_CONT "???????? ");
32443+#else
32444+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32445+ printk(KERN_CONT "???????? ???????? ");
32446+ else
32447+ printk(KERN_CONT "???????????????? ");
32448+#endif
32449+ } else {
32450+#ifdef CONFIG_X86_64
32451+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32452+ printk(KERN_CONT "%08x ", (unsigned int)c);
32453+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32454+ } else
32455+#endif
32456+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32457+ }
32458+ }
32459+ printk("\n");
32460+}
32461+#endif
32462+
32463+/**
32464+ * probe_kernel_write(): safely attempt to write to a location
32465+ * @dst: address to write to
32466+ * @src: pointer to the data that shall be written
32467+ * @size: size of the data chunk
32468+ *
32469+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32470+ * happens, handle that and return -EFAULT.
32471+ */
32472+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32473+{
32474+ long ret;
32475+ mm_segment_t old_fs = get_fs();
32476+
32477+ set_fs(KERNEL_DS);
32478+ pagefault_disable();
32479+ pax_open_kernel();
32480+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32481+ pax_close_kernel();
32482+ pagefault_enable();
32483+ set_fs(old_fs);
32484+
32485+ return ret ? -EFAULT : 0;
32486+}
32487diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32488index 81bf3d2..7ef25c2 100644
32489--- a/arch/x86/mm/gup.c
32490+++ b/arch/x86/mm/gup.c
32491@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32492 addr = start;
32493 len = (unsigned long) nr_pages << PAGE_SHIFT;
32494 end = start + len;
32495- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32496+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32497 (void __user *)start, len)))
32498 return 0;
32499
32500@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32501 goto slow_irqon;
32502 #endif
32503
32504+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32505+ (void __user *)start, len)))
32506+ return 0;
32507+
32508 /*
32509 * XXX: batch / limit 'nr', to avoid large irq off latency
32510 * needs some instrumenting to determine the common sizes used by
32511diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32512index 4500142..53a363c 100644
32513--- a/arch/x86/mm/highmem_32.c
32514+++ b/arch/x86/mm/highmem_32.c
32515@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32516 idx = type + KM_TYPE_NR*smp_processor_id();
32517 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32518 BUG_ON(!pte_none(*(kmap_pte-idx)));
32519+
32520+ pax_open_kernel();
32521 set_pte(kmap_pte-idx, mk_pte(page, prot));
32522+ pax_close_kernel();
32523+
32524 arch_flush_lazy_mmu_mode();
32525
32526 return (void *)vaddr;
32527diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32528index 42982b2..7168fc3 100644
32529--- a/arch/x86/mm/hugetlbpage.c
32530+++ b/arch/x86/mm/hugetlbpage.c
32531@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32532 #ifdef CONFIG_HUGETLB_PAGE
32533 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32534 unsigned long addr, unsigned long len,
32535- unsigned long pgoff, unsigned long flags)
32536+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32537 {
32538 struct hstate *h = hstate_file(file);
32539 struct vm_unmapped_area_info info;
32540-
32541+
32542 info.flags = 0;
32543 info.length = len;
32544 info.low_limit = current->mm->mmap_legacy_base;
32545 info.high_limit = TASK_SIZE;
32546 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32547 info.align_offset = 0;
32548+ info.threadstack_offset = offset;
32549 return vm_unmapped_area(&info);
32550 }
32551
32552 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32553 unsigned long addr0, unsigned long len,
32554- unsigned long pgoff, unsigned long flags)
32555+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32556 {
32557 struct hstate *h = hstate_file(file);
32558 struct vm_unmapped_area_info info;
32559@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32560 info.high_limit = current->mm->mmap_base;
32561 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32562 info.align_offset = 0;
32563+ info.threadstack_offset = offset;
32564 addr = vm_unmapped_area(&info);
32565
32566 /*
32567@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32568 VM_BUG_ON(addr != -ENOMEM);
32569 info.flags = 0;
32570 info.low_limit = TASK_UNMAPPED_BASE;
32571+
32572+#ifdef CONFIG_PAX_RANDMMAP
32573+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32574+ info.low_limit += current->mm->delta_mmap;
32575+#endif
32576+
32577 info.high_limit = TASK_SIZE;
32578 addr = vm_unmapped_area(&info);
32579 }
32580@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32581 struct hstate *h = hstate_file(file);
32582 struct mm_struct *mm = current->mm;
32583 struct vm_area_struct *vma;
32584+ unsigned long pax_task_size = TASK_SIZE;
32585+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32586
32587 if (len & ~huge_page_mask(h))
32588 return -EINVAL;
32589- if (len > TASK_SIZE)
32590+
32591+#ifdef CONFIG_PAX_SEGMEXEC
32592+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32593+ pax_task_size = SEGMEXEC_TASK_SIZE;
32594+#endif
32595+
32596+ pax_task_size -= PAGE_SIZE;
32597+
32598+ if (len > pax_task_size)
32599 return -ENOMEM;
32600
32601 if (flags & MAP_FIXED) {
32602@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32603 return addr;
32604 }
32605
32606+#ifdef CONFIG_PAX_RANDMMAP
32607+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32608+#endif
32609+
32610 if (addr) {
32611 addr = ALIGN(addr, huge_page_size(h));
32612 vma = find_vma(mm, addr);
32613- if (TASK_SIZE - len >= addr &&
32614- (!vma || addr + len <= vma->vm_start))
32615+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32616 return addr;
32617 }
32618 if (mm->get_unmapped_area == arch_get_unmapped_area)
32619 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32620- pgoff, flags);
32621+ pgoff, flags, offset);
32622 else
32623 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32624- pgoff, flags);
32625+ pgoff, flags, offset);
32626 }
32627 #endif /* CONFIG_HUGETLB_PAGE */
32628
32629diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32630index 1d55318..d58fd6a 100644
32631--- a/arch/x86/mm/init.c
32632+++ b/arch/x86/mm/init.c
32633@@ -4,6 +4,7 @@
32634 #include <linux/swap.h>
32635 #include <linux/memblock.h>
32636 #include <linux/bootmem.h> /* for max_low_pfn */
32637+#include <linux/tboot.h>
32638
32639 #include <asm/cacheflush.h>
32640 #include <asm/e820.h>
32641@@ -17,6 +18,8 @@
32642 #include <asm/proto.h>
32643 #include <asm/dma.h> /* for MAX_DMA_PFN */
32644 #include <asm/microcode.h>
32645+#include <asm/desc.h>
32646+#include <asm/bios_ebda.h>
32647
32648 /*
32649 * We need to define the tracepoints somewhere, and tlb.c
32650@@ -615,7 +618,18 @@ void __init init_mem_mapping(void)
32651 early_ioremap_page_table_range_init();
32652 #endif
32653
32654+#ifdef CONFIG_PAX_PER_CPU_PGD
32655+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32656+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32657+ KERNEL_PGD_PTRS);
32658+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32659+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32660+ KERNEL_PGD_PTRS);
32661+ load_cr3(get_cpu_pgd(0, kernel));
32662+#else
32663 load_cr3(swapper_pg_dir);
32664+#endif
32665+
32666 __flush_tlb_all();
32667
32668 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32669@@ -631,10 +645,40 @@ void __init init_mem_mapping(void)
32670 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32671 * mmio resources as well as potential bios/acpi data regions.
32672 */
32673+
32674+#ifdef CONFIG_GRKERNSEC_KMEM
32675+static unsigned int ebda_start __read_only;
32676+static unsigned int ebda_end __read_only;
32677+#endif
32678+
32679 int devmem_is_allowed(unsigned long pagenr)
32680 {
32681- if (pagenr < 256)
32682+#ifdef CONFIG_GRKERNSEC_KMEM
32683+ /* allow BDA */
32684+ if (!pagenr)
32685 return 1;
32686+ /* allow EBDA */
32687+ if (pagenr >= ebda_start && pagenr < ebda_end)
32688+ return 1;
32689+ /* if tboot is in use, allow access to its hardcoded serial log range */
32690+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32691+ return 1;
32692+#else
32693+ if (!pagenr)
32694+ return 1;
32695+#ifdef CONFIG_VM86
32696+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32697+ return 1;
32698+#endif
32699+#endif
32700+
32701+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32702+ return 1;
32703+#ifdef CONFIG_GRKERNSEC_KMEM
32704+ /* throw out everything else below 1MB */
32705+ if (pagenr <= 256)
32706+ return 0;
32707+#endif
32708 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32709 return 0;
32710 if (!page_is_ram(pagenr))
32711@@ -680,8 +724,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32712 #endif
32713 }
32714
32715+#ifdef CONFIG_GRKERNSEC_KMEM
32716+static inline void gr_init_ebda(void)
32717+{
32718+ unsigned int ebda_addr;
32719+ unsigned int ebda_size = 0;
32720+
32721+ ebda_addr = get_bios_ebda();
32722+ if (ebda_addr) {
32723+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32724+ ebda_size <<= 10;
32725+ }
32726+ if (ebda_addr && ebda_size) {
32727+ ebda_start = ebda_addr >> PAGE_SHIFT;
32728+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32729+ } else {
32730+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32731+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32732+ }
32733+}
32734+#else
32735+static inline void gr_init_ebda(void) { }
32736+#endif
32737+
32738 void free_initmem(void)
32739 {
32740+#ifdef CONFIG_PAX_KERNEXEC
32741+#ifdef CONFIG_X86_32
32742+ /* PaX: limit KERNEL_CS to actual size */
32743+ unsigned long addr, limit;
32744+ struct desc_struct d;
32745+ int cpu;
32746+#else
32747+ pgd_t *pgd;
32748+ pud_t *pud;
32749+ pmd_t *pmd;
32750+ unsigned long addr, end;
32751+#endif
32752+#endif
32753+
32754+ gr_init_ebda();
32755+
32756+#ifdef CONFIG_PAX_KERNEXEC
32757+#ifdef CONFIG_X86_32
32758+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32759+ limit = (limit - 1UL) >> PAGE_SHIFT;
32760+
32761+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32762+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32763+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32764+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32765+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32766+ }
32767+
32768+ /* PaX: make KERNEL_CS read-only */
32769+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32770+ if (!paravirt_enabled())
32771+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32772+/*
32773+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32774+ pgd = pgd_offset_k(addr);
32775+ pud = pud_offset(pgd, addr);
32776+ pmd = pmd_offset(pud, addr);
32777+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32778+ }
32779+*/
32780+#ifdef CONFIG_X86_PAE
32781+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32782+/*
32783+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32784+ pgd = pgd_offset_k(addr);
32785+ pud = pud_offset(pgd, addr);
32786+ pmd = pmd_offset(pud, addr);
32787+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32788+ }
32789+*/
32790+#endif
32791+
32792+#ifdef CONFIG_MODULES
32793+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32794+#endif
32795+
32796+#else
32797+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32798+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32799+ pgd = pgd_offset_k(addr);
32800+ pud = pud_offset(pgd, addr);
32801+ pmd = pmd_offset(pud, addr);
32802+ if (!pmd_present(*pmd))
32803+ continue;
32804+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32805+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32806+ else
32807+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32808+ }
32809+
32810+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32811+ end = addr + KERNEL_IMAGE_SIZE;
32812+ for (; addr < end; addr += PMD_SIZE) {
32813+ pgd = pgd_offset_k(addr);
32814+ pud = pud_offset(pgd, addr);
32815+ pmd = pmd_offset(pud, addr);
32816+ if (!pmd_present(*pmd))
32817+ continue;
32818+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32819+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32820+ }
32821+#endif
32822+
32823+ flush_tlb_all();
32824+#endif
32825+
32826 free_init_pages("unused kernel",
32827 (unsigned long)(&__init_begin),
32828 (unsigned long)(&__init_end));
32829diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32830index c8140e1..59257fc 100644
32831--- a/arch/x86/mm/init_32.c
32832+++ b/arch/x86/mm/init_32.c
32833@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32834 bool __read_mostly __vmalloc_start_set = false;
32835
32836 /*
32837- * Creates a middle page table and puts a pointer to it in the
32838- * given global directory entry. This only returns the gd entry
32839- * in non-PAE compilation mode, since the middle layer is folded.
32840- */
32841-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32842-{
32843- pud_t *pud;
32844- pmd_t *pmd_table;
32845-
32846-#ifdef CONFIG_X86_PAE
32847- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32848- pmd_table = (pmd_t *)alloc_low_page();
32849- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32850- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32851- pud = pud_offset(pgd, 0);
32852- BUG_ON(pmd_table != pmd_offset(pud, 0));
32853-
32854- return pmd_table;
32855- }
32856-#endif
32857- pud = pud_offset(pgd, 0);
32858- pmd_table = pmd_offset(pud, 0);
32859-
32860- return pmd_table;
32861-}
32862-
32863-/*
32864 * Create a page table and place a pointer to it in a middle page
32865 * directory entry:
32866 */
32867@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32868 pte_t *page_table = (pte_t *)alloc_low_page();
32869
32870 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32871+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32872+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32873+#else
32874 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32875+#endif
32876 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32877 }
32878
32879 return pte_offset_kernel(pmd, 0);
32880 }
32881
32882+static pmd_t * __init one_md_table_init(pgd_t *pgd)
32883+{
32884+ pud_t *pud;
32885+ pmd_t *pmd_table;
32886+
32887+ pud = pud_offset(pgd, 0);
32888+ pmd_table = pmd_offset(pud, 0);
32889+
32890+ return pmd_table;
32891+}
32892+
32893 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32894 {
32895 int pgd_idx = pgd_index(vaddr);
32896@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32897 int pgd_idx, pmd_idx;
32898 unsigned long vaddr;
32899 pgd_t *pgd;
32900+ pud_t *pud;
32901 pmd_t *pmd;
32902 pte_t *pte = NULL;
32903 unsigned long count = page_table_range_init_count(start, end);
32904@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32905 pgd = pgd_base + pgd_idx;
32906
32907 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32908- pmd = one_md_table_init(pgd);
32909- pmd = pmd + pmd_index(vaddr);
32910+ pud = pud_offset(pgd, vaddr);
32911+ pmd = pmd_offset(pud, vaddr);
32912+
32913+#ifdef CONFIG_X86_PAE
32914+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32915+#endif
32916+
32917 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32918 pmd++, pmd_idx++) {
32919 pte = page_table_kmap_check(one_page_table_init(pmd),
32920@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32921 }
32922 }
32923
32924-static inline int is_kernel_text(unsigned long addr)
32925+static inline int is_kernel_text(unsigned long start, unsigned long end)
32926 {
32927- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32928- return 1;
32929- return 0;
32930+ if ((start >= ktla_ktva((unsigned long)_etext) ||
32931+ end <= ktla_ktva((unsigned long)_stext)) &&
32932+ (start >= ktla_ktva((unsigned long)_einittext) ||
32933+ end <= ktla_ktva((unsigned long)_sinittext)) &&
32934+
32935+#ifdef CONFIG_ACPI_SLEEP
32936+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32937+#endif
32938+
32939+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32940+ return 0;
32941+ return 1;
32942 }
32943
32944 /*
32945@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32946 unsigned long last_map_addr = end;
32947 unsigned long start_pfn, end_pfn;
32948 pgd_t *pgd_base = swapper_pg_dir;
32949- int pgd_idx, pmd_idx, pte_ofs;
32950+ unsigned int pgd_idx, pmd_idx, pte_ofs;
32951 unsigned long pfn;
32952 pgd_t *pgd;
32953+ pud_t *pud;
32954 pmd_t *pmd;
32955 pte_t *pte;
32956 unsigned pages_2m, pages_4k;
32957@@ -291,8 +295,13 @@ repeat:
32958 pfn = start_pfn;
32959 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32960 pgd = pgd_base + pgd_idx;
32961- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32962- pmd = one_md_table_init(pgd);
32963+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32964+ pud = pud_offset(pgd, 0);
32965+ pmd = pmd_offset(pud, 0);
32966+
32967+#ifdef CONFIG_X86_PAE
32968+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32969+#endif
32970
32971 if (pfn >= end_pfn)
32972 continue;
32973@@ -304,14 +313,13 @@ repeat:
32974 #endif
32975 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32976 pmd++, pmd_idx++) {
32977- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32978+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32979
32980 /*
32981 * Map with big pages if possible, otherwise
32982 * create normal page tables:
32983 */
32984 if (use_pse) {
32985- unsigned int addr2;
32986 pgprot_t prot = PAGE_KERNEL_LARGE;
32987 /*
32988 * first pass will use the same initial
32989@@ -322,11 +330,7 @@ repeat:
32990 _PAGE_PSE);
32991
32992 pfn &= PMD_MASK >> PAGE_SHIFT;
32993- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32994- PAGE_OFFSET + PAGE_SIZE-1;
32995-
32996- if (is_kernel_text(addr) ||
32997- is_kernel_text(addr2))
32998+ if (is_kernel_text(address, address + PMD_SIZE))
32999 prot = PAGE_KERNEL_LARGE_EXEC;
33000
33001 pages_2m++;
33002@@ -343,7 +347,7 @@ repeat:
33003 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33004 pte += pte_ofs;
33005 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33006- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33007+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33008 pgprot_t prot = PAGE_KERNEL;
33009 /*
33010 * first pass will use the same initial
33011@@ -351,7 +355,7 @@ repeat:
33012 */
33013 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33014
33015- if (is_kernel_text(addr))
33016+ if (is_kernel_text(address, address + PAGE_SIZE))
33017 prot = PAGE_KERNEL_EXEC;
33018
33019 pages_4k++;
33020@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33021
33022 pud = pud_offset(pgd, va);
33023 pmd = pmd_offset(pud, va);
33024- if (!pmd_present(*pmd))
33025+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33026 break;
33027
33028 /* should not be large page here */
33029@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33030
33031 static void __init pagetable_init(void)
33032 {
33033- pgd_t *pgd_base = swapper_pg_dir;
33034-
33035- permanent_kmaps_init(pgd_base);
33036+ permanent_kmaps_init(swapper_pg_dir);
33037 }
33038
33039-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33040+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33041 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33042
33043 /* user-defined highmem size */
33044@@ -787,10 +789,10 @@ void __init mem_init(void)
33045 ((unsigned long)&__init_end -
33046 (unsigned long)&__init_begin) >> 10,
33047
33048- (unsigned long)&_etext, (unsigned long)&_edata,
33049- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33050+ (unsigned long)&_sdata, (unsigned long)&_edata,
33051+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33052
33053- (unsigned long)&_text, (unsigned long)&_etext,
33054+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33055 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33056
33057 /*
33058@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33059 if (!kernel_set_to_readonly)
33060 return;
33061
33062+ start = ktla_ktva(start);
33063 pr_debug("Set kernel text: %lx - %lx for read write\n",
33064 start, start+size);
33065
33066@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33067 if (!kernel_set_to_readonly)
33068 return;
33069
33070+ start = ktla_ktva(start);
33071 pr_debug("Set kernel text: %lx - %lx for read only\n",
33072 start, start+size);
33073
33074@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33075 unsigned long start = PFN_ALIGN(_text);
33076 unsigned long size = PFN_ALIGN(_etext) - start;
33077
33078+ start = ktla_ktva(start);
33079 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33080 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33081 size >> 10);
33082diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33083index 3fba623..5ee9802 100644
33084--- a/arch/x86/mm/init_64.c
33085+++ b/arch/x86/mm/init_64.c
33086@@ -136,7 +136,7 @@ int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
33087 * around without checking the pgd every time.
33088 */
33089
33090-pteval_t __supported_pte_mask __read_mostly = ~0;
33091+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33092 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33093
33094 int force_personality32;
33095@@ -169,7 +169,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33096
33097 for (address = start; address <= end; address += PGDIR_SIZE) {
33098 const pgd_t *pgd_ref = pgd_offset_k(address);
33099+
33100+#ifdef CONFIG_PAX_PER_CPU_PGD
33101+ unsigned long cpu;
33102+#else
33103 struct page *page;
33104+#endif
33105
33106 /*
33107 * When it is called after memory hot remove, pgd_none()
33108@@ -180,6 +185,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33109 continue;
33110
33111 spin_lock(&pgd_lock);
33112+
33113+#ifdef CONFIG_PAX_PER_CPU_PGD
33114+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33115+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33116+
33117+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33118+ BUG_ON(pgd_page_vaddr(*pgd)
33119+ != pgd_page_vaddr(*pgd_ref));
33120+
33121+ if (removed) {
33122+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33123+ pgd_clear(pgd);
33124+ } else {
33125+ if (pgd_none(*pgd))
33126+ set_pgd(pgd, *pgd_ref);
33127+ }
33128+
33129+ pgd = pgd_offset_cpu(cpu, kernel, address);
33130+#else
33131 list_for_each_entry(page, &pgd_list, lru) {
33132 pgd_t *pgd;
33133 spinlock_t *pgt_lock;
33134@@ -188,6 +212,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33135 /* the pgt_lock only for Xen */
33136 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33137 spin_lock(pgt_lock);
33138+#endif
33139
33140 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33141 BUG_ON(pgd_page_vaddr(*pgd)
33142@@ -201,7 +226,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33143 set_pgd(pgd, *pgd_ref);
33144 }
33145
33146+#ifndef CONFIG_PAX_PER_CPU_PGD
33147 spin_unlock(pgt_lock);
33148+#endif
33149+
33150 }
33151 spin_unlock(&pgd_lock);
33152 }
33153@@ -234,7 +262,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33154 {
33155 if (pgd_none(*pgd)) {
33156 pud_t *pud = (pud_t *)spp_getpage();
33157- pgd_populate(&init_mm, pgd, pud);
33158+ pgd_populate_kernel(&init_mm, pgd, pud);
33159 if (pud != pud_offset(pgd, 0))
33160 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33161 pud, pud_offset(pgd, 0));
33162@@ -246,7 +274,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33163 {
33164 if (pud_none(*pud)) {
33165 pmd_t *pmd = (pmd_t *) spp_getpage();
33166- pud_populate(&init_mm, pud, pmd);
33167+ pud_populate_kernel(&init_mm, pud, pmd);
33168 if (pmd != pmd_offset(pud, 0))
33169 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33170 pmd, pmd_offset(pud, 0));
33171@@ -275,7 +303,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33172 pmd = fill_pmd(pud, vaddr);
33173 pte = fill_pte(pmd, vaddr);
33174
33175+ pax_open_kernel();
33176 set_pte(pte, new_pte);
33177+ pax_close_kernel();
33178
33179 /*
33180 * It's enough to flush this one mapping.
33181@@ -337,14 +367,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33182 pgd = pgd_offset_k((unsigned long)__va(phys));
33183 if (pgd_none(*pgd)) {
33184 pud = (pud_t *) spp_getpage();
33185- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33186- _PAGE_USER));
33187+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33188 }
33189 pud = pud_offset(pgd, (unsigned long)__va(phys));
33190 if (pud_none(*pud)) {
33191 pmd = (pmd_t *) spp_getpage();
33192- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33193- _PAGE_USER));
33194+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33195 }
33196 pmd = pmd_offset(pud, phys);
33197 BUG_ON(!pmd_none(*pmd));
33198@@ -585,7 +613,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33199 prot);
33200
33201 spin_lock(&init_mm.page_table_lock);
33202- pud_populate(&init_mm, pud, pmd);
33203+ pud_populate_kernel(&init_mm, pud, pmd);
33204 spin_unlock(&init_mm.page_table_lock);
33205 }
33206 __flush_tlb_all();
33207@@ -626,7 +654,7 @@ kernel_physical_mapping_init(unsigned long start,
33208 page_size_mask);
33209
33210 spin_lock(&init_mm.page_table_lock);
33211- pgd_populate(&init_mm, pgd, pud);
33212+ pgd_populate_kernel(&init_mm, pgd, pud);
33213 spin_unlock(&init_mm.page_table_lock);
33214 pgd_changed = true;
33215 }
33216diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33217index 9ca35fc..4b2b7b7 100644
33218--- a/arch/x86/mm/iomap_32.c
33219+++ b/arch/x86/mm/iomap_32.c
33220@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33221 type = kmap_atomic_idx_push();
33222 idx = type + KM_TYPE_NR * smp_processor_id();
33223 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33224+
33225+ pax_open_kernel();
33226 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33227+ pax_close_kernel();
33228+
33229 arch_flush_lazy_mmu_mode();
33230
33231 return (void *)vaddr;
33232diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33233index 70e7444..e9904fd 100644
33234--- a/arch/x86/mm/ioremap.c
33235+++ b/arch/x86/mm/ioremap.c
33236@@ -56,12 +56,10 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33237 unsigned long i;
33238
33239 for (i = 0; i < nr_pages; ++i)
33240- if (pfn_valid(start_pfn + i) &&
33241- !PageReserved(pfn_to_page(start_pfn + i)))
33242+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33243+ !PageReserved(pfn_to_page(start_pfn + i))))
33244 return 1;
33245
33246- WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33247-
33248 return 0;
33249 }
33250
33251@@ -91,7 +89,6 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
33252 pgprot_t prot;
33253 int retval;
33254 void __iomem *ret_addr;
33255- int ram_region;
33256
33257 /* Don't allow wraparound or zero size */
33258 last_addr = phys_addr + size - 1;
33259@@ -114,23 +111,15 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
33260 /*
33261 * Don't allow anybody to remap normal RAM that we're using..
33262 */
33263- /* First check if whole region can be identified as RAM or not */
33264- ram_region = region_is_ram(phys_addr, size);
33265- if (ram_region > 0) {
33266- WARN_ONCE(1, "ioremap on RAM at 0x%lx - 0x%lx\n",
33267- (unsigned long int)phys_addr,
33268- (unsigned long int)last_addr);
33269+ pfn = phys_addr >> PAGE_SHIFT;
33270+ last_pfn = last_addr >> PAGE_SHIFT;
33271+ if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
33272+ __ioremap_check_ram) == 1) {
33273+ WARN_ONCE(1, "ioremap on RAM at 0x%llx - 0x%llx\n",
33274+ phys_addr, last_addr);
33275 return NULL;
33276 }
33277
33278- /* If could not be identified(-1), check page by page */
33279- if (ram_region < 0) {
33280- pfn = phys_addr >> PAGE_SHIFT;
33281- last_pfn = last_addr >> PAGE_SHIFT;
33282- if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
33283- __ioremap_check_ram) == 1)
33284- return NULL;
33285- }
33286 /*
33287 * Mappings have to be page-aligned
33288 */
33289@@ -288,7 +277,7 @@ EXPORT_SYMBOL(ioremap_prot);
33290 *
33291 * Caller must ensure there is only one unmapping for the same pointer.
33292 */
33293-void iounmap(volatile void __iomem *addr)
33294+void iounmap(const volatile void __iomem *addr)
33295 {
33296 struct vm_struct *p, *o;
33297
33298@@ -351,32 +340,36 @@ int arch_ioremap_pmd_supported(void)
33299 */
33300 void *xlate_dev_mem_ptr(phys_addr_t phys)
33301 {
33302- unsigned long start = phys & PAGE_MASK;
33303- unsigned long offset = phys & ~PAGE_MASK;
33304- unsigned long vaddr;
33305+ phys_addr_t pfn = phys >> PAGE_SHIFT;
33306
33307- /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33308- if (page_is_ram(start >> PAGE_SHIFT))
33309- return __va(phys);
33310+ if (page_is_ram(pfn)) {
33311+#ifdef CONFIG_HIGHMEM
33312+ if (pfn >= max_low_pfn)
33313+ return kmap_high(pfn_to_page(pfn));
33314+ else
33315+#endif
33316+ return __va(phys);
33317+ }
33318
33319- vaddr = (unsigned long)ioremap_cache(start, PAGE_SIZE);
33320- /* Only add the offset on success and return NULL if the ioremap() failed: */
33321- if (vaddr)
33322- vaddr += offset;
33323-
33324- return (void *)vaddr;
33325+ return (void __force *)ioremap_cache(phys, 1);
33326 }
33327
33328 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33329 {
33330- if (page_is_ram(phys >> PAGE_SHIFT))
33331+ phys_addr_t pfn = phys >> PAGE_SHIFT;
33332+
33333+ if (page_is_ram(pfn)) {
33334+#ifdef CONFIG_HIGHMEM
33335+ if (pfn >= max_low_pfn)
33336+ kunmap_high(pfn_to_page(pfn));
33337+#endif
33338 return;
33339+ }
33340
33341- iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33342- return;
33343+ iounmap((void __iomem __force *)addr);
33344 }
33345
33346-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33347+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33348
33349 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33350 {
33351@@ -412,8 +405,7 @@ void __init early_ioremap_init(void)
33352 early_ioremap_setup();
33353
33354 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33355- memset(bm_pte, 0, sizeof(bm_pte));
33356- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33357+ pmd_populate_user(&init_mm, pmd, bm_pte);
33358
33359 /*
33360 * The boot-ioremap range spans multiple pmds, for which
33361diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33362index b4f2e7e..96c9c3e 100644
33363--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33364+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33365@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33366 * memory (e.g. tracked pages)? For now, we need this to avoid
33367 * invoking kmemcheck for PnP BIOS calls.
33368 */
33369- if (regs->flags & X86_VM_MASK)
33370+ if (v8086_mode(regs))
33371 return false;
33372- if (regs->cs != __KERNEL_CS)
33373+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33374 return false;
33375
33376 pte = kmemcheck_pte_lookup(address);
33377diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33378index 844b06d..f363c86 100644
33379--- a/arch/x86/mm/mmap.c
33380+++ b/arch/x86/mm/mmap.c
33381@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33382 * Leave an at least ~128 MB hole with possible stack randomization.
33383 */
33384 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33385-#define MAX_GAP (TASK_SIZE/6*5)
33386+#define MAX_GAP (pax_task_size/6*5)
33387
33388 static int mmap_is_legacy(void)
33389 {
33390@@ -81,27 +81,40 @@ unsigned long arch_mmap_rnd(void)
33391 return rnd << PAGE_SHIFT;
33392 }
33393
33394-static unsigned long mmap_base(unsigned long rnd)
33395+static unsigned long mmap_base(struct mm_struct *mm, unsigned long rnd)
33396 {
33397 unsigned long gap = rlimit(RLIMIT_STACK);
33398+ unsigned long pax_task_size = TASK_SIZE;
33399+
33400+#ifdef CONFIG_PAX_SEGMEXEC
33401+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33402+ pax_task_size = SEGMEXEC_TASK_SIZE;
33403+#endif
33404
33405 if (gap < MIN_GAP)
33406 gap = MIN_GAP;
33407 else if (gap > MAX_GAP)
33408 gap = MAX_GAP;
33409
33410- return PAGE_ALIGN(TASK_SIZE - gap - rnd);
33411+ return PAGE_ALIGN(pax_task_size - gap - rnd);
33412 }
33413
33414 /*
33415 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33416 * does, but not when emulating X86_32
33417 */
33418-static unsigned long mmap_legacy_base(unsigned long rnd)
33419+static unsigned long mmap_legacy_base(struct mm_struct *mm, unsigned long rnd)
33420 {
33421- if (mmap_is_ia32())
33422+ if (mmap_is_ia32()) {
33423+
33424+#ifdef CONFIG_PAX_SEGMEXEC
33425+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33426+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33427+ else
33428+#endif
33429+
33430 return TASK_UNMAPPED_BASE;
33431- else
33432+ } else
33433 return TASK_UNMAPPED_BASE + rnd;
33434 }
33435
33436@@ -113,18 +126,29 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
33437 {
33438 unsigned long random_factor = 0UL;
33439
33440+#ifdef CONFIG_PAX_RANDMMAP
33441+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
33442+#endif
33443 if (current->flags & PF_RANDOMIZE)
33444 random_factor = arch_mmap_rnd();
33445
33446- mm->mmap_legacy_base = mmap_legacy_base(random_factor);
33447+ mm->mmap_legacy_base = mmap_legacy_base(mm, random_factor);
33448
33449 if (mmap_is_legacy()) {
33450 mm->mmap_base = mm->mmap_legacy_base;
33451 mm->get_unmapped_area = arch_get_unmapped_area;
33452 } else {
33453- mm->mmap_base = mmap_base(random_factor);
33454+ mm->mmap_base = mmap_base(mm, random_factor);
33455 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
33456 }
33457+
33458+#ifdef CONFIG_PAX_RANDMMAP
33459+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33460+ mm->mmap_legacy_base += mm->delta_mmap;
33461+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33462+ }
33463+#endif
33464+
33465 }
33466
33467 const char *arch_vma_name(struct vm_area_struct *vma)
33468diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33469index 0057a7a..95c7edd 100644
33470--- a/arch/x86/mm/mmio-mod.c
33471+++ b/arch/x86/mm/mmio-mod.c
33472@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33473 break;
33474 default:
33475 {
33476- unsigned char *ip = (unsigned char *)instptr;
33477+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33478 my_trace->opcode = MMIO_UNKNOWN_OP;
33479 my_trace->width = 0;
33480 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33481@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33482 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33483 void __iomem *addr)
33484 {
33485- static atomic_t next_id;
33486+ static atomic_unchecked_t next_id;
33487 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33488 /* These are page-unaligned. */
33489 struct mmiotrace_map map = {
33490@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33491 .private = trace
33492 },
33493 .phys = offset,
33494- .id = atomic_inc_return(&next_id)
33495+ .id = atomic_inc_return_unchecked(&next_id)
33496 };
33497 map.map_id = trace->id;
33498
33499@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33500 ioremap_trace_core(offset, size, addr);
33501 }
33502
33503-static void iounmap_trace_core(volatile void __iomem *addr)
33504+static void iounmap_trace_core(const volatile void __iomem *addr)
33505 {
33506 struct mmiotrace_map map = {
33507 .phys = 0,
33508@@ -328,7 +328,7 @@ not_enabled:
33509 }
33510 }
33511
33512-void mmiotrace_iounmap(volatile void __iomem *addr)
33513+void mmiotrace_iounmap(const volatile void __iomem *addr)
33514 {
33515 might_sleep();
33516 if (is_enabled()) /* recheck and proper locking in *_core() */
33517diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33518index 4053bb5..b1ad3dc 100644
33519--- a/arch/x86/mm/numa.c
33520+++ b/arch/x86/mm/numa.c
33521@@ -506,7 +506,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33522 }
33523 }
33524
33525-static int __init numa_register_memblks(struct numa_meminfo *mi)
33526+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33527 {
33528 unsigned long uninitialized_var(pfn_align);
33529 int i, nid;
33530diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33531index 89af288..05381957 100644
33532--- a/arch/x86/mm/pageattr.c
33533+++ b/arch/x86/mm/pageattr.c
33534@@ -260,7 +260,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33535 */
33536 #ifdef CONFIG_PCI_BIOS
33537 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33538- pgprot_val(forbidden) |= _PAGE_NX;
33539+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33540 #endif
33541
33542 /*
33543@@ -268,9 +268,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33544 * Does not cover __inittext since that is gone later on. On
33545 * 64bit we do not enforce !NX on the low mapping
33546 */
33547- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33548- pgprot_val(forbidden) |= _PAGE_NX;
33549+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33550+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33551
33552+#ifdef CONFIG_DEBUG_RODATA
33553 /*
33554 * The .rodata section needs to be read-only. Using the pfn
33555 * catches all aliases.
33556@@ -278,6 +279,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33557 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33558 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33559 pgprot_val(forbidden) |= _PAGE_RW;
33560+#endif
33561
33562 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33563 /*
33564@@ -316,6 +318,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33565 }
33566 #endif
33567
33568+#ifdef CONFIG_PAX_KERNEXEC
33569+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33570+ pgprot_val(forbidden) |= _PAGE_RW;
33571+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33572+ }
33573+#endif
33574+
33575 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33576
33577 return prot;
33578@@ -438,23 +447,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33579 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33580 {
33581 /* change init_mm */
33582+ pax_open_kernel();
33583 set_pte_atomic(kpte, pte);
33584+
33585 #ifdef CONFIG_X86_32
33586 if (!SHARED_KERNEL_PMD) {
33587+
33588+#ifdef CONFIG_PAX_PER_CPU_PGD
33589+ unsigned long cpu;
33590+#else
33591 struct page *page;
33592+#endif
33593
33594+#ifdef CONFIG_PAX_PER_CPU_PGD
33595+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33596+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33597+#else
33598 list_for_each_entry(page, &pgd_list, lru) {
33599- pgd_t *pgd;
33600+ pgd_t *pgd = (pgd_t *)page_address(page);
33601+#endif
33602+
33603 pud_t *pud;
33604 pmd_t *pmd;
33605
33606- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33607+ pgd += pgd_index(address);
33608 pud = pud_offset(pgd, address);
33609 pmd = pmd_offset(pud, address);
33610 set_pte_atomic((pte_t *)pmd, pte);
33611 }
33612 }
33613 #endif
33614+ pax_close_kernel();
33615 }
33616
33617 static int
33618diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33619index 35af677..e7bf11f 100644
33620--- a/arch/x86/mm/pat.c
33621+++ b/arch/x86/mm/pat.c
33622@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33623 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33624
33625 if (pg_flags == _PGMT_DEFAULT)
33626- return -1;
33627+ return _PAGE_CACHE_MODE_NUM;
33628 else if (pg_flags == _PGMT_WC)
33629 return _PAGE_CACHE_MODE_WC;
33630 else if (pg_flags == _PGMT_UC_MINUS)
33631@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33632
33633 page = pfn_to_page(pfn);
33634 type = get_page_memtype(page);
33635- if (type != -1) {
33636+ if (type != _PAGE_CACHE_MODE_NUM) {
33637 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33638 start, end - 1, type, req_type);
33639 if (new_type)
33640@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33641
33642 if (!entry) {
33643 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33644- current->comm, current->pid, start, end - 1);
33645+ current->comm, task_pid_nr(current), start, end - 1);
33646 return -EINVAL;
33647 }
33648
33649@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33650 page = pfn_to_page(paddr >> PAGE_SHIFT);
33651 rettype = get_page_memtype(page);
33652 /*
33653- * -1 from get_page_memtype() implies RAM page is in its
33654+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33655 * default state and not reserved, and hence of type WB
33656 */
33657- if (rettype == -1)
33658+ if (rettype == _PAGE_CACHE_MODE_NUM)
33659 rettype = _PAGE_CACHE_MODE_WB;
33660
33661 return rettype;
33662@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33663
33664 while (cursor < to) {
33665 if (!devmem_is_allowed(pfn)) {
33666- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx], PAT prevents it\n",
33667- current->comm, from, to - 1);
33668+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx), PAT prevents it\n",
33669+ current->comm, from, to - 1, cursor);
33670 return 0;
33671 }
33672 cursor += PAGE_SIZE;
33673@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33674 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33675 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33676 "for [mem %#010Lx-%#010Lx]\n",
33677- current->comm, current->pid,
33678+ current->comm, task_pid_nr(current),
33679 cattr_name(pcm),
33680 base, (unsigned long long)(base + size-1));
33681 return -EINVAL;
33682@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33683 pcm = lookup_memtype(paddr);
33684 if (want_pcm != pcm) {
33685 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33686- current->comm, current->pid,
33687+ current->comm, task_pid_nr(current),
33688 cattr_name(want_pcm),
33689 (unsigned long long)paddr,
33690 (unsigned long long)(paddr + size - 1),
33691@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33692 free_memtype(paddr, paddr + size);
33693 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33694 " for [mem %#010Lx-%#010Lx], got %s\n",
33695- current->comm, current->pid,
33696+ current->comm, task_pid_nr(current),
33697 cattr_name(want_pcm),
33698 (unsigned long long)paddr,
33699 (unsigned long long)(paddr + size - 1),
33700diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33701index 6582adc..fcc5d0b 100644
33702--- a/arch/x86/mm/pat_rbtree.c
33703+++ b/arch/x86/mm/pat_rbtree.c
33704@@ -161,7 +161,7 @@ success:
33705
33706 failure:
33707 printk(KERN_INFO "%s:%d conflicting memory types "
33708- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33709+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33710 end, cattr_name(found_type), cattr_name(match->type));
33711 return -EBUSY;
33712 }
33713diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33714index 9f0614d..92ae64a 100644
33715--- a/arch/x86/mm/pf_in.c
33716+++ b/arch/x86/mm/pf_in.c
33717@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33718 int i;
33719 enum reason_type rv = OTHERS;
33720
33721- p = (unsigned char *)ins_addr;
33722+ p = (unsigned char *)ktla_ktva(ins_addr);
33723 p += skip_prefix(p, &prf);
33724 p += get_opcode(p, &opcode);
33725
33726@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33727 struct prefix_bits prf;
33728 int i;
33729
33730- p = (unsigned char *)ins_addr;
33731+ p = (unsigned char *)ktla_ktva(ins_addr);
33732 p += skip_prefix(p, &prf);
33733 p += get_opcode(p, &opcode);
33734
33735@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33736 struct prefix_bits prf;
33737 int i;
33738
33739- p = (unsigned char *)ins_addr;
33740+ p = (unsigned char *)ktla_ktva(ins_addr);
33741 p += skip_prefix(p, &prf);
33742 p += get_opcode(p, &opcode);
33743
33744@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33745 struct prefix_bits prf;
33746 int i;
33747
33748- p = (unsigned char *)ins_addr;
33749+ p = (unsigned char *)ktla_ktva(ins_addr);
33750 p += skip_prefix(p, &prf);
33751 p += get_opcode(p, &opcode);
33752 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33753@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33754 struct prefix_bits prf;
33755 int i;
33756
33757- p = (unsigned char *)ins_addr;
33758+ p = (unsigned char *)ktla_ktva(ins_addr);
33759 p += skip_prefix(p, &prf);
33760 p += get_opcode(p, &opcode);
33761 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33762diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33763index 0b97d2c..597bb38 100644
33764--- a/arch/x86/mm/pgtable.c
33765+++ b/arch/x86/mm/pgtable.c
33766@@ -98,10 +98,75 @@ static inline void pgd_list_del(pgd_t *pgd)
33767 list_del(&page->lru);
33768 }
33769
33770-#define UNSHARED_PTRS_PER_PGD \
33771- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33772+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33773+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33774
33775+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33776+{
33777+ unsigned int count = USER_PGD_PTRS;
33778
33779+ if (!pax_user_shadow_base)
33780+ return;
33781+
33782+ while (count--)
33783+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33784+}
33785+#endif
33786+
33787+#ifdef CONFIG_PAX_PER_CPU_PGD
33788+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33789+{
33790+ unsigned int count = USER_PGD_PTRS;
33791+
33792+ while (count--) {
33793+ pgd_t pgd;
33794+
33795+#ifdef CONFIG_X86_64
33796+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33797+#else
33798+ pgd = *src++;
33799+#endif
33800+
33801+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33802+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33803+#endif
33804+
33805+ *dst++ = pgd;
33806+ }
33807+
33808+}
33809+#endif
33810+
33811+#ifdef CONFIG_X86_64
33812+#define pxd_t pud_t
33813+#define pyd_t pgd_t
33814+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33815+#define pgtable_pxd_page_ctor(page) true
33816+#define pgtable_pxd_page_dtor(page) do {} while (0)
33817+#define pxd_free(mm, pud) pud_free((mm), (pud))
33818+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33819+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33820+#define PYD_SIZE PGDIR_SIZE
33821+#define mm_inc_nr_pxds(mm) do {} while (0)
33822+#define mm_dec_nr_pxds(mm) do {} while (0)
33823+#else
33824+#define pxd_t pmd_t
33825+#define pyd_t pud_t
33826+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33827+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33828+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33829+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33830+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33831+#define pyd_offset(mm, address) pud_offset((mm), (address))
33832+#define PYD_SIZE PUD_SIZE
33833+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
33834+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
33835+#endif
33836+
33837+#ifdef CONFIG_PAX_PER_CPU_PGD
33838+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33839+static inline void pgd_dtor(pgd_t *pgd) {}
33840+#else
33841 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33842 {
33843 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33844@@ -142,6 +207,7 @@ static void pgd_dtor(pgd_t *pgd)
33845 pgd_list_del(pgd);
33846 spin_unlock(&pgd_lock);
33847 }
33848+#endif
33849
33850 /*
33851 * List of all pgd's needed for non-PAE so it can invalidate entries
33852@@ -154,7 +220,7 @@ static void pgd_dtor(pgd_t *pgd)
33853 * -- nyc
33854 */
33855
33856-#ifdef CONFIG_X86_PAE
33857+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33858 /*
33859 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33860 * updating the top-level pagetable entries to guarantee the
33861@@ -166,7 +232,7 @@ static void pgd_dtor(pgd_t *pgd)
33862 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33863 * and initialize the kernel pmds here.
33864 */
33865-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33866+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33867
33868 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33869 {
33870@@ -184,46 +250,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33871 */
33872 flush_tlb_mm(mm);
33873 }
33874+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33875+#define PREALLOCATED_PXDS USER_PGD_PTRS
33876 #else /* !CONFIG_X86_PAE */
33877
33878 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33879-#define PREALLOCATED_PMDS 0
33880+#define PREALLOCATED_PXDS 0
33881
33882 #endif /* CONFIG_X86_PAE */
33883
33884-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
33885+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
33886 {
33887 int i;
33888
33889- for(i = 0; i < PREALLOCATED_PMDS; i++)
33890- if (pmds[i]) {
33891- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33892- free_page((unsigned long)pmds[i]);
33893- mm_dec_nr_pmds(mm);
33894+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33895+ if (pxds[i]) {
33896+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33897+ free_page((unsigned long)pxds[i]);
33898+ mm_dec_nr_pxds(mm);
33899 }
33900 }
33901
33902-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33903+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
33904 {
33905 int i;
33906 bool failed = false;
33907
33908- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33909- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33910- if (!pmd)
33911+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33912+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33913+ if (!pxd)
33914 failed = true;
33915- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33916- free_page((unsigned long)pmd);
33917- pmd = NULL;
33918+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33919+ free_page((unsigned long)pxd);
33920+ pxd = NULL;
33921 failed = true;
33922 }
33923- if (pmd)
33924- mm_inc_nr_pmds(mm);
33925- pmds[i] = pmd;
33926+ if (pxd)
33927+ mm_inc_nr_pxds(mm);
33928+ pxds[i] = pxd;
33929 }
33930
33931 if (failed) {
33932- free_pmds(mm, pmds);
33933+ free_pxds(mm, pxds);
33934 return -ENOMEM;
33935 }
33936
33937@@ -236,43 +304,47 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33938 * preallocate which never got a corresponding vma will need to be
33939 * freed manually.
33940 */
33941-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33942+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33943 {
33944 int i;
33945
33946- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33947+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33948 pgd_t pgd = pgdp[i];
33949
33950 if (pgd_val(pgd) != 0) {
33951- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33952+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33953
33954- pgdp[i] = native_make_pgd(0);
33955+ set_pgd(pgdp + i, native_make_pgd(0));
33956
33957- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33958- pmd_free(mm, pmd);
33959- mm_dec_nr_pmds(mm);
33960+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33961+ pxd_free(mm, pxd);
33962+ mm_dec_nr_pxds(mm);
33963 }
33964 }
33965 }
33966
33967-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33968+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33969 {
33970- pud_t *pud;
33971+ pyd_t *pyd;
33972 int i;
33973
33974- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33975+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33976 return;
33977
33978- pud = pud_offset(pgd, 0);
33979+#ifdef CONFIG_X86_64
33980+ pyd = pyd_offset(mm, 0L);
33981+#else
33982+ pyd = pyd_offset(pgd, 0L);
33983+#endif
33984
33985- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33986- pmd_t *pmd = pmds[i];
33987+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33988+ pxd_t *pxd = pxds[i];
33989
33990 if (i >= KERNEL_PGD_BOUNDARY)
33991- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33992- sizeof(pmd_t) * PTRS_PER_PMD);
33993+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33994+ sizeof(pxd_t) * PTRS_PER_PMD);
33995
33996- pud_populate(mm, pud, pmd);
33997+ pyd_populate(mm, pyd, pxd);
33998 }
33999 }
34000
34001@@ -354,7 +426,7 @@ static inline void _pgd_free(pgd_t *pgd)
34002 pgd_t *pgd_alloc(struct mm_struct *mm)
34003 {
34004 pgd_t *pgd;
34005- pmd_t *pmds[PREALLOCATED_PMDS];
34006+ pxd_t *pxds[PREALLOCATED_PXDS];
34007
34008 pgd = _pgd_alloc();
34009
34010@@ -363,11 +435,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34011
34012 mm->pgd = pgd;
34013
34014- if (preallocate_pmds(mm, pmds) != 0)
34015+ if (preallocate_pxds(mm, pxds) != 0)
34016 goto out_free_pgd;
34017
34018 if (paravirt_pgd_alloc(mm) != 0)
34019- goto out_free_pmds;
34020+ goto out_free_pxds;
34021
34022 /*
34023 * Make sure that pre-populating the pmds is atomic with
34024@@ -377,14 +449,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
34025 spin_lock(&pgd_lock);
34026
34027 pgd_ctor(mm, pgd);
34028- pgd_prepopulate_pmd(mm, pgd, pmds);
34029+ pgd_prepopulate_pxd(mm, pgd, pxds);
34030
34031 spin_unlock(&pgd_lock);
34032
34033 return pgd;
34034
34035-out_free_pmds:
34036- free_pmds(mm, pmds);
34037+out_free_pxds:
34038+ free_pxds(mm, pxds);
34039 out_free_pgd:
34040 _pgd_free(pgd);
34041 out:
34042@@ -393,7 +465,7 @@ out:
34043
34044 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34045 {
34046- pgd_mop_up_pmds(mm, pgd);
34047+ pgd_mop_up_pxds(mm, pgd);
34048 pgd_dtor(pgd);
34049 paravirt_pgd_free(mm, pgd);
34050 _pgd_free(pgd);
34051diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34052index 75cc097..79a097f 100644
34053--- a/arch/x86/mm/pgtable_32.c
34054+++ b/arch/x86/mm/pgtable_32.c
34055@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34056 return;
34057 }
34058 pte = pte_offset_kernel(pmd, vaddr);
34059+
34060+ pax_open_kernel();
34061 if (pte_val(pteval))
34062 set_pte_at(&init_mm, vaddr, pte, pteval);
34063 else
34064 pte_clear(&init_mm, vaddr, pte);
34065+ pax_close_kernel();
34066
34067 /*
34068 * It's enough to flush this one mapping.
34069diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34070index e666cbb..61788c45 100644
34071--- a/arch/x86/mm/physaddr.c
34072+++ b/arch/x86/mm/physaddr.c
34073@@ -10,7 +10,7 @@
34074 #ifdef CONFIG_X86_64
34075
34076 #ifdef CONFIG_DEBUG_VIRTUAL
34077-unsigned long __phys_addr(unsigned long x)
34078+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34079 {
34080 unsigned long y = x - __START_KERNEL_map;
34081
34082@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34083 #else
34084
34085 #ifdef CONFIG_DEBUG_VIRTUAL
34086-unsigned long __phys_addr(unsigned long x)
34087+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34088 {
34089 unsigned long phys_addr = x - PAGE_OFFSET;
34090 /* VMALLOC_* aren't constants */
34091diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34092index 90555bf..f5f1828 100644
34093--- a/arch/x86/mm/setup_nx.c
34094+++ b/arch/x86/mm/setup_nx.c
34095@@ -5,8 +5,10 @@
34096 #include <asm/pgtable.h>
34097 #include <asm/proto.h>
34098
34099+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34100 static int disable_nx;
34101
34102+#ifndef CONFIG_PAX_PAGEEXEC
34103 /*
34104 * noexec = on|off
34105 *
34106@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34107 return 0;
34108 }
34109 early_param("noexec", noexec_setup);
34110+#endif
34111+
34112+#endif
34113
34114 void x86_configure_nx(void)
34115 {
34116+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34117 if (cpu_has_nx && !disable_nx)
34118 __supported_pte_mask |= _PAGE_NX;
34119 else
34120+#endif
34121 __supported_pte_mask &= ~_PAGE_NX;
34122 }
34123
34124diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34125index 90b924a..4197ac2 100644
34126--- a/arch/x86/mm/tlb.c
34127+++ b/arch/x86/mm/tlb.c
34128@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34129 BUG();
34130 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34131 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34132+
34133+#ifndef CONFIG_PAX_PER_CPU_PGD
34134 load_cr3(swapper_pg_dir);
34135+#endif
34136+
34137 /*
34138 * This gets called in the idle path where RCU
34139 * functions differently. Tracing normally
34140diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34141new file mode 100644
34142index 0000000..3fda3f3
34143--- /dev/null
34144+++ b/arch/x86/mm/uderef_64.c
34145@@ -0,0 +1,37 @@
34146+#include <linux/mm.h>
34147+#include <asm/pgtable.h>
34148+#include <asm/uaccess.h>
34149+
34150+#ifdef CONFIG_PAX_MEMORY_UDEREF
34151+/* PaX: due to the special call convention these functions must
34152+ * - remain leaf functions under all configurations,
34153+ * - never be called directly, only dereferenced from the wrappers.
34154+ */
34155+void __used __pax_open_userland(void)
34156+{
34157+ unsigned int cpu;
34158+
34159+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34160+ return;
34161+
34162+ cpu = raw_get_cpu();
34163+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34164+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34165+ raw_put_cpu_no_resched();
34166+}
34167+EXPORT_SYMBOL(__pax_open_userland);
34168+
34169+void __used __pax_close_userland(void)
34170+{
34171+ unsigned int cpu;
34172+
34173+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34174+ return;
34175+
34176+ cpu = raw_get_cpu();
34177+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34178+ write_cr3(__pa_nodebug(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34179+ raw_put_cpu_no_resched();
34180+}
34181+EXPORT_SYMBOL(__pax_close_userland);
34182+#endif
34183diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34184index 6440221..f84b5c7 100644
34185--- a/arch/x86/net/bpf_jit.S
34186+++ b/arch/x86/net/bpf_jit.S
34187@@ -9,6 +9,7 @@
34188 */
34189 #include <linux/linkage.h>
34190 #include <asm/dwarf2.h>
34191+#include <asm/alternative-asm.h>
34192
34193 /*
34194 * Calling convention :
34195@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34196 jle bpf_slow_path_word
34197 mov (SKBDATA,%rsi),%eax
34198 bswap %eax /* ntohl() */
34199+ pax_force_retaddr
34200 ret
34201
34202 sk_load_half:
34203@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34204 jle bpf_slow_path_half
34205 movzwl (SKBDATA,%rsi),%eax
34206 rol $8,%ax # ntohs()
34207+ pax_force_retaddr
34208 ret
34209
34210 sk_load_byte:
34211@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34212 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34213 jle bpf_slow_path_byte
34214 movzbl (SKBDATA,%rsi),%eax
34215+ pax_force_retaddr
34216 ret
34217
34218 /* rsi contains offset and can be scratched */
34219@@ -90,6 +94,7 @@ bpf_slow_path_word:
34220 js bpf_error
34221 mov - MAX_BPF_STACK + 32(%rbp),%eax
34222 bswap %eax
34223+ pax_force_retaddr
34224 ret
34225
34226 bpf_slow_path_half:
34227@@ -98,12 +103,14 @@ bpf_slow_path_half:
34228 mov - MAX_BPF_STACK + 32(%rbp),%ax
34229 rol $8,%ax
34230 movzwl %ax,%eax
34231+ pax_force_retaddr
34232 ret
34233
34234 bpf_slow_path_byte:
34235 bpf_slow_path_common(1)
34236 js bpf_error
34237 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34238+ pax_force_retaddr
34239 ret
34240
34241 #define sk_negative_common(SIZE) \
34242@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34243 sk_negative_common(4)
34244 mov (%rax), %eax
34245 bswap %eax
34246+ pax_force_retaddr
34247 ret
34248
34249 bpf_slow_path_half_neg:
34250@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34251 mov (%rax),%ax
34252 rol $8,%ax
34253 movzwl %ax,%eax
34254+ pax_force_retaddr
34255 ret
34256
34257 bpf_slow_path_byte_neg:
34258@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34259 .globl sk_load_byte_negative_offset
34260 sk_negative_common(1)
34261 movzbl (%rax), %eax
34262+ pax_force_retaddr
34263 ret
34264
34265 bpf_error:
34266@@ -156,4 +166,5 @@ bpf_error:
34267 mov - MAX_BPF_STACK + 16(%rbp),%r14
34268 mov - MAX_BPF_STACK + 24(%rbp),%r15
34269 leaveq
34270+ pax_force_retaddr
34271 ret
34272diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34273index ddeff48..877ead6 100644
34274--- a/arch/x86/net/bpf_jit_comp.c
34275+++ b/arch/x86/net/bpf_jit_comp.c
34276@@ -13,7 +13,11 @@
34277 #include <linux/if_vlan.h>
34278 #include <asm/cacheflush.h>
34279
34280+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34281+int bpf_jit_enable __read_only;
34282+#else
34283 int bpf_jit_enable __read_mostly;
34284+#endif
34285
34286 /*
34287 * assembly code in arch/x86/net/bpf_jit.S
34288@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34289 static void jit_fill_hole(void *area, unsigned int size)
34290 {
34291 /* fill whole space with int3 instructions */
34292+ pax_open_kernel();
34293 memset(area, 0xcc, size);
34294+ pax_close_kernel();
34295 }
34296
34297 struct jit_context {
34298@@ -924,7 +930,9 @@ common_load:
34299 pr_err("bpf_jit_compile fatal error\n");
34300 return -EFAULT;
34301 }
34302+ pax_open_kernel();
34303 memcpy(image + proglen, temp, ilen);
34304+ pax_close_kernel();
34305 }
34306 proglen += ilen;
34307 addrs[i] = proglen;
34308@@ -1001,7 +1009,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34309
34310 if (image) {
34311 bpf_flush_icache(header, image + proglen);
34312- set_memory_ro((unsigned long)header, header->pages);
34313 prog->bpf_func = (void *)image;
34314 prog->jited = true;
34315 }
34316@@ -1014,12 +1021,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34317 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34318 struct bpf_binary_header *header = (void *)addr;
34319
34320- if (!fp->jited)
34321- goto free_filter;
34322+ if (fp->jited)
34323+ bpf_jit_binary_free(header);
34324
34325- set_memory_rw(addr, header->pages);
34326- bpf_jit_binary_free(header);
34327-
34328-free_filter:
34329 bpf_prog_unlock_free(fp);
34330 }
34331diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34332index 4e664bd..2beeaa2 100644
34333--- a/arch/x86/oprofile/backtrace.c
34334+++ b/arch/x86/oprofile/backtrace.c
34335@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34336 struct stack_frame_ia32 *fp;
34337 unsigned long bytes;
34338
34339- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34340+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34341 if (bytes != 0)
34342 return NULL;
34343
34344- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34345+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34346
34347 oprofile_add_trace(bufhead[0].return_address);
34348
34349@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34350 struct stack_frame bufhead[2];
34351 unsigned long bytes;
34352
34353- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34354+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34355 if (bytes != 0)
34356 return NULL;
34357
34358diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34359index 1d2e639..f6ef82a 100644
34360--- a/arch/x86/oprofile/nmi_int.c
34361+++ b/arch/x86/oprofile/nmi_int.c
34362@@ -23,6 +23,7 @@
34363 #include <asm/nmi.h>
34364 #include <asm/msr.h>
34365 #include <asm/apic.h>
34366+#include <asm/pgtable.h>
34367
34368 #include "op_counter.h"
34369 #include "op_x86_model.h"
34370@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34371 if (ret)
34372 return ret;
34373
34374- if (!model->num_virt_counters)
34375- model->num_virt_counters = model->num_counters;
34376+ if (!model->num_virt_counters) {
34377+ pax_open_kernel();
34378+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34379+ pax_close_kernel();
34380+ }
34381
34382 mux_init(ops);
34383
34384diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34385index 50d86c0..7985318 100644
34386--- a/arch/x86/oprofile/op_model_amd.c
34387+++ b/arch/x86/oprofile/op_model_amd.c
34388@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34389 num_counters = AMD64_NUM_COUNTERS;
34390 }
34391
34392- op_amd_spec.num_counters = num_counters;
34393- op_amd_spec.num_controls = num_counters;
34394- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34395+ pax_open_kernel();
34396+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34397+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34398+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34399+ pax_close_kernel();
34400
34401 return 0;
34402 }
34403diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34404index d90528e..0127e2b 100644
34405--- a/arch/x86/oprofile/op_model_ppro.c
34406+++ b/arch/x86/oprofile/op_model_ppro.c
34407@@ -19,6 +19,7 @@
34408 #include <asm/msr.h>
34409 #include <asm/apic.h>
34410 #include <asm/nmi.h>
34411+#include <asm/pgtable.h>
34412
34413 #include "op_x86_model.h"
34414 #include "op_counter.h"
34415@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34416
34417 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34418
34419- op_arch_perfmon_spec.num_counters = num_counters;
34420- op_arch_perfmon_spec.num_controls = num_counters;
34421+ pax_open_kernel();
34422+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34423+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34424+ pax_close_kernel();
34425 }
34426
34427 static int arch_perfmon_init(struct oprofile_operations *ignore)
34428diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34429index 71e8a67..6a313bb 100644
34430--- a/arch/x86/oprofile/op_x86_model.h
34431+++ b/arch/x86/oprofile/op_x86_model.h
34432@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34433 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34434 struct op_msrs const * const msrs);
34435 #endif
34436-};
34437+} __do_const;
34438
34439 struct op_counter_config;
34440
34441diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34442index 852aa4c..71613f2 100644
34443--- a/arch/x86/pci/intel_mid_pci.c
34444+++ b/arch/x86/pci/intel_mid_pci.c
34445@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34446 pci_mmcfg_late_init();
34447 pcibios_enable_irq = intel_mid_pci_irq_enable;
34448 pcibios_disable_irq = intel_mid_pci_irq_disable;
34449- pci_root_ops = intel_mid_pci_ops;
34450+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34451 pci_soc_mode = 1;
34452 /* Continue with standard init */
34453 return 1;
34454diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34455index 5dc6ca5..25c03f5 100644
34456--- a/arch/x86/pci/irq.c
34457+++ b/arch/x86/pci/irq.c
34458@@ -51,7 +51,7 @@ struct irq_router {
34459 struct irq_router_handler {
34460 u16 vendor;
34461 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34462-};
34463+} __do_const;
34464
34465 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34466 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34467@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34468 return 0;
34469 }
34470
34471-static __initdata struct irq_router_handler pirq_routers[] = {
34472+static __initconst const struct irq_router_handler pirq_routers[] = {
34473 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34474 { PCI_VENDOR_ID_AL, ali_router_probe },
34475 { PCI_VENDOR_ID_ITE, ite_router_probe },
34476@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34477 static void __init pirq_find_router(struct irq_router *r)
34478 {
34479 struct irq_routing_table *rt = pirq_table;
34480- struct irq_router_handler *h;
34481+ const struct irq_router_handler *h;
34482
34483 #ifdef CONFIG_PCI_BIOS
34484 if (!rt->signature) {
34485@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34486 return 0;
34487 }
34488
34489-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34490+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34491 {
34492 .callback = fix_broken_hp_bios_irq9,
34493 .ident = "HP Pavilion N5400 Series Laptop",
34494diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34495index 9b83b90..2c256c5 100644
34496--- a/arch/x86/pci/pcbios.c
34497+++ b/arch/x86/pci/pcbios.c
34498@@ -79,7 +79,7 @@ union bios32 {
34499 static struct {
34500 unsigned long address;
34501 unsigned short segment;
34502-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34503+} bios32_indirect __initdata = { 0, __PCIBIOS_CS };
34504
34505 /*
34506 * Returns the entry point for the given service, NULL on error
34507@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34508 unsigned long length; /* %ecx */
34509 unsigned long entry; /* %edx */
34510 unsigned long flags;
34511+ struct desc_struct d, *gdt;
34512
34513 local_irq_save(flags);
34514- __asm__("lcall *(%%edi); cld"
34515+
34516+ gdt = get_cpu_gdt_table(smp_processor_id());
34517+
34518+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34519+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34520+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34521+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34522+
34523+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34524 : "=a" (return_code),
34525 "=b" (address),
34526 "=c" (length),
34527 "=d" (entry)
34528 : "0" (service),
34529 "1" (0),
34530- "D" (&bios32_indirect));
34531+ "D" (&bios32_indirect),
34532+ "r"(__PCIBIOS_DS)
34533+ : "memory");
34534+
34535+ pax_open_kernel();
34536+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34537+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34538+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34539+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34540+ pax_close_kernel();
34541+
34542 local_irq_restore(flags);
34543
34544 switch (return_code) {
34545- case 0:
34546- return address + entry;
34547- case 0x80: /* Not present */
34548- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34549- return 0;
34550- default: /* Shouldn't happen */
34551- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34552- service, return_code);
34553+ case 0: {
34554+ int cpu;
34555+ unsigned char flags;
34556+
34557+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34558+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34559+ printk(KERN_WARNING "bios32_service: not valid\n");
34560 return 0;
34561+ }
34562+ address = address + PAGE_OFFSET;
34563+ length += 16UL; /* some BIOSs underreport this... */
34564+ flags = 4;
34565+ if (length >= 64*1024*1024) {
34566+ length >>= PAGE_SHIFT;
34567+ flags |= 8;
34568+ }
34569+
34570+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34571+ gdt = get_cpu_gdt_table(cpu);
34572+ pack_descriptor(&d, address, length, 0x9b, flags);
34573+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34574+ pack_descriptor(&d, address, length, 0x93, flags);
34575+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34576+ }
34577+ return entry;
34578+ }
34579+ case 0x80: /* Not present */
34580+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34581+ return 0;
34582+ default: /* Shouldn't happen */
34583+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34584+ service, return_code);
34585+ return 0;
34586 }
34587 }
34588
34589 static struct {
34590 unsigned long address;
34591 unsigned short segment;
34592-} pci_indirect = { 0, __KERNEL_CS };
34593+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34594
34595-static int pci_bios_present;
34596+static int pci_bios_present __read_only;
34597
34598 static int __init check_pcibios(void)
34599 {
34600@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34601 unsigned long flags, pcibios_entry;
34602
34603 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34604- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34605+ pci_indirect.address = pcibios_entry;
34606
34607 local_irq_save(flags);
34608- __asm__(
34609- "lcall *(%%edi); cld\n\t"
34610+ __asm__("movw %w6, %%ds\n\t"
34611+ "lcall *%%ss:(%%edi); cld\n\t"
34612+ "push %%ss\n\t"
34613+ "pop %%ds\n\t"
34614 "jc 1f\n\t"
34615 "xor %%ah, %%ah\n"
34616 "1:"
34617@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34618 "=b" (ebx),
34619 "=c" (ecx)
34620 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34621- "D" (&pci_indirect)
34622+ "D" (&pci_indirect),
34623+ "r" (__PCIBIOS_DS)
34624 : "memory");
34625 local_irq_restore(flags);
34626
34627@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34628
34629 switch (len) {
34630 case 1:
34631- __asm__("lcall *(%%esi); cld\n\t"
34632+ __asm__("movw %w6, %%ds\n\t"
34633+ "lcall *%%ss:(%%esi); cld\n\t"
34634+ "push %%ss\n\t"
34635+ "pop %%ds\n\t"
34636 "jc 1f\n\t"
34637 "xor %%ah, %%ah\n"
34638 "1:"
34639@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34640 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34641 "b" (bx),
34642 "D" ((long)reg),
34643- "S" (&pci_indirect));
34644+ "S" (&pci_indirect),
34645+ "r" (__PCIBIOS_DS));
34646 /*
34647 * Zero-extend the result beyond 8 bits, do not trust the
34648 * BIOS having done it:
34649@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34650 *value &= 0xff;
34651 break;
34652 case 2:
34653- __asm__("lcall *(%%esi); cld\n\t"
34654+ __asm__("movw %w6, %%ds\n\t"
34655+ "lcall *%%ss:(%%esi); cld\n\t"
34656+ "push %%ss\n\t"
34657+ "pop %%ds\n\t"
34658 "jc 1f\n\t"
34659 "xor %%ah, %%ah\n"
34660 "1:"
34661@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34662 : "1" (PCIBIOS_READ_CONFIG_WORD),
34663 "b" (bx),
34664 "D" ((long)reg),
34665- "S" (&pci_indirect));
34666+ "S" (&pci_indirect),
34667+ "r" (__PCIBIOS_DS));
34668 /*
34669 * Zero-extend the result beyond 16 bits, do not trust the
34670 * BIOS having done it:
34671@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34672 *value &= 0xffff;
34673 break;
34674 case 4:
34675- __asm__("lcall *(%%esi); cld\n\t"
34676+ __asm__("movw %w6, %%ds\n\t"
34677+ "lcall *%%ss:(%%esi); cld\n\t"
34678+ "push %%ss\n\t"
34679+ "pop %%ds\n\t"
34680 "jc 1f\n\t"
34681 "xor %%ah, %%ah\n"
34682 "1:"
34683@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34684 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34685 "b" (bx),
34686 "D" ((long)reg),
34687- "S" (&pci_indirect));
34688+ "S" (&pci_indirect),
34689+ "r" (__PCIBIOS_DS));
34690 break;
34691 }
34692
34693@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34694
34695 switch (len) {
34696 case 1:
34697- __asm__("lcall *(%%esi); cld\n\t"
34698+ __asm__("movw %w6, %%ds\n\t"
34699+ "lcall *%%ss:(%%esi); cld\n\t"
34700+ "push %%ss\n\t"
34701+ "pop %%ds\n\t"
34702 "jc 1f\n\t"
34703 "xor %%ah, %%ah\n"
34704 "1:"
34705@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34706 "c" (value),
34707 "b" (bx),
34708 "D" ((long)reg),
34709- "S" (&pci_indirect));
34710+ "S" (&pci_indirect),
34711+ "r" (__PCIBIOS_DS));
34712 break;
34713 case 2:
34714- __asm__("lcall *(%%esi); cld\n\t"
34715+ __asm__("movw %w6, %%ds\n\t"
34716+ "lcall *%%ss:(%%esi); cld\n\t"
34717+ "push %%ss\n\t"
34718+ "pop %%ds\n\t"
34719 "jc 1f\n\t"
34720 "xor %%ah, %%ah\n"
34721 "1:"
34722@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34723 "c" (value),
34724 "b" (bx),
34725 "D" ((long)reg),
34726- "S" (&pci_indirect));
34727+ "S" (&pci_indirect),
34728+ "r" (__PCIBIOS_DS));
34729 break;
34730 case 4:
34731- __asm__("lcall *(%%esi); cld\n\t"
34732+ __asm__("movw %w6, %%ds\n\t"
34733+ "lcall *%%ss:(%%esi); cld\n\t"
34734+ "push %%ss\n\t"
34735+ "pop %%ds\n\t"
34736 "jc 1f\n\t"
34737 "xor %%ah, %%ah\n"
34738 "1:"
34739@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34740 "c" (value),
34741 "b" (bx),
34742 "D" ((long)reg),
34743- "S" (&pci_indirect));
34744+ "S" (&pci_indirect),
34745+ "r" (__PCIBIOS_DS));
34746 break;
34747 }
34748
34749@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34750
34751 DBG("PCI: Fetching IRQ routing table... ");
34752 __asm__("push %%es\n\t"
34753+ "movw %w8, %%ds\n\t"
34754 "push %%ds\n\t"
34755 "pop %%es\n\t"
34756- "lcall *(%%esi); cld\n\t"
34757+ "lcall *%%ss:(%%esi); cld\n\t"
34758 "pop %%es\n\t"
34759+ "push %%ss\n\t"
34760+ "pop %%ds\n"
34761 "jc 1f\n\t"
34762 "xor %%ah, %%ah\n"
34763 "1:"
34764@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34765 "1" (0),
34766 "D" ((long) &opt),
34767 "S" (&pci_indirect),
34768- "m" (opt)
34769+ "m" (opt),
34770+ "r" (__PCIBIOS_DS)
34771 : "memory");
34772 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34773 if (ret & 0xff00)
34774@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34775 {
34776 int ret;
34777
34778- __asm__("lcall *(%%esi); cld\n\t"
34779+ __asm__("movw %w5, %%ds\n\t"
34780+ "lcall *%%ss:(%%esi); cld\n\t"
34781+ "push %%ss\n\t"
34782+ "pop %%ds\n"
34783 "jc 1f\n\t"
34784 "xor %%ah, %%ah\n"
34785 "1:"
34786@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34787 : "0" (PCIBIOS_SET_PCI_HW_INT),
34788 "b" ((dev->bus->number << 8) | dev->devfn),
34789 "c" ((irq << 8) | (pin + 10)),
34790- "S" (&pci_indirect));
34791+ "S" (&pci_indirect),
34792+ "r" (__PCIBIOS_DS));
34793 return !(ret & 0xff00);
34794 }
34795 EXPORT_SYMBOL(pcibios_set_irq_routing);
34796diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34797index ed5b673..24d2d53 100644
34798--- a/arch/x86/platform/efi/efi_32.c
34799+++ b/arch/x86/platform/efi/efi_32.c
34800@@ -61,11 +61,27 @@ pgd_t * __init efi_call_phys_prolog(void)
34801 struct desc_ptr gdt_descr;
34802 pgd_t *save_pgd;
34803
34804+#ifdef CONFIG_PAX_KERNEXEC
34805+ struct desc_struct d;
34806+#endif
34807+
34808 /* Current pgd is swapper_pg_dir, we'll restore it later: */
34809+#ifdef CONFIG_PAX_PER_CPU_PGD
34810+ save_pgd = get_cpu_pgd(smp_processor_id(), kernel);
34811+#else
34812 save_pgd = swapper_pg_dir;
34813+#endif
34814+
34815 load_cr3(initial_page_table);
34816 __flush_tlb_all();
34817
34818+#ifdef CONFIG_PAX_KERNEXEC
34819+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34820+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34821+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34822+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34823+#endif
34824+
34825 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34826 gdt_descr.size = GDT_SIZE - 1;
34827 load_gdt(&gdt_descr);
34828@@ -77,6 +93,14 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
34829 {
34830 struct desc_ptr gdt_descr;
34831
34832+#ifdef CONFIG_PAX_KERNEXEC
34833+ struct desc_struct d;
34834+
34835+ memset(&d, 0, sizeof d);
34836+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34837+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34838+#endif
34839+
34840 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34841 gdt_descr.size = GDT_SIZE - 1;
34842 load_gdt(&gdt_descr);
34843diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34844index a0ac0f9..f41d324 100644
34845--- a/arch/x86/platform/efi/efi_64.c
34846+++ b/arch/x86/platform/efi/efi_64.c
34847@@ -96,6 +96,11 @@ pgd_t * __init efi_call_phys_prolog(void)
34848 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34849 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34850 }
34851+
34852+#ifdef CONFIG_PAX_PER_CPU_PGD
34853+ load_cr3(swapper_pg_dir);
34854+#endif
34855+
34856 __flush_tlb_all();
34857
34858 return save_pgd;
34859@@ -119,6 +124,10 @@ void __init efi_call_phys_epilog(pgd_t *save_pgd)
34860
34861 kfree(save_pgd);
34862
34863+#ifdef CONFIG_PAX_PER_CPU_PGD
34864+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34865+#endif
34866+
34867 __flush_tlb_all();
34868 early_code_mapping_set_exec(0);
34869 }
34870@@ -148,8 +157,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34871 unsigned npages;
34872 pgd_t *pgd;
34873
34874- if (efi_enabled(EFI_OLD_MEMMAP))
34875+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34876+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34877+ * able to execute the EFI services.
34878+ */
34879+ if (__supported_pte_mask & _PAGE_NX) {
34880+ unsigned long addr = (unsigned long) __va(0);
34881+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34882+
34883+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34884+#ifdef CONFIG_PAX_PER_CPU_PGD
34885+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34886+#endif
34887+ set_pgd(pgd_offset_k(addr), pe);
34888+ }
34889+
34890 return 0;
34891+ }
34892
34893 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34894 pgd = __va(efi_scratch.efi_pgt);
34895diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34896index 040192b..7d3300f 100644
34897--- a/arch/x86/platform/efi/efi_stub_32.S
34898+++ b/arch/x86/platform/efi/efi_stub_32.S
34899@@ -6,7 +6,9 @@
34900 */
34901
34902 #include <linux/linkage.h>
34903+#include <linux/init.h>
34904 #include <asm/page_types.h>
34905+#include <asm/segment.h>
34906
34907 /*
34908 * efi_call_phys(void *, ...) is a function with variable parameters.
34909@@ -20,7 +22,7 @@
34910 * service functions will comply with gcc calling convention, too.
34911 */
34912
34913-.text
34914+__INIT
34915 ENTRY(efi_call_phys)
34916 /*
34917 * 0. The function can only be called in Linux kernel. So CS has been
34918@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34919 * The mapping of lower virtual memory has been created in prolog and
34920 * epilog.
34921 */
34922- movl $1f, %edx
34923- subl $__PAGE_OFFSET, %edx
34924- jmp *%edx
34925+#ifdef CONFIG_PAX_KERNEXEC
34926+ movl $(__KERNEXEC_EFI_DS), %edx
34927+ mov %edx, %ds
34928+ mov %edx, %es
34929+ mov %edx, %ss
34930+ addl $2f,(1f)
34931+ ljmp *(1f)
34932+
34933+__INITDATA
34934+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34935+.previous
34936+
34937+2:
34938+ subl $2b,(1b)
34939+#else
34940+ jmp 1f-__PAGE_OFFSET
34941 1:
34942+#endif
34943
34944 /*
34945 * 2. Now on the top of stack is the return
34946@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34947 * parameter 2, ..., param n. To make things easy, we save the return
34948 * address of efi_call_phys in a global variable.
34949 */
34950- popl %edx
34951- movl %edx, saved_return_addr
34952- /* get the function pointer into ECX*/
34953- popl %ecx
34954- movl %ecx, efi_rt_function_ptr
34955- movl $2f, %edx
34956- subl $__PAGE_OFFSET, %edx
34957- pushl %edx
34958+ popl (saved_return_addr)
34959+ popl (efi_rt_function_ptr)
34960
34961 /*
34962 * 3. Clear PG bit in %CR0.
34963@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34964 /*
34965 * 5. Call the physical function.
34966 */
34967- jmp *%ecx
34968+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
34969
34970-2:
34971 /*
34972 * 6. After EFI runtime service returns, control will return to
34973 * following instruction. We'd better readjust stack pointer first.
34974@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34975 movl %cr0, %edx
34976 orl $0x80000000, %edx
34977 movl %edx, %cr0
34978- jmp 1f
34979-1:
34980+
34981 /*
34982 * 8. Now restore the virtual mode from flat mode by
34983 * adding EIP with PAGE_OFFSET.
34984 */
34985- movl $1f, %edx
34986- jmp *%edx
34987+#ifdef CONFIG_PAX_KERNEXEC
34988+ movl $(__KERNEL_DS), %edx
34989+ mov %edx, %ds
34990+ mov %edx, %es
34991+ mov %edx, %ss
34992+ ljmp $(__KERNEL_CS),$1f
34993+#else
34994+ jmp 1f+__PAGE_OFFSET
34995+#endif
34996 1:
34997
34998 /*
34999 * 9. Balance the stack. And because EAX contain the return value,
35000 * we'd better not clobber it.
35001 */
35002- leal efi_rt_function_ptr, %edx
35003- movl (%edx), %ecx
35004- pushl %ecx
35005+ pushl (efi_rt_function_ptr)
35006
35007 /*
35008- * 10. Push the saved return address onto the stack and return.
35009+ * 10. Return to the saved return address.
35010 */
35011- leal saved_return_addr, %edx
35012- movl (%edx), %ecx
35013- pushl %ecx
35014- ret
35015+ jmpl *(saved_return_addr)
35016 ENDPROC(efi_call_phys)
35017 .previous
35018
35019-.data
35020+__INITDATA
35021 saved_return_addr:
35022 .long 0
35023 efi_rt_function_ptr:
35024diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
35025index 86d0f9e..6d499f4 100644
35026--- a/arch/x86/platform/efi/efi_stub_64.S
35027+++ b/arch/x86/platform/efi/efi_stub_64.S
35028@@ -11,6 +11,7 @@
35029 #include <asm/msr.h>
35030 #include <asm/processor-flags.h>
35031 #include <asm/page_types.h>
35032+#include <asm/alternative-asm.h>
35033
35034 #define SAVE_XMM \
35035 mov %rsp, %rax; \
35036@@ -88,6 +89,7 @@ ENTRY(efi_call)
35037 RESTORE_PGT
35038 addq $48, %rsp
35039 RESTORE_XMM
35040+ pax_force_retaddr 0, 1
35041 ret
35042 ENDPROC(efi_call)
35043
35044diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35045index 3005f0c..d06aeb0 100644
35046--- a/arch/x86/platform/intel-mid/intel-mid.c
35047+++ b/arch/x86/platform/intel-mid/intel-mid.c
35048@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
35049 /* intel_mid_ops to store sub arch ops */
35050 struct intel_mid_ops *intel_mid_ops;
35051 /* getter function for sub arch ops*/
35052-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35053+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35054 enum intel_mid_cpu_type __intel_mid_cpu_chip;
35055 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
35056
35057@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35058 {
35059 };
35060
35061-static void intel_mid_reboot(void)
35062+static void __noreturn intel_mid_reboot(void)
35063 {
35064 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35065+ BUG();
35066 }
35067
35068 static unsigned long __init intel_mid_calibrate_tsc(void)
35069diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35070index 3c1c386..59a68ed 100644
35071--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35072+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35073@@ -13,6 +13,6 @@
35074 /* For every CPU addition a new get_<cpuname>_ops interface needs
35075 * to be added.
35076 */
35077-extern void *get_penwell_ops(void);
35078-extern void *get_cloverview_ops(void);
35079-extern void *get_tangier_ops(void);
35080+extern const void *get_penwell_ops(void);
35081+extern const void *get_cloverview_ops(void);
35082+extern const void *get_tangier_ops(void);
35083diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35084index 23381d2..8ddc10e 100644
35085--- a/arch/x86/platform/intel-mid/mfld.c
35086+++ b/arch/x86/platform/intel-mid/mfld.c
35087@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35088 pm_power_off = mfld_power_off;
35089 }
35090
35091-void *get_penwell_ops(void)
35092+const void *get_penwell_ops(void)
35093 {
35094 return &penwell_ops;
35095 }
35096
35097-void *get_cloverview_ops(void)
35098+const void *get_cloverview_ops(void)
35099 {
35100 return &penwell_ops;
35101 }
35102diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35103index aaca917..66eadbc 100644
35104--- a/arch/x86/platform/intel-mid/mrfl.c
35105+++ b/arch/x86/platform/intel-mid/mrfl.c
35106@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35107 .arch_setup = tangier_arch_setup,
35108 };
35109
35110-void *get_tangier_ops(void)
35111+const void *get_tangier_ops(void)
35112 {
35113 return &tangier_ops;
35114 }
35115diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35116index 278e4da..55e8d8a 100644
35117--- a/arch/x86/platform/intel-quark/imr_selftest.c
35118+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35119@@ -55,7 +55,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35120 */
35121 static void __init imr_self_test(void)
35122 {
35123- phys_addr_t base = virt_to_phys(&_text);
35124+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35125 size_t size = virt_to_phys(&__end_rodata) - base;
35126 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35127 int ret;
35128diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35129index d6ee929..3637cb5 100644
35130--- a/arch/x86/platform/olpc/olpc_dt.c
35131+++ b/arch/x86/platform/olpc/olpc_dt.c
35132@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35133 return res;
35134 }
35135
35136-static struct of_pdt_ops prom_olpc_ops __initdata = {
35137+static struct of_pdt_ops prom_olpc_ops __initconst = {
35138 .nextprop = olpc_dt_nextprop,
35139 .getproplen = olpc_dt_getproplen,
35140 .getproperty = olpc_dt_getproperty,
35141diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35142index 757678f..9895d9b 100644
35143--- a/arch/x86/power/cpu.c
35144+++ b/arch/x86/power/cpu.c
35145@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35146 static void fix_processor_context(void)
35147 {
35148 int cpu = smp_processor_id();
35149- struct tss_struct *t = &per_cpu(cpu_tss, cpu);
35150-#ifdef CONFIG_X86_64
35151- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35152- tss_desc tss;
35153-#endif
35154+ struct tss_struct *t = cpu_tss + cpu;
35155+
35156 set_tss_desc(cpu, t); /*
35157 * This just modifies memory; should not be
35158 * necessary. But... This is necessary, because
35159@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35160 */
35161
35162 #ifdef CONFIG_X86_64
35163- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35164- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35165- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35166-
35167 syscall_init(); /* This sets MSR_*STAR and related */
35168 #endif
35169 load_TR_desc(); /* This does ltr */
35170diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35171index 0b7a63d..0d0f2c2 100644
35172--- a/arch/x86/realmode/init.c
35173+++ b/arch/x86/realmode/init.c
35174@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35175 __va(real_mode_header->trampoline_header);
35176
35177 #ifdef CONFIG_X86_32
35178- trampoline_header->start = __pa_symbol(startup_32_smp);
35179+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35180+
35181+#ifdef CONFIG_PAX_KERNEXEC
35182+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35183+#endif
35184+
35185+ trampoline_header->boot_cs = __BOOT_CS;
35186 trampoline_header->gdt_limit = __BOOT_DS + 7;
35187 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35188 #else
35189@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35190 *trampoline_cr4_features = __read_cr4();
35191
35192 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35193- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35194+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35195 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35196 #endif
35197 }
35198diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35199index 2730d77..2e4cd19 100644
35200--- a/arch/x86/realmode/rm/Makefile
35201+++ b/arch/x86/realmode/rm/Makefile
35202@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35203
35204 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35205 -I$(srctree)/arch/x86/boot
35206+ifdef CONSTIFY_PLUGIN
35207+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35208+endif
35209 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35210 GCOV_PROFILE := n
35211diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35212index a28221d..93c40f1 100644
35213--- a/arch/x86/realmode/rm/header.S
35214+++ b/arch/x86/realmode/rm/header.S
35215@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35216 #endif
35217 /* APM/BIOS reboot */
35218 .long pa_machine_real_restart_asm
35219-#ifdef CONFIG_X86_64
35220+#ifdef CONFIG_X86_32
35221+ .long __KERNEL_CS
35222+#else
35223 .long __KERNEL32_CS
35224 #endif
35225 END(real_mode_header)
35226diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35227index d66c607..3def845 100644
35228--- a/arch/x86/realmode/rm/reboot.S
35229+++ b/arch/x86/realmode/rm/reboot.S
35230@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35231 lgdtl pa_tr_gdt
35232
35233 /* Disable paging to drop us out of long mode */
35234+ movl %cr4, %eax
35235+ andl $~X86_CR4_PCIDE, %eax
35236+ movl %eax, %cr4
35237+
35238 movl %cr0, %eax
35239 andl $~X86_CR0_PG, %eax
35240 movl %eax, %cr0
35241diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35242index 48ddd76..c26749f 100644
35243--- a/arch/x86/realmode/rm/trampoline_32.S
35244+++ b/arch/x86/realmode/rm/trampoline_32.S
35245@@ -24,6 +24,12 @@
35246 #include <asm/page_types.h>
35247 #include "realmode.h"
35248
35249+#ifdef CONFIG_PAX_KERNEXEC
35250+#define ta(X) (X)
35251+#else
35252+#define ta(X) (pa_ ## X)
35253+#endif
35254+
35255 .text
35256 .code16
35257
35258@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35259
35260 cli # We should be safe anyway
35261
35262- movl tr_start, %eax # where we need to go
35263-
35264 movl $0xA5A5A5A5, trampoline_status
35265 # write marker for master knows we're running
35266
35267@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35268 movw $1, %dx # protected mode (PE) bit
35269 lmsw %dx # into protected mode
35270
35271- ljmpl $__BOOT_CS, $pa_startup_32
35272+ ljmpl *(trampoline_header)
35273
35274 .section ".text32","ax"
35275 .code32
35276@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35277 .balign 8
35278 GLOBAL(trampoline_header)
35279 tr_start: .space 4
35280- tr_gdt_pad: .space 2
35281+ tr_boot_cs: .space 2
35282 tr_gdt: .space 6
35283 END(trampoline_header)
35284
35285diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35286index dac7b20..72dbaca 100644
35287--- a/arch/x86/realmode/rm/trampoline_64.S
35288+++ b/arch/x86/realmode/rm/trampoline_64.S
35289@@ -93,6 +93,7 @@ ENTRY(startup_32)
35290 movl %edx, %gs
35291
35292 movl pa_tr_cr4, %eax
35293+ andl $~X86_CR4_PCIDE, %eax
35294 movl %eax, %cr4 # Enable PAE mode
35295
35296 # Setup trampoline 4 level pagetables
35297@@ -106,7 +107,7 @@ ENTRY(startup_32)
35298 wrmsr
35299
35300 # Enable paging and in turn activate Long Mode
35301- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35302+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35303 movl %eax, %cr0
35304
35305 /*
35306diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35307index 9e7e147..25a4158 100644
35308--- a/arch/x86/realmode/rm/wakeup_asm.S
35309+++ b/arch/x86/realmode/rm/wakeup_asm.S
35310@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35311 lgdtl pmode_gdt
35312
35313 /* This really couldn't... */
35314- movl pmode_entry, %eax
35315 movl pmode_cr0, %ecx
35316 movl %ecx, %cr0
35317- ljmpl $__KERNEL_CS, $pa_startup_32
35318- /* -> jmp *%eax in trampoline_32.S */
35319+
35320+ ljmpl *pmode_entry
35321 #else
35322 jmp trampoline_start
35323 #endif
35324diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35325index 604a37e..e49702a 100644
35326--- a/arch/x86/tools/Makefile
35327+++ b/arch/x86/tools/Makefile
35328@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35329
35330 $(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
35331
35332-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35333+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35334 hostprogs-y += relocs
35335 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35336 PHONY += relocs
35337diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35338index 0c2fae8..88036b7 100644
35339--- a/arch/x86/tools/relocs.c
35340+++ b/arch/x86/tools/relocs.c
35341@@ -1,5 +1,7 @@
35342 /* This is included from relocs_32/64.c */
35343
35344+#include "../../../include/generated/autoconf.h"
35345+
35346 #define ElfW(type) _ElfW(ELF_BITS, type)
35347 #define _ElfW(bits, type) __ElfW(bits, type)
35348 #define __ElfW(bits, type) Elf##bits##_##type
35349@@ -11,6 +13,7 @@
35350 #define Elf_Sym ElfW(Sym)
35351
35352 static Elf_Ehdr ehdr;
35353+static Elf_Phdr *phdr;
35354
35355 struct relocs {
35356 uint32_t *offset;
35357@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35358 }
35359 }
35360
35361+static void read_phdrs(FILE *fp)
35362+{
35363+ unsigned int i;
35364+
35365+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35366+ if (!phdr) {
35367+ die("Unable to allocate %d program headers\n",
35368+ ehdr.e_phnum);
35369+ }
35370+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35371+ die("Seek to %d failed: %s\n",
35372+ ehdr.e_phoff, strerror(errno));
35373+ }
35374+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35375+ die("Cannot read ELF program headers: %s\n",
35376+ strerror(errno));
35377+ }
35378+ for(i = 0; i < ehdr.e_phnum; i++) {
35379+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35380+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35381+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35382+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35383+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35384+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35385+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35386+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35387+ }
35388+
35389+}
35390+
35391 static void read_shdrs(FILE *fp)
35392 {
35393- int i;
35394+ unsigned int i;
35395 Elf_Shdr shdr;
35396
35397 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35398@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35399
35400 static void read_strtabs(FILE *fp)
35401 {
35402- int i;
35403+ unsigned int i;
35404 for (i = 0; i < ehdr.e_shnum; i++) {
35405 struct section *sec = &secs[i];
35406 if (sec->shdr.sh_type != SHT_STRTAB) {
35407@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35408
35409 static void read_symtabs(FILE *fp)
35410 {
35411- int i,j;
35412+ unsigned int i,j;
35413 for (i = 0; i < ehdr.e_shnum; i++) {
35414 struct section *sec = &secs[i];
35415 if (sec->shdr.sh_type != SHT_SYMTAB) {
35416@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35417 }
35418
35419
35420-static void read_relocs(FILE *fp)
35421+static void read_relocs(FILE *fp, int use_real_mode)
35422 {
35423- int i,j;
35424+ unsigned int i,j;
35425+ uint32_t base;
35426+
35427 for (i = 0; i < ehdr.e_shnum; i++) {
35428 struct section *sec = &secs[i];
35429 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35430@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35431 die("Cannot read symbol table: %s\n",
35432 strerror(errno));
35433 }
35434+ base = 0;
35435+
35436+#ifdef CONFIG_X86_32
35437+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35438+ if (phdr[j].p_type != PT_LOAD )
35439+ continue;
35440+ 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)
35441+ continue;
35442+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35443+ break;
35444+ }
35445+#endif
35446+
35447 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35448 Elf_Rel *rel = &sec->reltab[j];
35449- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35450+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35451 rel->r_info = elf_xword_to_cpu(rel->r_info);
35452 #if (SHT_REL_TYPE == SHT_RELA)
35453 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35454@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35455
35456 static void print_absolute_symbols(void)
35457 {
35458- int i;
35459+ unsigned int i;
35460 const char *format;
35461
35462 if (ELF_BITS == 64)
35463@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35464 for (i = 0; i < ehdr.e_shnum; i++) {
35465 struct section *sec = &secs[i];
35466 char *sym_strtab;
35467- int j;
35468+ unsigned int j;
35469
35470 if (sec->shdr.sh_type != SHT_SYMTAB) {
35471 continue;
35472@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35473
35474 static void print_absolute_relocs(void)
35475 {
35476- int i, printed = 0;
35477+ unsigned int i, printed = 0;
35478 const char *format;
35479
35480 if (ELF_BITS == 64)
35481@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35482 struct section *sec_applies, *sec_symtab;
35483 char *sym_strtab;
35484 Elf_Sym *sh_symtab;
35485- int j;
35486+ unsigned int j;
35487 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35488 continue;
35489 }
35490@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35491 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35492 Elf_Sym *sym, const char *symname))
35493 {
35494- int i;
35495+ unsigned int i;
35496 /* Walk through the relocations */
35497 for (i = 0; i < ehdr.e_shnum; i++) {
35498 char *sym_strtab;
35499 Elf_Sym *sh_symtab;
35500 struct section *sec_applies, *sec_symtab;
35501- int j;
35502+ unsigned int j;
35503 struct section *sec = &secs[i];
35504
35505 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35506@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35507 {
35508 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35509 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35510+ char *sym_strtab = sec->link->link->strtab;
35511+
35512+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35513+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35514+ return 0;
35515+
35516+#ifdef CONFIG_PAX_KERNEXEC
35517+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35518+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35519+ return 0;
35520+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35521+ return 0;
35522+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35523+ return 0;
35524+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35525+ return 0;
35526+#endif
35527
35528 switch (r_type) {
35529 case R_386_NONE:
35530@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35531
35532 static void emit_relocs(int as_text, int use_real_mode)
35533 {
35534- int i;
35535+ unsigned int i;
35536 int (*write_reloc)(uint32_t, FILE *) = write32;
35537 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35538 const char *symname);
35539@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35540 {
35541 regex_init(use_real_mode);
35542 read_ehdr(fp);
35543+ read_phdrs(fp);
35544 read_shdrs(fp);
35545 read_strtabs(fp);
35546 read_symtabs(fp);
35547- read_relocs(fp);
35548+ read_relocs(fp, use_real_mode);
35549 if (ELF_BITS == 64)
35550 percpu_init();
35551 if (show_absolute_syms) {
35552diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35553index f40281e..92728c9 100644
35554--- a/arch/x86/um/mem_32.c
35555+++ b/arch/x86/um/mem_32.c
35556@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35557 gate_vma.vm_start = FIXADDR_USER_START;
35558 gate_vma.vm_end = FIXADDR_USER_END;
35559 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35560- gate_vma.vm_page_prot = __P101;
35561+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35562
35563 return 0;
35564 }
35565diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35566index 80ffa5b..a33bd15 100644
35567--- a/arch/x86/um/tls_32.c
35568+++ b/arch/x86/um/tls_32.c
35569@@ -260,7 +260,7 @@ out:
35570 if (unlikely(task == current &&
35571 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35572 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35573- "without flushed TLS.", current->pid);
35574+ "without flushed TLS.", task_pid_nr(current));
35575 }
35576
35577 return 0;
35578diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35579index e970320..c006fea 100644
35580--- a/arch/x86/vdso/Makefile
35581+++ b/arch/x86/vdso/Makefile
35582@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35583 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35584 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35585
35586-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35587+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35588 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35589 GCOV_PROFILE := n
35590
35591diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35592index 0224987..c7d65a5 100644
35593--- a/arch/x86/vdso/vdso2c.h
35594+++ b/arch/x86/vdso/vdso2c.h
35595@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35596 unsigned long load_size = -1; /* Work around bogus warning */
35597 unsigned long mapping_size;
35598 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35599- int i;
35600+ unsigned int i;
35601 unsigned long j;
35602 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35603 *alt_sec = NULL;
35604diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35605index e904c27..b9eaa03 100644
35606--- a/arch/x86/vdso/vdso32-setup.c
35607+++ b/arch/x86/vdso/vdso32-setup.c
35608@@ -14,6 +14,7 @@
35609 #include <asm/cpufeature.h>
35610 #include <asm/processor.h>
35611 #include <asm/vdso.h>
35612+#include <asm/mman.h>
35613
35614 #ifdef CONFIG_COMPAT_VDSO
35615 #define VDSO_DEFAULT 0
35616diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35617index 1c9f750..cfddb1a 100644
35618--- a/arch/x86/vdso/vma.c
35619+++ b/arch/x86/vdso/vma.c
35620@@ -19,10 +19,7 @@
35621 #include <asm/page.h>
35622 #include <asm/hpet.h>
35623 #include <asm/desc.h>
35624-
35625-#if defined(CONFIG_X86_64)
35626-unsigned int __read_mostly vdso64_enabled = 1;
35627-#endif
35628+#include <asm/mman.h>
35629
35630 void __init init_vdso_image(const struct vdso_image *image)
35631 {
35632@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35633 .pages = no_pages,
35634 };
35635
35636+#ifdef CONFIG_PAX_RANDMMAP
35637+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35638+ calculate_addr = false;
35639+#endif
35640+
35641 if (calculate_addr) {
35642 addr = vdso_addr(current->mm->start_stack,
35643 image->size - image->sym_vvar_start);
35644@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35645 down_write(&mm->mmap_sem);
35646
35647 addr = get_unmapped_area(NULL, addr,
35648- image->size - image->sym_vvar_start, 0, 0);
35649+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35650 if (IS_ERR_VALUE(addr)) {
35651 ret = addr;
35652 goto up_fail;
35653 }
35654
35655 text_start = addr - image->sym_vvar_start;
35656- current->mm->context.vdso = (void __user *)text_start;
35657+ mm->context.vdso = text_start;
35658
35659 /*
35660 * MAYWRITE to allow gdb to COW and set breakpoints
35661@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35662 hpet_address >> PAGE_SHIFT,
35663 PAGE_SIZE,
35664 pgprot_noncached(PAGE_READONLY));
35665-
35666- if (ret)
35667- goto up_fail;
35668 }
35669 #endif
35670
35671 up_fail:
35672 if (ret)
35673- current->mm->context.vdso = NULL;
35674+ current->mm->context.vdso = 0;
35675
35676 up_write(&mm->mmap_sem);
35677 return ret;
35678@@ -191,8 +190,8 @@ static int load_vdso32(void)
35679
35680 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35681 current_thread_info()->sysenter_return =
35682- current->mm->context.vdso +
35683- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35684+ (void __force_user *)(current->mm->context.vdso +
35685+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35686
35687 return 0;
35688 }
35689@@ -201,9 +200,6 @@ static int load_vdso32(void)
35690 #ifdef CONFIG_X86_64
35691 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35692 {
35693- if (!vdso64_enabled)
35694- return 0;
35695-
35696 return map_vdso(&vdso_image_64, true);
35697 }
35698
35699@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35700 int uses_interp)
35701 {
35702 #ifdef CONFIG_X86_X32_ABI
35703- if (test_thread_flag(TIF_X32)) {
35704- if (!vdso64_enabled)
35705- return 0;
35706-
35707+ if (test_thread_flag(TIF_X32))
35708 return map_vdso(&vdso_image_x32, true);
35709- }
35710 #endif
35711
35712 return load_vdso32();
35713@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35714 #endif
35715
35716 #ifdef CONFIG_X86_64
35717-static __init int vdso_setup(char *s)
35718-{
35719- vdso64_enabled = simple_strtoul(s, NULL, 0);
35720- return 0;
35721-}
35722-__setup("vdso=", vdso_setup);
35723-#endif
35724-
35725-#ifdef CONFIG_X86_64
35726 static void vgetcpu_cpu_init(void *arg)
35727 {
35728 int cpu = smp_processor_id();
35729diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35730index e88fda8..76ce7ce 100644
35731--- a/arch/x86/xen/Kconfig
35732+++ b/arch/x86/xen/Kconfig
35733@@ -9,6 +9,7 @@ config XEN
35734 select XEN_HAVE_PVMMU
35735 depends on X86_64 || (X86_32 && X86_PAE)
35736 depends on X86_TSC
35737+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35738 help
35739 This is the Linux Xen port. Enabling this will allow the
35740 kernel to boot in a paravirtualized environment under the
35741diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35742index a671e83..a9dc1d9 100644
35743--- a/arch/x86/xen/enlighten.c
35744+++ b/arch/x86/xen/enlighten.c
35745@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35746
35747 struct shared_info xen_dummy_shared_info;
35748
35749-void *xen_initial_gdt;
35750-
35751 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35752 __read_mostly int xen_have_vector_callback;
35753 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35754@@ -584,8 +582,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35755 {
35756 unsigned long va = dtr->address;
35757 unsigned int size = dtr->size + 1;
35758- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35759- unsigned long frames[pages];
35760+ unsigned long frames[65536 / PAGE_SIZE];
35761 int f;
35762
35763 /*
35764@@ -633,8 +630,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35765 {
35766 unsigned long va = dtr->address;
35767 unsigned int size = dtr->size + 1;
35768- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35769- unsigned long frames[pages];
35770+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35771 int f;
35772
35773 /*
35774@@ -642,7 +638,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35775 * 8-byte entries, or 16 4k pages..
35776 */
35777
35778- BUG_ON(size > 65536);
35779+ BUG_ON(size > GDT_SIZE);
35780 BUG_ON(va & ~PAGE_MASK);
35781
35782 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35783@@ -1263,30 +1259,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35784 #endif
35785 };
35786
35787-static void xen_reboot(int reason)
35788+static __noreturn void xen_reboot(int reason)
35789 {
35790 struct sched_shutdown r = { .reason = reason };
35791
35792- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35793- BUG();
35794+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35795+ BUG();
35796 }
35797
35798-static void xen_restart(char *msg)
35799+static __noreturn void xen_restart(char *msg)
35800 {
35801 xen_reboot(SHUTDOWN_reboot);
35802 }
35803
35804-static void xen_emergency_restart(void)
35805+static __noreturn void xen_emergency_restart(void)
35806 {
35807 xen_reboot(SHUTDOWN_reboot);
35808 }
35809
35810-static void xen_machine_halt(void)
35811+static __noreturn void xen_machine_halt(void)
35812 {
35813 xen_reboot(SHUTDOWN_poweroff);
35814 }
35815
35816-static void xen_machine_power_off(void)
35817+static __noreturn void xen_machine_power_off(void)
35818 {
35819 if (pm_power_off)
35820 pm_power_off();
35821@@ -1439,8 +1435,11 @@ static void __ref xen_setup_gdt(int cpu)
35822 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35823 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35824
35825- setup_stack_canary_segment(0);
35826- switch_to_new_gdt(0);
35827+ setup_stack_canary_segment(cpu);
35828+#ifdef CONFIG_X86_64
35829+ load_percpu_segment(cpu);
35830+#endif
35831+ switch_to_new_gdt(cpu);
35832
35833 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35834 pv_cpu_ops.load_gdt = xen_load_gdt;
35835@@ -1555,7 +1554,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35836 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35837
35838 /* Work out if we support NX */
35839- x86_configure_nx();
35840+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35841+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35842+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35843+ unsigned l, h;
35844+
35845+ __supported_pte_mask |= _PAGE_NX;
35846+ rdmsr(MSR_EFER, l, h);
35847+ l |= EFER_NX;
35848+ wrmsr(MSR_EFER, l, h);
35849+ }
35850+#endif
35851
35852 /* Get mfn list */
35853 xen_build_dynamic_phys_to_machine();
35854@@ -1583,13 +1592,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35855
35856 machine_ops = xen_machine_ops;
35857
35858- /*
35859- * The only reliable way to retain the initial address of the
35860- * percpu gdt_page is to remember it here, so we can go and
35861- * mark it RW later, when the initial percpu area is freed.
35862- */
35863- xen_initial_gdt = &per_cpu(gdt_page, 0);
35864-
35865 xen_smp_init();
35866
35867 #ifdef CONFIG_ACPI_NUMA
35868diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35869index dd151b2..d5ab952 100644
35870--- a/arch/x86/xen/mmu.c
35871+++ b/arch/x86/xen/mmu.c
35872@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35873 return val;
35874 }
35875
35876-static pteval_t pte_pfn_to_mfn(pteval_t val)
35877+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35878 {
35879 if (val & _PAGE_PRESENT) {
35880 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35881@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35882 * L3_k[511] -> level2_fixmap_pgt */
35883 convert_pfn_mfn(level3_kernel_pgt);
35884
35885+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35886+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35887+ convert_pfn_mfn(level3_vmemmap_pgt);
35888 /* L3_k[511][506] -> level1_fixmap_pgt */
35889+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35890 convert_pfn_mfn(level2_fixmap_pgt);
35891 }
35892 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35893@@ -1860,11 +1864,18 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35894 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35895 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35896 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35897+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35898+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35899+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35900 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35901 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35902+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35903 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35904 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35905- set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35906+ set_page_prot(level1_fixmap_pgt[0], PAGE_KERNEL_RO);
35907+ set_page_prot(level1_fixmap_pgt[1], PAGE_KERNEL_RO);
35908+ set_page_prot(level1_fixmap_pgt[2], PAGE_KERNEL_RO);
35909+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35910
35911 /* Pin down new L4 */
35912 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35913@@ -2048,6 +2059,7 @@ static void __init xen_post_allocator_init(void)
35914 pv_mmu_ops.set_pud = xen_set_pud;
35915 #if CONFIG_PGTABLE_LEVELS == 4
35916 pv_mmu_ops.set_pgd = xen_set_pgd;
35917+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35918 #endif
35919
35920 /* This will work as long as patching hasn't happened yet
35921@@ -2126,6 +2138,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35922 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35923 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35924 .set_pgd = xen_set_pgd_hyper,
35925+ .set_pgd_batched = xen_set_pgd_hyper,
35926
35927 .alloc_pud = xen_alloc_pmd_init,
35928 .release_pud = xen_release_pmd_init,
35929diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35930index 8648438..18bac20 100644
35931--- a/arch/x86/xen/smp.c
35932+++ b/arch/x86/xen/smp.c
35933@@ -284,17 +284,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35934
35935 if (xen_pv_domain()) {
35936 if (!xen_feature(XENFEAT_writable_page_tables))
35937- /* We've switched to the "real" per-cpu gdt, so make
35938- * sure the old memory can be recycled. */
35939- make_lowmem_page_readwrite(xen_initial_gdt);
35940-
35941 #ifdef CONFIG_X86_32
35942 /*
35943 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35944 * expects __USER_DS
35945 */
35946- loadsegment(ds, __USER_DS);
35947- loadsegment(es, __USER_DS);
35948+ loadsegment(ds, __KERNEL_DS);
35949+ loadsegment(es, __KERNEL_DS);
35950 #endif
35951
35952 xen_filter_cpu_maps();
35953@@ -375,7 +371,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35954 #ifdef CONFIG_X86_32
35955 /* Note: PVH is not yet supported on x86_32. */
35956 ctxt->user_regs.fs = __KERNEL_PERCPU;
35957- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35958+ savesegment(gs, ctxt->user_regs.gs);
35959 #endif
35960 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
35961
35962@@ -383,8 +379,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35963 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35964 ctxt->flags = VGCF_IN_KERNEL;
35965 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35966- ctxt->user_regs.ds = __USER_DS;
35967- ctxt->user_regs.es = __USER_DS;
35968+ ctxt->user_regs.ds = __KERNEL_DS;
35969+ ctxt->user_regs.es = __KERNEL_DS;
35970 ctxt->user_regs.ss = __KERNEL_DS;
35971
35972 xen_copy_trap_info(ctxt->trap_ctxt);
35973@@ -720,7 +716,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35974
35975 void __init xen_smp_init(void)
35976 {
35977- smp_ops = xen_smp_ops;
35978+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35979 xen_fill_possible_map();
35980 }
35981
35982diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35983index fd92a64..1f72641 100644
35984--- a/arch/x86/xen/xen-asm_32.S
35985+++ b/arch/x86/xen/xen-asm_32.S
35986@@ -99,7 +99,7 @@ ENTRY(xen_iret)
35987 pushw %fs
35988 movl $(__KERNEL_PERCPU), %eax
35989 movl %eax, %fs
35990- movl %fs:xen_vcpu, %eax
35991+ mov PER_CPU_VAR(xen_vcpu), %eax
35992 POP_FS
35993 #else
35994 movl %ss:xen_vcpu, %eax
35995diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35996index 8afdfcc..79239db 100644
35997--- a/arch/x86/xen/xen-head.S
35998+++ b/arch/x86/xen/xen-head.S
35999@@ -41,6 +41,17 @@ ENTRY(startup_xen)
36000 #ifdef CONFIG_X86_32
36001 mov %esi,xen_start_info
36002 mov $init_thread_union+THREAD_SIZE,%esp
36003+#ifdef CONFIG_SMP
36004+ movl $cpu_gdt_table,%edi
36005+ movl $__per_cpu_load,%eax
36006+ movw %ax,__KERNEL_PERCPU + 2(%edi)
36007+ rorl $16,%eax
36008+ movb %al,__KERNEL_PERCPU + 4(%edi)
36009+ movb %ah,__KERNEL_PERCPU + 7(%edi)
36010+ movl $__per_cpu_end - 1,%eax
36011+ subl $__per_cpu_start,%eax
36012+ movw %ax,__KERNEL_PERCPU + 0(%edi)
36013+#endif
36014 #else
36015 mov %rsi,xen_start_info
36016 mov $init_thread_union+THREAD_SIZE,%rsp
36017diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
36018index 9e195c6..523ed36 100644
36019--- a/arch/x86/xen/xen-ops.h
36020+++ b/arch/x86/xen/xen-ops.h
36021@@ -16,8 +16,6 @@ void xen_syscall_target(void);
36022 void xen_syscall32_target(void);
36023 #endif
36024
36025-extern void *xen_initial_gdt;
36026-
36027 struct trap_info;
36028 void xen_copy_trap_info(struct trap_info *traps);
36029
36030diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
36031index 525bd3d..ef888b1 100644
36032--- a/arch/xtensa/variants/dc232b/include/variant/core.h
36033+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
36034@@ -119,9 +119,9 @@
36035 ----------------------------------------------------------------------*/
36036
36037 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
36038-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
36039 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
36040 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
36041+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36042
36043 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36044 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36045diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36046index 2f33760..835e50a 100644
36047--- a/arch/xtensa/variants/fsf/include/variant/core.h
36048+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36049@@ -11,6 +11,7 @@
36050 #ifndef _XTENSA_CORE_H
36051 #define _XTENSA_CORE_H
36052
36053+#include <linux/const.h>
36054
36055 /****************************************************************************
36056 Parameters Useful for Any Code, USER or PRIVILEGED
36057@@ -112,9 +113,9 @@
36058 ----------------------------------------------------------------------*/
36059
36060 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36061-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36062 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36063 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36064+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36065
36066 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36067 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36068diff --git a/block/bio.c b/block/bio.c
36069index 4441522..dedbafc 100644
36070--- a/block/bio.c
36071+++ b/block/bio.c
36072@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36073 /*
36074 * Overflow, abort
36075 */
36076- if (end < start)
36077+ if (end < start || end - start > INT_MAX - nr_pages)
36078 return ERR_PTR(-EINVAL);
36079
36080 nr_pages += end - start;
36081@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
36082 /*
36083 * Overflow, abort
36084 */
36085- if (end < start)
36086+ if (end < start || end - start > INT_MAX - nr_pages)
36087 return ERR_PTR(-EINVAL);
36088
36089 nr_pages += end - start;
36090diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36091index 0736729..2ec3b48 100644
36092--- a/block/blk-iopoll.c
36093+++ b/block/blk-iopoll.c
36094@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36095 }
36096 EXPORT_SYMBOL(blk_iopoll_complete);
36097
36098-static void blk_iopoll_softirq(struct softirq_action *h)
36099+static __latent_entropy void blk_iopoll_softirq(void)
36100 {
36101 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36102 int rearm = 0, budget = blk_iopoll_budget;
36103diff --git a/block/blk-map.c b/block/blk-map.c
36104index da310a1..213b5c9 100644
36105--- a/block/blk-map.c
36106+++ b/block/blk-map.c
36107@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36108 if (!len || !kbuf)
36109 return -EINVAL;
36110
36111- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36112+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36113 if (do_copy)
36114 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36115 else
36116diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36117index 53b1737..08177d2e 100644
36118--- a/block/blk-softirq.c
36119+++ b/block/blk-softirq.c
36120@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36121 * Softirq action handler - move entries to local list and loop over them
36122 * while passing them to the queue registered handler.
36123 */
36124-static void blk_done_softirq(struct softirq_action *h)
36125+static __latent_entropy void blk_done_softirq(void)
36126 {
36127 struct list_head *cpu_list, local_list;
36128
36129diff --git a/block/bsg.c b/block/bsg.c
36130index d214e92..9649863 100644
36131--- a/block/bsg.c
36132+++ b/block/bsg.c
36133@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36134 struct sg_io_v4 *hdr, struct bsg_device *bd,
36135 fmode_t has_write_perm)
36136 {
36137+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36138+ unsigned char *cmdptr;
36139+
36140 if (hdr->request_len > BLK_MAX_CDB) {
36141 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36142 if (!rq->cmd)
36143 return -ENOMEM;
36144- }
36145+ cmdptr = rq->cmd;
36146+ } else
36147+ cmdptr = tmpcmd;
36148
36149- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36150+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36151 hdr->request_len))
36152 return -EFAULT;
36153
36154+ if (cmdptr != rq->cmd)
36155+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36156+
36157 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36158 if (blk_verify_command(rq->cmd, has_write_perm))
36159 return -EPERM;
36160diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36161index f678c73..f35aa18 100644
36162--- a/block/compat_ioctl.c
36163+++ b/block/compat_ioctl.c
36164@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36165 cgc = compat_alloc_user_space(sizeof(*cgc));
36166 cgc32 = compat_ptr(arg);
36167
36168- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36169+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36170 get_user(data, &cgc32->buffer) ||
36171 put_user(compat_ptr(data), &cgc->buffer) ||
36172 copy_in_user(&cgc->buflen, &cgc32->buflen,
36173@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36174 err |= __get_user(f->spec1, &uf->spec1);
36175 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36176 err |= __get_user(name, &uf->name);
36177- f->name = compat_ptr(name);
36178+ f->name = (void __force_kernel *)compat_ptr(name);
36179 if (err) {
36180 err = -EFAULT;
36181 goto out;
36182diff --git a/block/genhd.c b/block/genhd.c
36183index ea982ea..86e0f9e 100644
36184--- a/block/genhd.c
36185+++ b/block/genhd.c
36186@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36187
36188 /*
36189 * Register device numbers dev..(dev+range-1)
36190- * range must be nonzero
36191+ * Noop if @range is zero.
36192 * The hash chain is sorted on range, so that subranges can override.
36193 */
36194 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36195 struct kobject *(*probe)(dev_t, int *, void *),
36196 int (*lock)(dev_t, void *), void *data)
36197 {
36198- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36199+ if (range)
36200+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36201 }
36202
36203 EXPORT_SYMBOL(blk_register_region);
36204
36205+/* undo blk_register_region(), noop if @range is zero */
36206 void blk_unregister_region(dev_t devt, unsigned long range)
36207 {
36208- kobj_unmap(bdev_map, devt, range);
36209+ if (range)
36210+ kobj_unmap(bdev_map, devt, range);
36211 }
36212
36213 EXPORT_SYMBOL(blk_unregister_region);
36214diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36215index 26cb624..a49c3a5 100644
36216--- a/block/partitions/efi.c
36217+++ b/block/partitions/efi.c
36218@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36219 if (!gpt)
36220 return NULL;
36221
36222+ if (!le32_to_cpu(gpt->num_partition_entries))
36223+ return NULL;
36224+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36225+ if (!pte)
36226+ return NULL;
36227+
36228 count = le32_to_cpu(gpt->num_partition_entries) *
36229 le32_to_cpu(gpt->sizeof_partition_entry);
36230- if (!count)
36231- return NULL;
36232- pte = kmalloc(count, GFP_KERNEL);
36233- if (!pte)
36234- return NULL;
36235-
36236 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36237 (u8 *) pte, count) < count) {
36238 kfree(pte);
36239diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36240index 55b6f15..b602c9a 100644
36241--- a/block/scsi_ioctl.c
36242+++ b/block/scsi_ioctl.c
36243@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36244 return put_user(0, p);
36245 }
36246
36247-static int sg_get_timeout(struct request_queue *q)
36248+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36249 {
36250 return jiffies_to_clock_t(q->sg_timeout);
36251 }
36252@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36253 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36254 struct sg_io_hdr *hdr, fmode_t mode)
36255 {
36256- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36257+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36258+ unsigned char *cmdptr;
36259+
36260+ if (rq->cmd != rq->__cmd)
36261+ cmdptr = rq->cmd;
36262+ else
36263+ cmdptr = tmpcmd;
36264+
36265+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36266 return -EFAULT;
36267+
36268+ if (cmdptr != rq->cmd)
36269+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36270+
36271 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36272 return -EPERM;
36273
36274@@ -420,6 +432,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36275 int err;
36276 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36277 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36278+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36279+ unsigned char *cmdptr;
36280
36281 if (!sic)
36282 return -EINVAL;
36283@@ -458,9 +472,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36284 */
36285 err = -EFAULT;
36286 rq->cmd_len = cmdlen;
36287- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36288+
36289+ if (rq->cmd != rq->__cmd)
36290+ cmdptr = rq->cmd;
36291+ else
36292+ cmdptr = tmpcmd;
36293+
36294+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36295 goto error;
36296
36297+ if (rq->cmd != cmdptr)
36298+ memcpy(rq->cmd, cmdptr, cmdlen);
36299+
36300 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36301 goto error;
36302
36303diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36304index b0602ba..fb71850 100644
36305--- a/crypto/cryptd.c
36306+++ b/crypto/cryptd.c
36307@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36308
36309 struct cryptd_blkcipher_request_ctx {
36310 crypto_completion_t complete;
36311-};
36312+} __no_const;
36313
36314 struct cryptd_hash_ctx {
36315 struct crypto_shash *child;
36316@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36317
36318 struct cryptd_aead_request_ctx {
36319 crypto_completion_t complete;
36320-};
36321+} __no_const;
36322
36323 static void cryptd_queue_worker(struct work_struct *work);
36324
36325diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36326index c305d41..a96de79 100644
36327--- a/crypto/pcrypt.c
36328+++ b/crypto/pcrypt.c
36329@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36330 int ret;
36331
36332 pinst->kobj.kset = pcrypt_kset;
36333- ret = kobject_add(&pinst->kobj, NULL, name);
36334+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36335 if (!ret)
36336 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36337
36338diff --git a/crypto/zlib.c b/crypto/zlib.c
36339index 0eefa9d..0fa3d29 100644
36340--- a/crypto/zlib.c
36341+++ b/crypto/zlib.c
36342@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36343 zlib_comp_exit(ctx);
36344
36345 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36346- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36347+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36348 : MAX_WBITS;
36349 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36350- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36351+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36352 : DEF_MEM_LEVEL;
36353
36354 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36355diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36356index 3b37676..898edfa 100644
36357--- a/drivers/acpi/acpica/hwxfsleep.c
36358+++ b/drivers/acpi/acpica/hwxfsleep.c
36359@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36360 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36361
36362 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36363- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36364- acpi_hw_extended_sleep},
36365- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36366- acpi_hw_extended_wake_prep},
36367- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36368+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36369+ .extended_function = acpi_hw_extended_sleep},
36370+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36371+ .extended_function = acpi_hw_extended_wake_prep},
36372+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36373+ .extended_function = acpi_hw_extended_wake}
36374 };
36375
36376 /*
36377diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36378index 16129c7..8b675cd 100644
36379--- a/drivers/acpi/apei/apei-internal.h
36380+++ b/drivers/acpi/apei/apei-internal.h
36381@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36382 struct apei_exec_ins_type {
36383 u32 flags;
36384 apei_exec_ins_func_t run;
36385-};
36386+} __do_const;
36387
36388 struct apei_exec_context {
36389 u32 ip;
36390diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36391index e82d097..0c855c1 100644
36392--- a/drivers/acpi/apei/ghes.c
36393+++ b/drivers/acpi/apei/ghes.c
36394@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36395 const struct acpi_hest_generic *generic,
36396 const struct acpi_hest_generic_status *estatus)
36397 {
36398- static atomic_t seqno;
36399+ static atomic_unchecked_t seqno;
36400 unsigned int curr_seqno;
36401 char pfx_seq[64];
36402
36403@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36404 else
36405 pfx = KERN_ERR;
36406 }
36407- curr_seqno = atomic_inc_return(&seqno);
36408+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36409 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36410 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36411 pfx_seq, generic->header.source_id);
36412diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36413index a83e3c6..c3d617f 100644
36414--- a/drivers/acpi/bgrt.c
36415+++ b/drivers/acpi/bgrt.c
36416@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36417 if (!bgrt_image)
36418 return -ENODEV;
36419
36420- bin_attr_image.private = bgrt_image;
36421- bin_attr_image.size = bgrt_image_size;
36422+ pax_open_kernel();
36423+ *(void **)&bin_attr_image.private = bgrt_image;
36424+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36425+ pax_close_kernel();
36426
36427 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36428 if (!bgrt_kobj)
36429diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36430index 1d17919..315e955 100644
36431--- a/drivers/acpi/blacklist.c
36432+++ b/drivers/acpi/blacklist.c
36433@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36434 u32 is_critical_error;
36435 };
36436
36437-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36438+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36439
36440 /*
36441 * POLICY: If *anything* doesn't work, put it on the blacklist.
36442@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36443 return 0;
36444 }
36445
36446-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36447+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36448 {
36449 .callback = dmi_disable_osi_vista,
36450 .ident = "Fujitsu Siemens",
36451diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36452index 513e7230e..802015a 100644
36453--- a/drivers/acpi/bus.c
36454+++ b/drivers/acpi/bus.c
36455@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36456 }
36457 #endif
36458
36459-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36460+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36461 /*
36462 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36463 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36464@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36465 {}
36466 };
36467 #else
36468-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36469+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36470 {}
36471 };
36472 #endif
36473diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36474index c68e724..e863008 100644
36475--- a/drivers/acpi/custom_method.c
36476+++ b/drivers/acpi/custom_method.c
36477@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36478 struct acpi_table_header table;
36479 acpi_status status;
36480
36481+#ifdef CONFIG_GRKERNSEC_KMEM
36482+ return -EPERM;
36483+#endif
36484+
36485 if (!(*ppos)) {
36486 /* parse the table header to get the table length */
36487 if (count <= sizeof(struct acpi_table_header))
36488diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36489index 8217e0b..3294cb6 100644
36490--- a/drivers/acpi/device_pm.c
36491+++ b/drivers/acpi/device_pm.c
36492@@ -1026,6 +1026,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36493
36494 #endif /* CONFIG_PM_SLEEP */
36495
36496+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36497+
36498 static struct dev_pm_domain acpi_general_pm_domain = {
36499 .ops = {
36500 .runtime_suspend = acpi_subsys_runtime_suspend,
36501@@ -1042,6 +1044,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36502 .restore_early = acpi_subsys_resume_early,
36503 #endif
36504 },
36505+ .detach = acpi_dev_pm_detach
36506 };
36507
36508 /**
36509@@ -1111,7 +1114,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36510 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36511 }
36512
36513- dev->pm_domain->detach = acpi_dev_pm_detach;
36514 return 0;
36515 }
36516 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36517diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36518index 5e8fed4..d9bb545 100644
36519--- a/drivers/acpi/ec.c
36520+++ b/drivers/acpi/ec.c
36521@@ -1293,7 +1293,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36522 return 0;
36523 }
36524
36525-static struct dmi_system_id ec_dmi_table[] __initdata = {
36526+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36527 {
36528 ec_skip_dsdt_scan, "Compal JFL92", {
36529 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36530diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36531index 139d9e4..9a9d799 100644
36532--- a/drivers/acpi/pci_slot.c
36533+++ b/drivers/acpi/pci_slot.c
36534@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36535 return 0;
36536 }
36537
36538-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36539+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36540 /*
36541 * Fujitsu Primequest machines will return 1023 to indicate an
36542 * error if the _SUN method is evaluated on SxFy objects that
36543diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36544index d9f7158..168e742 100644
36545--- a/drivers/acpi/processor_driver.c
36546+++ b/drivers/acpi/processor_driver.c
36547@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36548 return NOTIFY_OK;
36549 }
36550
36551-static struct notifier_block __refdata acpi_cpu_notifier = {
36552+static struct notifier_block __refconst acpi_cpu_notifier = {
36553 .notifier_call = acpi_cpu_soft_notify,
36554 };
36555
36556diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36557index 39e0c8e..b5ae20c 100644
36558--- a/drivers/acpi/processor_idle.c
36559+++ b/drivers/acpi/processor_idle.c
36560@@ -910,7 +910,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36561 {
36562 int i, count = CPUIDLE_DRIVER_STATE_START;
36563 struct acpi_processor_cx *cx;
36564- struct cpuidle_state *state;
36565+ cpuidle_state_no_const *state;
36566 struct cpuidle_driver *drv = &acpi_idle_driver;
36567
36568 if (!pr->flags.power_setup_done)
36569diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36570index e5dd808..1eceed1 100644
36571--- a/drivers/acpi/processor_pdc.c
36572+++ b/drivers/acpi/processor_pdc.c
36573@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36574 return 0;
36575 }
36576
36577-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36578+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36579 {
36580 set_no_mwait, "Extensa 5220", {
36581 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36582diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36583index 2f0d4db..b9e9b15 100644
36584--- a/drivers/acpi/sleep.c
36585+++ b/drivers/acpi/sleep.c
36586@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36587 return 0;
36588 }
36589
36590-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36591+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36592 {
36593 .callback = init_old_suspend_ordering,
36594 .ident = "Abit KN9 (nForce4 variant)",
36595diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36596index 0876d77b..3ba0127 100644
36597--- a/drivers/acpi/sysfs.c
36598+++ b/drivers/acpi/sysfs.c
36599@@ -423,11 +423,11 @@ static u32 num_counters;
36600 static struct attribute **all_attrs;
36601 static u32 acpi_gpe_count;
36602
36603-static struct attribute_group interrupt_stats_attr_group = {
36604+static attribute_group_no_const interrupt_stats_attr_group = {
36605 .name = "interrupts",
36606 };
36607
36608-static struct kobj_attribute *counter_attrs;
36609+static kobj_attribute_no_const *counter_attrs;
36610
36611 static void delete_gpe_attr_array(void)
36612 {
36613diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36614index d24fa19..782f1e6 100644
36615--- a/drivers/acpi/thermal.c
36616+++ b/drivers/acpi/thermal.c
36617@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36618 return 0;
36619 }
36620
36621-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36622+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36623 /*
36624 * Award BIOS on this AOpen makes thermal control almost worthless.
36625 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36626diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36627index cc79d3f..28adb33 100644
36628--- a/drivers/acpi/video.c
36629+++ b/drivers/acpi/video.c
36630@@ -431,7 +431,7 @@ static int __init video_enable_native_backlight(const struct dmi_system_id *d)
36631 return 0;
36632 }
36633
36634-static struct dmi_system_id video_dmi_table[] __initdata = {
36635+static const struct dmi_system_id video_dmi_table[] __initconst = {
36636 /*
36637 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36638 */
36639diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36640index 287c4ba..6a600bc 100644
36641--- a/drivers/ata/libahci.c
36642+++ b/drivers/ata/libahci.c
36643@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36644 }
36645 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36646
36647-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36648+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36649 struct ata_taskfile *tf, int is_cmd, u16 flags,
36650 unsigned long timeout_msec)
36651 {
36652diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36653index 41c99be..f058d4a 100644
36654--- a/drivers/ata/libata-core.c
36655+++ b/drivers/ata/libata-core.c
36656@@ -102,7 +102,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36657 static void ata_dev_xfermask(struct ata_device *dev);
36658 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36659
36660-atomic_t ata_print_id = ATOMIC_INIT(0);
36661+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36662
36663 struct ata_force_param {
36664 const char *name;
36665@@ -4816,7 +4816,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36666 struct ata_port *ap;
36667 unsigned int tag;
36668
36669- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36670+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36671 ap = qc->ap;
36672
36673 qc->flags = 0;
36674@@ -4833,7 +4833,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36675 struct ata_port *ap;
36676 struct ata_link *link;
36677
36678- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36679+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36680 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36681 ap = qc->ap;
36682 link = qc->dev->link;
36683@@ -5940,6 +5940,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36684 return;
36685
36686 spin_lock(&lock);
36687+ pax_open_kernel();
36688
36689 for (cur = ops->inherits; cur; cur = cur->inherits) {
36690 void **inherit = (void **)cur;
36691@@ -5953,8 +5954,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36692 if (IS_ERR(*pp))
36693 *pp = NULL;
36694
36695- ops->inherits = NULL;
36696+ *(struct ata_port_operations **)&ops->inherits = NULL;
36697
36698+ pax_close_kernel();
36699 spin_unlock(&lock);
36700 }
36701
36702@@ -6150,7 +6152,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36703
36704 /* give ports names and add SCSI hosts */
36705 for (i = 0; i < host->n_ports; i++) {
36706- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36707+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36708 host->ports[i]->local_port_no = i + 1;
36709 }
36710
36711diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36712index 641a61a..8309252 100644
36713--- a/drivers/ata/libata-scsi.c
36714+++ b/drivers/ata/libata-scsi.c
36715@@ -4210,7 +4210,7 @@ int ata_sas_port_init(struct ata_port *ap)
36716
36717 if (rc)
36718 return rc;
36719- ap->print_id = atomic_inc_return(&ata_print_id);
36720+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36721 return 0;
36722 }
36723 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36724diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36725index a998a17..8de4bf4 100644
36726--- a/drivers/ata/libata.h
36727+++ b/drivers/ata/libata.h
36728@@ -53,7 +53,7 @@ enum {
36729 ATA_DNXFER_QUIET = (1 << 31),
36730 };
36731
36732-extern atomic_t ata_print_id;
36733+extern atomic_unchecked_t ata_print_id;
36734 extern int atapi_passthru16;
36735 extern int libata_fua;
36736 extern int libata_noacpi;
36737diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36738index a9b0c82..207d97d 100644
36739--- a/drivers/ata/pata_arasan_cf.c
36740+++ b/drivers/ata/pata_arasan_cf.c
36741@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36742 /* Handle platform specific quirks */
36743 if (quirk) {
36744 if (quirk & CF_BROKEN_PIO) {
36745- ap->ops->set_piomode = NULL;
36746+ pax_open_kernel();
36747+ *(void **)&ap->ops->set_piomode = NULL;
36748+ pax_close_kernel();
36749 ap->pio_mask = 0;
36750 }
36751 if (quirk & CF_BROKEN_MWDMA)
36752diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36753index f9b983a..887b9d8 100644
36754--- a/drivers/atm/adummy.c
36755+++ b/drivers/atm/adummy.c
36756@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36757 vcc->pop(vcc, skb);
36758 else
36759 dev_kfree_skb_any(skb);
36760- atomic_inc(&vcc->stats->tx);
36761+ atomic_inc_unchecked(&vcc->stats->tx);
36762
36763 return 0;
36764 }
36765diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36766index f1a9198..f466a4a 100644
36767--- a/drivers/atm/ambassador.c
36768+++ b/drivers/atm/ambassador.c
36769@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36770 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36771
36772 // VC layer stats
36773- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36774+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36775
36776 // free the descriptor
36777 kfree (tx_descr);
36778@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36779 dump_skb ("<<<", vc, skb);
36780
36781 // VC layer stats
36782- atomic_inc(&atm_vcc->stats->rx);
36783+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36784 __net_timestamp(skb);
36785 // end of our responsibility
36786 atm_vcc->push (atm_vcc, skb);
36787@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36788 } else {
36789 PRINTK (KERN_INFO, "dropped over-size frame");
36790 // should we count this?
36791- atomic_inc(&atm_vcc->stats->rx_drop);
36792+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36793 }
36794
36795 } else {
36796@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36797 }
36798
36799 if (check_area (skb->data, skb->len)) {
36800- atomic_inc(&atm_vcc->stats->tx_err);
36801+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36802 return -ENOMEM; // ?
36803 }
36804
36805diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36806index 480fa6f..947067c 100644
36807--- a/drivers/atm/atmtcp.c
36808+++ b/drivers/atm/atmtcp.c
36809@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36810 if (vcc->pop) vcc->pop(vcc,skb);
36811 else dev_kfree_skb(skb);
36812 if (dev_data) return 0;
36813- atomic_inc(&vcc->stats->tx_err);
36814+ atomic_inc_unchecked(&vcc->stats->tx_err);
36815 return -ENOLINK;
36816 }
36817 size = skb->len+sizeof(struct atmtcp_hdr);
36818@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36819 if (!new_skb) {
36820 if (vcc->pop) vcc->pop(vcc,skb);
36821 else dev_kfree_skb(skb);
36822- atomic_inc(&vcc->stats->tx_err);
36823+ atomic_inc_unchecked(&vcc->stats->tx_err);
36824 return -ENOBUFS;
36825 }
36826 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36827@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36828 if (vcc->pop) vcc->pop(vcc,skb);
36829 else dev_kfree_skb(skb);
36830 out_vcc->push(out_vcc,new_skb);
36831- atomic_inc(&vcc->stats->tx);
36832- atomic_inc(&out_vcc->stats->rx);
36833+ atomic_inc_unchecked(&vcc->stats->tx);
36834+ atomic_inc_unchecked(&out_vcc->stats->rx);
36835 return 0;
36836 }
36837
36838@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36839 read_unlock(&vcc_sklist_lock);
36840 if (!out_vcc) {
36841 result = -EUNATCH;
36842- atomic_inc(&vcc->stats->tx_err);
36843+ atomic_inc_unchecked(&vcc->stats->tx_err);
36844 goto done;
36845 }
36846 skb_pull(skb,sizeof(struct atmtcp_hdr));
36847@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36848 __net_timestamp(new_skb);
36849 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36850 out_vcc->push(out_vcc,new_skb);
36851- atomic_inc(&vcc->stats->tx);
36852- atomic_inc(&out_vcc->stats->rx);
36853+ atomic_inc_unchecked(&vcc->stats->tx);
36854+ atomic_inc_unchecked(&out_vcc->stats->rx);
36855 done:
36856 if (vcc->pop) vcc->pop(vcc,skb);
36857 else dev_kfree_skb(skb);
36858diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36859index 6339efd..2b441d5 100644
36860--- a/drivers/atm/eni.c
36861+++ b/drivers/atm/eni.c
36862@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36863 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36864 vcc->dev->number);
36865 length = 0;
36866- atomic_inc(&vcc->stats->rx_err);
36867+ atomic_inc_unchecked(&vcc->stats->rx_err);
36868 }
36869 else {
36870 length = ATM_CELL_SIZE-1; /* no HEC */
36871@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36872 size);
36873 }
36874 eff = length = 0;
36875- atomic_inc(&vcc->stats->rx_err);
36876+ atomic_inc_unchecked(&vcc->stats->rx_err);
36877 }
36878 else {
36879 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36880@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36881 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36882 vcc->dev->number,vcc->vci,length,size << 2,descr);
36883 length = eff = 0;
36884- atomic_inc(&vcc->stats->rx_err);
36885+ atomic_inc_unchecked(&vcc->stats->rx_err);
36886 }
36887 }
36888 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36889@@ -770,7 +770,7 @@ rx_dequeued++;
36890 vcc->push(vcc,skb);
36891 pushed++;
36892 }
36893- atomic_inc(&vcc->stats->rx);
36894+ atomic_inc_unchecked(&vcc->stats->rx);
36895 }
36896 wake_up(&eni_dev->rx_wait);
36897 }
36898@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
36899 DMA_TO_DEVICE);
36900 if (vcc->pop) vcc->pop(vcc,skb);
36901 else dev_kfree_skb_irq(skb);
36902- atomic_inc(&vcc->stats->tx);
36903+ atomic_inc_unchecked(&vcc->stats->tx);
36904 wake_up(&eni_dev->tx_wait);
36905 dma_complete++;
36906 }
36907diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36908index 82f2ae0..f205c02 100644
36909--- a/drivers/atm/firestream.c
36910+++ b/drivers/atm/firestream.c
36911@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36912 }
36913 }
36914
36915- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36916+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36917
36918 fs_dprintk (FS_DEBUG_TXMEM, "i");
36919 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36920@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36921 #endif
36922 skb_put (skb, qe->p1 & 0xffff);
36923 ATM_SKB(skb)->vcc = atm_vcc;
36924- atomic_inc(&atm_vcc->stats->rx);
36925+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36926 __net_timestamp(skb);
36927 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36928 atm_vcc->push (atm_vcc, skb);
36929@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36930 kfree (pe);
36931 }
36932 if (atm_vcc)
36933- atomic_inc(&atm_vcc->stats->rx_drop);
36934+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36935 break;
36936 case 0x1f: /* Reassembly abort: no buffers. */
36937 /* Silently increment error counter. */
36938 if (atm_vcc)
36939- atomic_inc(&atm_vcc->stats->rx_drop);
36940+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36941 break;
36942 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36943 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36944diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36945index 75dde90..4309ead 100644
36946--- a/drivers/atm/fore200e.c
36947+++ b/drivers/atm/fore200e.c
36948@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36949 #endif
36950 /* check error condition */
36951 if (*entry->status & STATUS_ERROR)
36952- atomic_inc(&vcc->stats->tx_err);
36953+ atomic_inc_unchecked(&vcc->stats->tx_err);
36954 else
36955- atomic_inc(&vcc->stats->tx);
36956+ atomic_inc_unchecked(&vcc->stats->tx);
36957 }
36958 }
36959
36960@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36961 if (skb == NULL) {
36962 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36963
36964- atomic_inc(&vcc->stats->rx_drop);
36965+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36966 return -ENOMEM;
36967 }
36968
36969@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36970
36971 dev_kfree_skb_any(skb);
36972
36973- atomic_inc(&vcc->stats->rx_drop);
36974+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36975 return -ENOMEM;
36976 }
36977
36978 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36979
36980 vcc->push(vcc, skb);
36981- atomic_inc(&vcc->stats->rx);
36982+ atomic_inc_unchecked(&vcc->stats->rx);
36983
36984 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36985
36986@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36987 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36988 fore200e->atm_dev->number,
36989 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36990- atomic_inc(&vcc->stats->rx_err);
36991+ atomic_inc_unchecked(&vcc->stats->rx_err);
36992 }
36993 }
36994
36995@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36996 goto retry_here;
36997 }
36998
36999- atomic_inc(&vcc->stats->tx_err);
37000+ atomic_inc_unchecked(&vcc->stats->tx_err);
37001
37002 fore200e->tx_sat++;
37003 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
37004diff --git a/drivers/atm/he.c b/drivers/atm/he.c
37005index 93dca2e..c5daa69 100644
37006--- a/drivers/atm/he.c
37007+++ b/drivers/atm/he.c
37008@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37009
37010 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
37011 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
37012- atomic_inc(&vcc->stats->rx_drop);
37013+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37014 goto return_host_buffers;
37015 }
37016
37017@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37018 RBRQ_LEN_ERR(he_dev->rbrq_head)
37019 ? "LEN_ERR" : "",
37020 vcc->vpi, vcc->vci);
37021- atomic_inc(&vcc->stats->rx_err);
37022+ atomic_inc_unchecked(&vcc->stats->rx_err);
37023 goto return_host_buffers;
37024 }
37025
37026@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37027 vcc->push(vcc, skb);
37028 spin_lock(&he_dev->global_lock);
37029
37030- atomic_inc(&vcc->stats->rx);
37031+ atomic_inc_unchecked(&vcc->stats->rx);
37032
37033 return_host_buffers:
37034 ++pdus_assembled;
37035@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
37036 tpd->vcc->pop(tpd->vcc, tpd->skb);
37037 else
37038 dev_kfree_skb_any(tpd->skb);
37039- atomic_inc(&tpd->vcc->stats->tx_err);
37040+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
37041 }
37042 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37043 return;
37044@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37045 vcc->pop(vcc, skb);
37046 else
37047 dev_kfree_skb_any(skb);
37048- atomic_inc(&vcc->stats->tx_err);
37049+ atomic_inc_unchecked(&vcc->stats->tx_err);
37050 return -EINVAL;
37051 }
37052
37053@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37054 vcc->pop(vcc, skb);
37055 else
37056 dev_kfree_skb_any(skb);
37057- atomic_inc(&vcc->stats->tx_err);
37058+ atomic_inc_unchecked(&vcc->stats->tx_err);
37059 return -EINVAL;
37060 }
37061 #endif
37062@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37063 vcc->pop(vcc, skb);
37064 else
37065 dev_kfree_skb_any(skb);
37066- atomic_inc(&vcc->stats->tx_err);
37067+ atomic_inc_unchecked(&vcc->stats->tx_err);
37068 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37069 return -ENOMEM;
37070 }
37071@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37072 vcc->pop(vcc, skb);
37073 else
37074 dev_kfree_skb_any(skb);
37075- atomic_inc(&vcc->stats->tx_err);
37076+ atomic_inc_unchecked(&vcc->stats->tx_err);
37077 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37078 return -ENOMEM;
37079 }
37080@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37081 __enqueue_tpd(he_dev, tpd, cid);
37082 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37083
37084- atomic_inc(&vcc->stats->tx);
37085+ atomic_inc_unchecked(&vcc->stats->tx);
37086
37087 return 0;
37088 }
37089diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37090index 527bbd5..96570c8 100644
37091--- a/drivers/atm/horizon.c
37092+++ b/drivers/atm/horizon.c
37093@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37094 {
37095 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37096 // VC layer stats
37097- atomic_inc(&vcc->stats->rx);
37098+ atomic_inc_unchecked(&vcc->stats->rx);
37099 __net_timestamp(skb);
37100 // end of our responsibility
37101 vcc->push (vcc, skb);
37102@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37103 dev->tx_iovec = NULL;
37104
37105 // VC layer stats
37106- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37107+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37108
37109 // free the skb
37110 hrz_kfree_skb (skb);
37111diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37112index 074616b..d6b3d5f 100644
37113--- a/drivers/atm/idt77252.c
37114+++ b/drivers/atm/idt77252.c
37115@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37116 else
37117 dev_kfree_skb(skb);
37118
37119- atomic_inc(&vcc->stats->tx);
37120+ atomic_inc_unchecked(&vcc->stats->tx);
37121 }
37122
37123 atomic_dec(&scq->used);
37124@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37125 if ((sb = dev_alloc_skb(64)) == NULL) {
37126 printk("%s: Can't allocate buffers for aal0.\n",
37127 card->name);
37128- atomic_add(i, &vcc->stats->rx_drop);
37129+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37130 break;
37131 }
37132 if (!atm_charge(vcc, sb->truesize)) {
37133 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37134 card->name);
37135- atomic_add(i - 1, &vcc->stats->rx_drop);
37136+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37137 dev_kfree_skb(sb);
37138 break;
37139 }
37140@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37141 ATM_SKB(sb)->vcc = vcc;
37142 __net_timestamp(sb);
37143 vcc->push(vcc, sb);
37144- atomic_inc(&vcc->stats->rx);
37145+ atomic_inc_unchecked(&vcc->stats->rx);
37146
37147 cell += ATM_CELL_PAYLOAD;
37148 }
37149@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37150 "(CDC: %08x)\n",
37151 card->name, len, rpp->len, readl(SAR_REG_CDC));
37152 recycle_rx_pool_skb(card, rpp);
37153- atomic_inc(&vcc->stats->rx_err);
37154+ atomic_inc_unchecked(&vcc->stats->rx_err);
37155 return;
37156 }
37157 if (stat & SAR_RSQE_CRC) {
37158 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37159 recycle_rx_pool_skb(card, rpp);
37160- atomic_inc(&vcc->stats->rx_err);
37161+ atomic_inc_unchecked(&vcc->stats->rx_err);
37162 return;
37163 }
37164 if (skb_queue_len(&rpp->queue) > 1) {
37165@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37166 RXPRINTK("%s: Can't alloc RX skb.\n",
37167 card->name);
37168 recycle_rx_pool_skb(card, rpp);
37169- atomic_inc(&vcc->stats->rx_err);
37170+ atomic_inc_unchecked(&vcc->stats->rx_err);
37171 return;
37172 }
37173 if (!atm_charge(vcc, skb->truesize)) {
37174@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37175 __net_timestamp(skb);
37176
37177 vcc->push(vcc, skb);
37178- atomic_inc(&vcc->stats->rx);
37179+ atomic_inc_unchecked(&vcc->stats->rx);
37180
37181 return;
37182 }
37183@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37184 __net_timestamp(skb);
37185
37186 vcc->push(vcc, skb);
37187- atomic_inc(&vcc->stats->rx);
37188+ atomic_inc_unchecked(&vcc->stats->rx);
37189
37190 if (skb->truesize > SAR_FB_SIZE_3)
37191 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37192@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37193 if (vcc->qos.aal != ATM_AAL0) {
37194 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37195 card->name, vpi, vci);
37196- atomic_inc(&vcc->stats->rx_drop);
37197+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37198 goto drop;
37199 }
37200
37201 if ((sb = dev_alloc_skb(64)) == NULL) {
37202 printk("%s: Can't allocate buffers for AAL0.\n",
37203 card->name);
37204- atomic_inc(&vcc->stats->rx_err);
37205+ atomic_inc_unchecked(&vcc->stats->rx_err);
37206 goto drop;
37207 }
37208
37209@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37210 ATM_SKB(sb)->vcc = vcc;
37211 __net_timestamp(sb);
37212 vcc->push(vcc, sb);
37213- atomic_inc(&vcc->stats->rx);
37214+ atomic_inc_unchecked(&vcc->stats->rx);
37215
37216 drop:
37217 skb_pull(queue, 64);
37218@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37219
37220 if (vc == NULL) {
37221 printk("%s: NULL connection in send().\n", card->name);
37222- atomic_inc(&vcc->stats->tx_err);
37223+ atomic_inc_unchecked(&vcc->stats->tx_err);
37224 dev_kfree_skb(skb);
37225 return -EINVAL;
37226 }
37227 if (!test_bit(VCF_TX, &vc->flags)) {
37228 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37229- atomic_inc(&vcc->stats->tx_err);
37230+ atomic_inc_unchecked(&vcc->stats->tx_err);
37231 dev_kfree_skb(skb);
37232 return -EINVAL;
37233 }
37234@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37235 break;
37236 default:
37237 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37238- atomic_inc(&vcc->stats->tx_err);
37239+ atomic_inc_unchecked(&vcc->stats->tx_err);
37240 dev_kfree_skb(skb);
37241 return -EINVAL;
37242 }
37243
37244 if (skb_shinfo(skb)->nr_frags != 0) {
37245 printk("%s: No scatter-gather yet.\n", card->name);
37246- atomic_inc(&vcc->stats->tx_err);
37247+ atomic_inc_unchecked(&vcc->stats->tx_err);
37248 dev_kfree_skb(skb);
37249 return -EINVAL;
37250 }
37251@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37252
37253 err = queue_skb(card, vc, skb, oam);
37254 if (err) {
37255- atomic_inc(&vcc->stats->tx_err);
37256+ atomic_inc_unchecked(&vcc->stats->tx_err);
37257 dev_kfree_skb(skb);
37258 return err;
37259 }
37260@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37261 skb = dev_alloc_skb(64);
37262 if (!skb) {
37263 printk("%s: Out of memory in send_oam().\n", card->name);
37264- atomic_inc(&vcc->stats->tx_err);
37265+ atomic_inc_unchecked(&vcc->stats->tx_err);
37266 return -ENOMEM;
37267 }
37268 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37269diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37270index 924f8e2..3375a3e 100644
37271--- a/drivers/atm/iphase.c
37272+++ b/drivers/atm/iphase.c
37273@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37274 status = (u_short) (buf_desc_ptr->desc_mode);
37275 if (status & (RX_CER | RX_PTE | RX_OFL))
37276 {
37277- atomic_inc(&vcc->stats->rx_err);
37278+ atomic_inc_unchecked(&vcc->stats->rx_err);
37279 IF_ERR(printk("IA: bad packet, dropping it");)
37280 if (status & RX_CER) {
37281 IF_ERR(printk(" cause: packet CRC error\n");)
37282@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37283 len = dma_addr - buf_addr;
37284 if (len > iadev->rx_buf_sz) {
37285 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37286- atomic_inc(&vcc->stats->rx_err);
37287+ atomic_inc_unchecked(&vcc->stats->rx_err);
37288 goto out_free_desc;
37289 }
37290
37291@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37292 ia_vcc = INPH_IA_VCC(vcc);
37293 if (ia_vcc == NULL)
37294 {
37295- atomic_inc(&vcc->stats->rx_err);
37296+ atomic_inc_unchecked(&vcc->stats->rx_err);
37297 atm_return(vcc, skb->truesize);
37298 dev_kfree_skb_any(skb);
37299 goto INCR_DLE;
37300@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37301 if ((length > iadev->rx_buf_sz) || (length >
37302 (skb->len - sizeof(struct cpcs_trailer))))
37303 {
37304- atomic_inc(&vcc->stats->rx_err);
37305+ atomic_inc_unchecked(&vcc->stats->rx_err);
37306 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37307 length, skb->len);)
37308 atm_return(vcc, skb->truesize);
37309@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37310
37311 IF_RX(printk("rx_dle_intr: skb push");)
37312 vcc->push(vcc,skb);
37313- atomic_inc(&vcc->stats->rx);
37314+ atomic_inc_unchecked(&vcc->stats->rx);
37315 iadev->rx_pkt_cnt++;
37316 }
37317 INCR_DLE:
37318@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37319 {
37320 struct k_sonet_stats *stats;
37321 stats = &PRIV(_ia_dev[board])->sonet_stats;
37322- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37323- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37324- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37325- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37326- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37327- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37328- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37329- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37330- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37331+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37332+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37333+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37334+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37335+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37336+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37337+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37338+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37339+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37340 }
37341 ia_cmds.status = 0;
37342 break;
37343@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37344 if ((desc == 0) || (desc > iadev->num_tx_desc))
37345 {
37346 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37347- atomic_inc(&vcc->stats->tx);
37348+ atomic_inc_unchecked(&vcc->stats->tx);
37349 if (vcc->pop)
37350 vcc->pop(vcc, skb);
37351 else
37352@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37353 ATM_DESC(skb) = vcc->vci;
37354 skb_queue_tail(&iadev->tx_dma_q, skb);
37355
37356- atomic_inc(&vcc->stats->tx);
37357+ atomic_inc_unchecked(&vcc->stats->tx);
37358 iadev->tx_pkt_cnt++;
37359 /* Increment transaction counter */
37360 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37361
37362 #if 0
37363 /* add flow control logic */
37364- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37365+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37366 if (iavcc->vc_desc_cnt > 10) {
37367 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37368 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37369diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37370index ce43ae3..969de38 100644
37371--- a/drivers/atm/lanai.c
37372+++ b/drivers/atm/lanai.c
37373@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37374 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37375 lanai_endtx(lanai, lvcc);
37376 lanai_free_skb(lvcc->tx.atmvcc, skb);
37377- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37378+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37379 }
37380
37381 /* Try to fill the buffer - don't call unless there is backlog */
37382@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37383 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37384 __net_timestamp(skb);
37385 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37386- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37387+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37388 out:
37389 lvcc->rx.buf.ptr = end;
37390 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37391@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37392 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37393 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37394 lanai->stats.service_rxnotaal5++;
37395- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37396+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37397 return 0;
37398 }
37399 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37400@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37401 int bytes;
37402 read_unlock(&vcc_sklist_lock);
37403 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37404- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37405+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37406 lvcc->stats.x.aal5.service_trash++;
37407 bytes = (SERVICE_GET_END(s) * 16) -
37408 (((unsigned long) lvcc->rx.buf.ptr) -
37409@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37410 }
37411 if (s & SERVICE_STREAM) {
37412 read_unlock(&vcc_sklist_lock);
37413- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37414+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37415 lvcc->stats.x.aal5.service_stream++;
37416 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37417 "PDU on VCI %d!\n", lanai->number, vci);
37418@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37419 return 0;
37420 }
37421 DPRINTK("got rx crc error on vci %d\n", vci);
37422- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37423+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37424 lvcc->stats.x.aal5.service_rxcrc++;
37425 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37426 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37427diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37428index ddc4ceb..36e29aa 100644
37429--- a/drivers/atm/nicstar.c
37430+++ b/drivers/atm/nicstar.c
37431@@ -1632,7 +1632,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37432 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37433 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37434 card->index);
37435- atomic_inc(&vcc->stats->tx_err);
37436+ atomic_inc_unchecked(&vcc->stats->tx_err);
37437 dev_kfree_skb_any(skb);
37438 return -EINVAL;
37439 }
37440@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37441 if (!vc->tx) {
37442 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37443 card->index);
37444- atomic_inc(&vcc->stats->tx_err);
37445+ atomic_inc_unchecked(&vcc->stats->tx_err);
37446 dev_kfree_skb_any(skb);
37447 return -EINVAL;
37448 }
37449@@ -1648,14 +1648,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37450 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37451 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37452 card->index);
37453- atomic_inc(&vcc->stats->tx_err);
37454+ atomic_inc_unchecked(&vcc->stats->tx_err);
37455 dev_kfree_skb_any(skb);
37456 return -EINVAL;
37457 }
37458
37459 if (skb_shinfo(skb)->nr_frags != 0) {
37460 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37461- atomic_inc(&vcc->stats->tx_err);
37462+ atomic_inc_unchecked(&vcc->stats->tx_err);
37463 dev_kfree_skb_any(skb);
37464 return -EINVAL;
37465 }
37466@@ -1703,11 +1703,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37467 }
37468
37469 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37470- atomic_inc(&vcc->stats->tx_err);
37471+ atomic_inc_unchecked(&vcc->stats->tx_err);
37472 dev_kfree_skb_any(skb);
37473 return -EIO;
37474 }
37475- atomic_inc(&vcc->stats->tx);
37476+ atomic_inc_unchecked(&vcc->stats->tx);
37477
37478 return 0;
37479 }
37480@@ -2024,14 +2024,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37481 printk
37482 ("nicstar%d: Can't allocate buffers for aal0.\n",
37483 card->index);
37484- atomic_add(i, &vcc->stats->rx_drop);
37485+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37486 break;
37487 }
37488 if (!atm_charge(vcc, sb->truesize)) {
37489 RXPRINTK
37490 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37491 card->index);
37492- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37493+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37494 dev_kfree_skb_any(sb);
37495 break;
37496 }
37497@@ -2046,7 +2046,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37498 ATM_SKB(sb)->vcc = vcc;
37499 __net_timestamp(sb);
37500 vcc->push(vcc, sb);
37501- atomic_inc(&vcc->stats->rx);
37502+ atomic_inc_unchecked(&vcc->stats->rx);
37503 cell += ATM_CELL_PAYLOAD;
37504 }
37505
37506@@ -2063,7 +2063,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37507 if (iovb == NULL) {
37508 printk("nicstar%d: Out of iovec buffers.\n",
37509 card->index);
37510- atomic_inc(&vcc->stats->rx_drop);
37511+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37512 recycle_rx_buf(card, skb);
37513 return;
37514 }
37515@@ -2087,7 +2087,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37516 small or large buffer itself. */
37517 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37518 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37519- atomic_inc(&vcc->stats->rx_err);
37520+ atomic_inc_unchecked(&vcc->stats->rx_err);
37521 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37522 NS_MAX_IOVECS);
37523 NS_PRV_IOVCNT(iovb) = 0;
37524@@ -2107,7 +2107,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37525 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37526 card->index);
37527 which_list(card, skb);
37528- atomic_inc(&vcc->stats->rx_err);
37529+ atomic_inc_unchecked(&vcc->stats->rx_err);
37530 recycle_rx_buf(card, skb);
37531 vc->rx_iov = NULL;
37532 recycle_iov_buf(card, iovb);
37533@@ -2120,7 +2120,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37534 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37535 card->index);
37536 which_list(card, skb);
37537- atomic_inc(&vcc->stats->rx_err);
37538+ atomic_inc_unchecked(&vcc->stats->rx_err);
37539 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37540 NS_PRV_IOVCNT(iovb));
37541 vc->rx_iov = NULL;
37542@@ -2143,7 +2143,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37543 printk(" - PDU size mismatch.\n");
37544 else
37545 printk(".\n");
37546- atomic_inc(&vcc->stats->rx_err);
37547+ atomic_inc_unchecked(&vcc->stats->rx_err);
37548 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37549 NS_PRV_IOVCNT(iovb));
37550 vc->rx_iov = NULL;
37551@@ -2157,14 +2157,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37552 /* skb points to a small buffer */
37553 if (!atm_charge(vcc, skb->truesize)) {
37554 push_rxbufs(card, skb);
37555- atomic_inc(&vcc->stats->rx_drop);
37556+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37557 } else {
37558 skb_put(skb, len);
37559 dequeue_sm_buf(card, skb);
37560 ATM_SKB(skb)->vcc = vcc;
37561 __net_timestamp(skb);
37562 vcc->push(vcc, skb);
37563- atomic_inc(&vcc->stats->rx);
37564+ atomic_inc_unchecked(&vcc->stats->rx);
37565 }
37566 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37567 struct sk_buff *sb;
37568@@ -2175,14 +2175,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37569 if (len <= NS_SMBUFSIZE) {
37570 if (!atm_charge(vcc, sb->truesize)) {
37571 push_rxbufs(card, sb);
37572- atomic_inc(&vcc->stats->rx_drop);
37573+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37574 } else {
37575 skb_put(sb, len);
37576 dequeue_sm_buf(card, sb);
37577 ATM_SKB(sb)->vcc = vcc;
37578 __net_timestamp(sb);
37579 vcc->push(vcc, sb);
37580- atomic_inc(&vcc->stats->rx);
37581+ atomic_inc_unchecked(&vcc->stats->rx);
37582 }
37583
37584 push_rxbufs(card, skb);
37585@@ -2191,7 +2191,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37586
37587 if (!atm_charge(vcc, skb->truesize)) {
37588 push_rxbufs(card, skb);
37589- atomic_inc(&vcc->stats->rx_drop);
37590+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37591 } else {
37592 dequeue_lg_buf(card, skb);
37593 skb_push(skb, NS_SMBUFSIZE);
37594@@ -2201,7 +2201,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37595 ATM_SKB(skb)->vcc = vcc;
37596 __net_timestamp(skb);
37597 vcc->push(vcc, skb);
37598- atomic_inc(&vcc->stats->rx);
37599+ atomic_inc_unchecked(&vcc->stats->rx);
37600 }
37601
37602 push_rxbufs(card, sb);
37603@@ -2222,7 +2222,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37604 printk
37605 ("nicstar%d: Out of huge buffers.\n",
37606 card->index);
37607- atomic_inc(&vcc->stats->rx_drop);
37608+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37609 recycle_iovec_rx_bufs(card,
37610 (struct iovec *)
37611 iovb->data,
37612@@ -2273,7 +2273,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37613 card->hbpool.count++;
37614 } else
37615 dev_kfree_skb_any(hb);
37616- atomic_inc(&vcc->stats->rx_drop);
37617+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37618 } else {
37619 /* Copy the small buffer to the huge buffer */
37620 sb = (struct sk_buff *)iov->iov_base;
37621@@ -2307,7 +2307,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37622 ATM_SKB(hb)->vcc = vcc;
37623 __net_timestamp(hb);
37624 vcc->push(vcc, hb);
37625- atomic_inc(&vcc->stats->rx);
37626+ atomic_inc_unchecked(&vcc->stats->rx);
37627 }
37628 }
37629
37630diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37631index 74e18b0..f16afa0 100644
37632--- a/drivers/atm/solos-pci.c
37633+++ b/drivers/atm/solos-pci.c
37634@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37635 }
37636 atm_charge(vcc, skb->truesize);
37637 vcc->push(vcc, skb);
37638- atomic_inc(&vcc->stats->rx);
37639+ atomic_inc_unchecked(&vcc->stats->rx);
37640 break;
37641
37642 case PKT_STATUS:
37643@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37644 vcc = SKB_CB(oldskb)->vcc;
37645
37646 if (vcc) {
37647- atomic_inc(&vcc->stats->tx);
37648+ atomic_inc_unchecked(&vcc->stats->tx);
37649 solos_pop(vcc, oldskb);
37650 } else {
37651 dev_kfree_skb_irq(oldskb);
37652diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37653index 0215934..ce9f5b1 100644
37654--- a/drivers/atm/suni.c
37655+++ b/drivers/atm/suni.c
37656@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37657
37658
37659 #define ADD_LIMITED(s,v) \
37660- atomic_add((v),&stats->s); \
37661- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37662+ atomic_add_unchecked((v),&stats->s); \
37663+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37664
37665
37666 static void suni_hz(unsigned long from_timer)
37667diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37668index 5120a96..e2572bd 100644
37669--- a/drivers/atm/uPD98402.c
37670+++ b/drivers/atm/uPD98402.c
37671@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37672 struct sonet_stats tmp;
37673 int error = 0;
37674
37675- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37676+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37677 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37678 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37679 if (zero && !error) {
37680@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37681
37682
37683 #define ADD_LIMITED(s,v) \
37684- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37685- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37686- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37687+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37688+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37689+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37690
37691
37692 static void stat_event(struct atm_dev *dev)
37693@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37694 if (reason & uPD98402_INT_PFM) stat_event(dev);
37695 if (reason & uPD98402_INT_PCO) {
37696 (void) GET(PCOCR); /* clear interrupt cause */
37697- atomic_add(GET(HECCT),
37698+ atomic_add_unchecked(GET(HECCT),
37699 &PRIV(dev)->sonet_stats.uncorr_hcs);
37700 }
37701 if ((reason & uPD98402_INT_RFO) &&
37702@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37703 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37704 uPD98402_INT_LOS),PIMR); /* enable them */
37705 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37706- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37707- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37708- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37709+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37710+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37711+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37712 return 0;
37713 }
37714
37715diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37716index cecfb94..87009ec 100644
37717--- a/drivers/atm/zatm.c
37718+++ b/drivers/atm/zatm.c
37719@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37720 }
37721 if (!size) {
37722 dev_kfree_skb_irq(skb);
37723- if (vcc) atomic_inc(&vcc->stats->rx_err);
37724+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37725 continue;
37726 }
37727 if (!atm_charge(vcc,skb->truesize)) {
37728@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37729 skb->len = size;
37730 ATM_SKB(skb)->vcc = vcc;
37731 vcc->push(vcc,skb);
37732- atomic_inc(&vcc->stats->rx);
37733+ atomic_inc_unchecked(&vcc->stats->rx);
37734 }
37735 zout(pos & 0xffff,MTA(mbx));
37736 #if 0 /* probably a stupid idea */
37737@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37738 skb_queue_head(&zatm_vcc->backlog,skb);
37739 break;
37740 }
37741- atomic_inc(&vcc->stats->tx);
37742+ atomic_inc_unchecked(&vcc->stats->tx);
37743 wake_up(&zatm_vcc->tx_wait);
37744 }
37745
37746diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37747index 79bc203..fa3945b 100644
37748--- a/drivers/base/bus.c
37749+++ b/drivers/base/bus.c
37750@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37751 return -EINVAL;
37752
37753 mutex_lock(&subsys->p->mutex);
37754- list_add_tail(&sif->node, &subsys->p->interfaces);
37755+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37756 if (sif->add_dev) {
37757 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37758 while ((dev = subsys_dev_iter_next(&iter)))
37759@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37760 subsys = sif->subsys;
37761
37762 mutex_lock(&subsys->p->mutex);
37763- list_del_init(&sif->node);
37764+ pax_list_del_init((struct list_head *)&sif->node);
37765 if (sif->remove_dev) {
37766 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37767 while ((dev = subsys_dev_iter_next(&iter)))
37768diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37769index 68f0314..ca2a609 100644
37770--- a/drivers/base/devtmpfs.c
37771+++ b/drivers/base/devtmpfs.c
37772@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37773 if (!thread)
37774 return 0;
37775
37776- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37777+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37778 if (err)
37779 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37780 else
37781@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37782 *err = sys_unshare(CLONE_NEWNS);
37783 if (*err)
37784 goto out;
37785- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37786+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37787 if (*err)
37788 goto out;
37789- sys_chdir("/.."); /* will traverse into overmounted root */
37790- sys_chroot(".");
37791+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37792+ sys_chroot((char __force_user *)".");
37793 complete(&setup_done);
37794 while (1) {
37795 spin_lock(&req_lock);
37796diff --git a/drivers/base/node.c b/drivers/base/node.c
37797index a2aa65b..8831326 100644
37798--- a/drivers/base/node.c
37799+++ b/drivers/base/node.c
37800@@ -613,7 +613,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37801 struct node_attr {
37802 struct device_attribute attr;
37803 enum node_states state;
37804-};
37805+} __do_const;
37806
37807 static ssize_t show_node_state(struct device *dev,
37808 struct device_attribute *attr, char *buf)
37809diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37810index 2327613..211d7f5 100644
37811--- a/drivers/base/power/domain.c
37812+++ b/drivers/base/power/domain.c
37813@@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37814 {
37815 struct cpuidle_driver *cpuidle_drv;
37816 struct gpd_cpuidle_data *cpuidle_data;
37817- struct cpuidle_state *idle_state;
37818+ cpuidle_state_no_const *idle_state;
37819 int ret = 0;
37820
37821 if (IS_ERR_OR_NULL(genpd) || state < 0)
37822@@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37823 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37824 {
37825 struct gpd_cpuidle_data *cpuidle_data;
37826- struct cpuidle_state *idle_state;
37827+ cpuidle_state_no_const *idle_state;
37828 int ret = 0;
37829
37830 if (IS_ERR_OR_NULL(genpd))
37831@@ -2222,8 +2222,11 @@ int genpd_dev_pm_attach(struct device *dev)
37832 return ret;
37833 }
37834
37835- dev->pm_domain->detach = genpd_dev_pm_detach;
37836- dev->pm_domain->sync = genpd_dev_pm_sync;
37837+ pax_open_kernel();
37838+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37839+ *(void **)&dev->pm_domain->sync = genpd_dev_pm_sync;
37840+ pax_close_kernel();
37841+
37842 pm_genpd_poweron(pd);
37843
37844 return 0;
37845diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37846index d2be3f9..0a3167a 100644
37847--- a/drivers/base/power/sysfs.c
37848+++ b/drivers/base/power/sysfs.c
37849@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37850 return -EIO;
37851 }
37852 }
37853- return sprintf(buf, p);
37854+ return sprintf(buf, "%s", p);
37855 }
37856
37857 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37858diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37859index 7726200..a417da7 100644
37860--- a/drivers/base/power/wakeup.c
37861+++ b/drivers/base/power/wakeup.c
37862@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37863 * They need to be modified together atomically, so it's better to use one
37864 * atomic variable to hold them both.
37865 */
37866-static atomic_t combined_event_count = ATOMIC_INIT(0);
37867+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37868
37869 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37870 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37871
37872 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37873 {
37874- unsigned int comb = atomic_read(&combined_event_count);
37875+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37876
37877 *cnt = (comb >> IN_PROGRESS_BITS);
37878 *inpr = comb & MAX_IN_PROGRESS;
37879@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37880 ws->start_prevent_time = ws->last_time;
37881
37882 /* Increment the counter of events in progress. */
37883- cec = atomic_inc_return(&combined_event_count);
37884+ cec = atomic_inc_return_unchecked(&combined_event_count);
37885
37886 trace_wakeup_source_activate(ws->name, cec);
37887 }
37888@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37889 * Increment the counter of registered wakeup events and decrement the
37890 * couter of wakeup events in progress simultaneously.
37891 */
37892- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37893+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37894 trace_wakeup_source_deactivate(ws->name, cec);
37895
37896 split_counters(&cnt, &inpr);
37897diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37898index 8d98a32..61d3165 100644
37899--- a/drivers/base/syscore.c
37900+++ b/drivers/base/syscore.c
37901@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37902 void register_syscore_ops(struct syscore_ops *ops)
37903 {
37904 mutex_lock(&syscore_ops_lock);
37905- list_add_tail(&ops->node, &syscore_ops_list);
37906+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37907 mutex_unlock(&syscore_ops_lock);
37908 }
37909 EXPORT_SYMBOL_GPL(register_syscore_ops);
37910@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37911 void unregister_syscore_ops(struct syscore_ops *ops)
37912 {
37913 mutex_lock(&syscore_ops_lock);
37914- list_del(&ops->node);
37915+ pax_list_del((struct list_head *)&ops->node);
37916 mutex_unlock(&syscore_ops_lock);
37917 }
37918 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37919diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37920index ff20f19..018f1da 100644
37921--- a/drivers/block/cciss.c
37922+++ b/drivers/block/cciss.c
37923@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37924 while (!list_empty(&h->reqQ)) {
37925 c = list_entry(h->reqQ.next, CommandList_struct, list);
37926 /* can't do anything if fifo is full */
37927- if ((h->access.fifo_full(h))) {
37928+ if ((h->access->fifo_full(h))) {
37929 dev_warn(&h->pdev->dev, "fifo full\n");
37930 break;
37931 }
37932@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
37933 h->Qdepth--;
37934
37935 /* Tell the controller execute command */
37936- h->access.submit_command(h, c);
37937+ h->access->submit_command(h, c);
37938
37939 /* Put job onto the completed Q */
37940 addQ(&h->cmpQ, c);
37941@@ -3444,17 +3444,17 @@ startio:
37942
37943 static inline unsigned long get_next_completion(ctlr_info_t *h)
37944 {
37945- return h->access.command_completed(h);
37946+ return h->access->command_completed(h);
37947 }
37948
37949 static inline int interrupt_pending(ctlr_info_t *h)
37950 {
37951- return h->access.intr_pending(h);
37952+ return h->access->intr_pending(h);
37953 }
37954
37955 static inline long interrupt_not_for_us(ctlr_info_t *h)
37956 {
37957- return ((h->access.intr_pending(h) == 0) ||
37958+ return ((h->access->intr_pending(h) == 0) ||
37959 (h->interrupts_enabled == 0));
37960 }
37961
37962@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
37963 u32 a;
37964
37965 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37966- return h->access.command_completed(h);
37967+ return h->access->command_completed(h);
37968
37969 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37970 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37971@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37972 trans_support & CFGTBL_Trans_use_short_tags);
37973
37974 /* Change the access methods to the performant access methods */
37975- h->access = SA5_performant_access;
37976+ h->access = &SA5_performant_access;
37977 h->transMethod = CFGTBL_Trans_Performant;
37978
37979 return;
37980@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37981 if (prod_index < 0)
37982 return -ENODEV;
37983 h->product_name = products[prod_index].product_name;
37984- h->access = *(products[prod_index].access);
37985+ h->access = products[prod_index].access;
37986
37987 if (cciss_board_disabled(h)) {
37988 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37989@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
37990 }
37991
37992 /* make sure the board interrupts are off */
37993- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37994+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37995 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37996 if (rc)
37997 goto clean2;
37998@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
37999 * fake ones to scoop up any residual completions.
38000 */
38001 spin_lock_irqsave(&h->lock, flags);
38002- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38003+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38004 spin_unlock_irqrestore(&h->lock, flags);
38005 free_irq(h->intr[h->intr_mode], h);
38006 rc = cciss_request_irq(h, cciss_msix_discard_completions,
38007@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
38008 dev_info(&h->pdev->dev, "Board READY.\n");
38009 dev_info(&h->pdev->dev,
38010 "Waiting for stale completions to drain.\n");
38011- h->access.set_intr_mask(h, CCISS_INTR_ON);
38012+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38013 msleep(10000);
38014- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38015+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38016
38017 rc = controller_reset_failed(h->cfgtable);
38018 if (rc)
38019@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
38020 cciss_scsi_setup(h);
38021
38022 /* Turn the interrupts on so we can service requests */
38023- h->access.set_intr_mask(h, CCISS_INTR_ON);
38024+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38025
38026 /* Get the firmware version */
38027 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
38028@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
38029 kfree(flush_buf);
38030 if (return_code != IO_OK)
38031 dev_warn(&h->pdev->dev, "Error flushing cache\n");
38032- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38033+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38034 free_irq(h->intr[h->intr_mode], h);
38035 }
38036
38037diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
38038index 7fda30e..2f27946 100644
38039--- a/drivers/block/cciss.h
38040+++ b/drivers/block/cciss.h
38041@@ -101,7 +101,7 @@ struct ctlr_info
38042 /* information about each logical volume */
38043 drive_info_struct *drv[CISS_MAX_LUN];
38044
38045- struct access_method access;
38046+ struct access_method *access;
38047
38048 /* queue and queue Info */
38049 struct list_head reqQ;
38050@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38051 }
38052
38053 static struct access_method SA5_access = {
38054- SA5_submit_command,
38055- SA5_intr_mask,
38056- SA5_fifo_full,
38057- SA5_intr_pending,
38058- SA5_completed,
38059+ .submit_command = SA5_submit_command,
38060+ .set_intr_mask = SA5_intr_mask,
38061+ .fifo_full = SA5_fifo_full,
38062+ .intr_pending = SA5_intr_pending,
38063+ .command_completed = SA5_completed,
38064 };
38065
38066 static struct access_method SA5B_access = {
38067- SA5_submit_command,
38068- SA5B_intr_mask,
38069- SA5_fifo_full,
38070- SA5B_intr_pending,
38071- SA5_completed,
38072+ .submit_command = SA5_submit_command,
38073+ .set_intr_mask = SA5B_intr_mask,
38074+ .fifo_full = SA5_fifo_full,
38075+ .intr_pending = SA5B_intr_pending,
38076+ .command_completed = SA5_completed,
38077 };
38078
38079 static struct access_method SA5_performant_access = {
38080- SA5_submit_command,
38081- SA5_performant_intr_mask,
38082- SA5_fifo_full,
38083- SA5_performant_intr_pending,
38084- SA5_performant_completed,
38085+ .submit_command = SA5_submit_command,
38086+ .set_intr_mask = SA5_performant_intr_mask,
38087+ .fifo_full = SA5_fifo_full,
38088+ .intr_pending = SA5_performant_intr_pending,
38089+ .command_completed = SA5_performant_completed,
38090 };
38091
38092 struct board_type {
38093diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38094index f749df9..5f8b9c4 100644
38095--- a/drivers/block/cpqarray.c
38096+++ b/drivers/block/cpqarray.c
38097@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38098 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38099 goto Enomem4;
38100 }
38101- hba[i]->access.set_intr_mask(hba[i], 0);
38102+ hba[i]->access->set_intr_mask(hba[i], 0);
38103 if (request_irq(hba[i]->intr, do_ida_intr, IRQF_SHARED,
38104 hba[i]->devname, hba[i]))
38105 {
38106@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38107 add_timer(&hba[i]->timer);
38108
38109 /* Enable IRQ now that spinlock and rate limit timer are set up */
38110- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38111+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38112
38113 for(j=0; j<NWD; j++) {
38114 struct gendisk *disk = ida_gendisk[i][j];
38115@@ -694,7 +694,7 @@ DBGINFO(
38116 for(i=0; i<NR_PRODUCTS; i++) {
38117 if (board_id == products[i].board_id) {
38118 c->product_name = products[i].product_name;
38119- c->access = *(products[i].access);
38120+ c->access = products[i].access;
38121 break;
38122 }
38123 }
38124@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38125 hba[ctlr]->intr = intr;
38126 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38127 hba[ctlr]->product_name = products[j].product_name;
38128- hba[ctlr]->access = *(products[j].access);
38129+ hba[ctlr]->access = products[j].access;
38130 hba[ctlr]->ctlr = ctlr;
38131 hba[ctlr]->board_id = board_id;
38132 hba[ctlr]->pci_dev = NULL; /* not PCI */
38133@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38134
38135 while((c = h->reqQ) != NULL) {
38136 /* Can't do anything if we're busy */
38137- if (h->access.fifo_full(h) == 0)
38138+ if (h->access->fifo_full(h) == 0)
38139 return;
38140
38141 /* Get the first entry from the request Q */
38142@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38143 h->Qdepth--;
38144
38145 /* Tell the controller to do our bidding */
38146- h->access.submit_command(h, c);
38147+ h->access->submit_command(h, c);
38148
38149 /* Get onto the completion Q */
38150 addQ(&h->cmpQ, c);
38151@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38152 unsigned long flags;
38153 __u32 a,a1;
38154
38155- istat = h->access.intr_pending(h);
38156+ istat = h->access->intr_pending(h);
38157 /* Is this interrupt for us? */
38158 if (istat == 0)
38159 return IRQ_NONE;
38160@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38161 */
38162 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38163 if (istat & FIFO_NOT_EMPTY) {
38164- while((a = h->access.command_completed(h))) {
38165+ while((a = h->access->command_completed(h))) {
38166 a1 = a; a &= ~3;
38167 if ((c = h->cmpQ) == NULL)
38168 {
38169@@ -1448,11 +1448,11 @@ static int sendcmd(
38170 /*
38171 * Disable interrupt
38172 */
38173- info_p->access.set_intr_mask(info_p, 0);
38174+ info_p->access->set_intr_mask(info_p, 0);
38175 /* Make sure there is room in the command FIFO */
38176 /* Actually it should be completely empty at this time. */
38177 for (i = 200000; i > 0; i--) {
38178- temp = info_p->access.fifo_full(info_p);
38179+ temp = info_p->access->fifo_full(info_p);
38180 if (temp != 0) {
38181 break;
38182 }
38183@@ -1465,7 +1465,7 @@ DBG(
38184 /*
38185 * Send the cmd
38186 */
38187- info_p->access.submit_command(info_p, c);
38188+ info_p->access->submit_command(info_p, c);
38189 complete = pollcomplete(ctlr);
38190
38191 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38192@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38193 * we check the new geometry. Then turn interrupts back on when
38194 * we're done.
38195 */
38196- host->access.set_intr_mask(host, 0);
38197+ host->access->set_intr_mask(host, 0);
38198 getgeometry(ctlr);
38199- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38200+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38201
38202 for(i=0; i<NWD; i++) {
38203 struct gendisk *disk = ida_gendisk[ctlr][i];
38204@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38205 /* Wait (up to 2 seconds) for a command to complete */
38206
38207 for (i = 200000; i > 0; i--) {
38208- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38209+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38210 if (done == 0) {
38211 udelay(10); /* a short fixed delay */
38212 } else
38213diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38214index be73e9d..7fbf140 100644
38215--- a/drivers/block/cpqarray.h
38216+++ b/drivers/block/cpqarray.h
38217@@ -99,7 +99,7 @@ struct ctlr_info {
38218 drv_info_t drv[NWD];
38219 struct proc_dir_entry *proc;
38220
38221- struct access_method access;
38222+ struct access_method *access;
38223
38224 cmdlist_t *reqQ;
38225 cmdlist_t *cmpQ;
38226diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38227index 434c77d..6d3219a 100644
38228--- a/drivers/block/drbd/drbd_bitmap.c
38229+++ b/drivers/block/drbd/drbd_bitmap.c
38230@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38231 submit_bio(rw, bio);
38232 /* this should not count as user activity and cause the
38233 * resync to throttle -- see drbd_rs_should_slow_down(). */
38234- atomic_add(len >> 9, &device->rs_sect_ev);
38235+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38236 }
38237 }
38238
38239diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38240index b905e98..0812ed8 100644
38241--- a/drivers/block/drbd/drbd_int.h
38242+++ b/drivers/block/drbd/drbd_int.h
38243@@ -385,7 +385,7 @@ struct drbd_epoch {
38244 struct drbd_connection *connection;
38245 struct list_head list;
38246 unsigned int barrier_nr;
38247- atomic_t epoch_size; /* increased on every request added. */
38248+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38249 atomic_t active; /* increased on every req. added, and dec on every finished. */
38250 unsigned long flags;
38251 };
38252@@ -946,7 +946,7 @@ struct drbd_device {
38253 unsigned int al_tr_number;
38254 int al_tr_cycle;
38255 wait_queue_head_t seq_wait;
38256- atomic_t packet_seq;
38257+ atomic_unchecked_t packet_seq;
38258 unsigned int peer_seq;
38259 spinlock_t peer_seq_lock;
38260 unsigned long comm_bm_set; /* communicated number of set bits. */
38261@@ -955,8 +955,8 @@ struct drbd_device {
38262 struct mutex own_state_mutex;
38263 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38264 char congestion_reason; /* Why we where congested... */
38265- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38266- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38267+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38268+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38269 int rs_last_sect_ev; /* counter to compare with */
38270 int rs_last_events; /* counter of read or write "events" (unit sectors)
38271 * on the lower level device when we last looked. */
38272diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38273index 81fde9e..9948c05 100644
38274--- a/drivers/block/drbd/drbd_main.c
38275+++ b/drivers/block/drbd/drbd_main.c
38276@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38277 p->sector = sector;
38278 p->block_id = block_id;
38279 p->blksize = blksize;
38280- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38281+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38282 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38283 }
38284
38285@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38286 return -EIO;
38287 p->sector = cpu_to_be64(req->i.sector);
38288 p->block_id = (unsigned long)req;
38289- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38290+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38291 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38292 if (device->state.conn >= C_SYNC_SOURCE &&
38293 device->state.conn <= C_PAUSED_SYNC_T)
38294@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38295 atomic_set(&device->unacked_cnt, 0);
38296 atomic_set(&device->local_cnt, 0);
38297 atomic_set(&device->pp_in_use_by_net, 0);
38298- atomic_set(&device->rs_sect_in, 0);
38299- atomic_set(&device->rs_sect_ev, 0);
38300+ atomic_set_unchecked(&device->rs_sect_in, 0);
38301+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38302 atomic_set(&device->ap_in_flight, 0);
38303 atomic_set(&device->md_io.in_use, 0);
38304
38305@@ -2683,8 +2683,8 @@ void drbd_destroy_connection(struct kref *kref)
38306 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38307 struct drbd_resource *resource = connection->resource;
38308
38309- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38310- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38311+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38312+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38313 kfree(connection->current_epoch);
38314
38315 idr_destroy(&connection->peer_devices);
38316diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38317index 74df8cf..e41fc24 100644
38318--- a/drivers/block/drbd/drbd_nl.c
38319+++ b/drivers/block/drbd/drbd_nl.c
38320@@ -3637,13 +3637,13 @@ finish:
38321
38322 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38323 {
38324- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38325+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38326 struct sk_buff *msg;
38327 struct drbd_genlmsghdr *d_out;
38328 unsigned seq;
38329 int err = -ENOMEM;
38330
38331- seq = atomic_inc_return(&drbd_genl_seq);
38332+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38333 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38334 if (!msg)
38335 goto failed;
38336diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38337index cee2035..22f66bd 100644
38338--- a/drivers/block/drbd/drbd_receiver.c
38339+++ b/drivers/block/drbd/drbd_receiver.c
38340@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38341 struct drbd_device *device = peer_device->device;
38342 int err;
38343
38344- atomic_set(&device->packet_seq, 0);
38345+ atomic_set_unchecked(&device->packet_seq, 0);
38346 device->peer_seq = 0;
38347
38348 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38349@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38350 do {
38351 next_epoch = NULL;
38352
38353- epoch_size = atomic_read(&epoch->epoch_size);
38354+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38355
38356 switch (ev & ~EV_CLEANUP) {
38357 case EV_PUT:
38358@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38359 rv = FE_DESTROYED;
38360 } else {
38361 epoch->flags = 0;
38362- atomic_set(&epoch->epoch_size, 0);
38363+ atomic_set_unchecked(&epoch->epoch_size, 0);
38364 /* atomic_set(&epoch->active, 0); is already zero */
38365 if (rv == FE_STILL_LIVE)
38366 rv = FE_RECYCLED;
38367@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38368 conn_wait_active_ee_empty(connection);
38369 drbd_flush(connection);
38370
38371- if (atomic_read(&connection->current_epoch->epoch_size)) {
38372+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38373 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38374 if (epoch)
38375 break;
38376@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38377 }
38378
38379 epoch->flags = 0;
38380- atomic_set(&epoch->epoch_size, 0);
38381+ atomic_set_unchecked(&epoch->epoch_size, 0);
38382 atomic_set(&epoch->active, 0);
38383
38384 spin_lock(&connection->epoch_lock);
38385- if (atomic_read(&connection->current_epoch->epoch_size)) {
38386+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38387 list_add(&epoch->list, &connection->current_epoch->list);
38388 connection->current_epoch = epoch;
38389 connection->epochs++;
38390@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38391 list_add_tail(&peer_req->w.list, &device->sync_ee);
38392 spin_unlock_irq(&device->resource->req_lock);
38393
38394- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38395+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38396 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38397 return 0;
38398
38399@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38400 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38401 }
38402
38403- atomic_add(pi->size >> 9, &device->rs_sect_in);
38404+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38405
38406 return err;
38407 }
38408@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38409
38410 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38411 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38412- atomic_inc(&connection->current_epoch->epoch_size);
38413+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38414 err2 = drbd_drain_block(peer_device, pi->size);
38415 if (!err)
38416 err = err2;
38417@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38418
38419 spin_lock(&connection->epoch_lock);
38420 peer_req->epoch = connection->current_epoch;
38421- atomic_inc(&peer_req->epoch->epoch_size);
38422+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38423 atomic_inc(&peer_req->epoch->active);
38424 spin_unlock(&connection->epoch_lock);
38425
38426@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38427
38428 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38429 (int)part_stat_read(&disk->part0, sectors[1]) -
38430- atomic_read(&device->rs_sect_ev);
38431+ atomic_read_unchecked(&device->rs_sect_ev);
38432
38433 if (atomic_read(&device->ap_actlog_cnt)
38434 || curr_events - device->rs_last_events > 64) {
38435@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38436 device->use_csums = true;
38437 } else if (pi->cmd == P_OV_REPLY) {
38438 /* track progress, we may need to throttle */
38439- atomic_add(size >> 9, &device->rs_sect_in);
38440+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38441 peer_req->w.cb = w_e_end_ov_reply;
38442 dec_rs_pending(device);
38443 /* drbd_rs_begin_io done when we sent this request,
38444@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38445 goto out_free_e;
38446
38447 submit_for_resync:
38448- atomic_add(size >> 9, &device->rs_sect_ev);
38449+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38450
38451 submit:
38452 update_receiver_timing_details(connection, drbd_submit_peer_request);
38453@@ -4564,7 +4564,7 @@ struct data_cmd {
38454 int expect_payload;
38455 size_t pkt_size;
38456 int (*fn)(struct drbd_connection *, struct packet_info *);
38457-};
38458+} __do_const;
38459
38460 static struct data_cmd drbd_cmd_handler[] = {
38461 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38462@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38463 if (!list_empty(&connection->current_epoch->list))
38464 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38465 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38466- atomic_set(&connection->current_epoch->epoch_size, 0);
38467+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38468 connection->send.seen_any_write_yet = false;
38469
38470 drbd_info(connection, "Connection closed\n");
38471@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38472 put_ldev(device);
38473 }
38474 dec_rs_pending(device);
38475- atomic_add(blksize >> 9, &device->rs_sect_in);
38476+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38477
38478 return 0;
38479 }
38480@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38481 struct asender_cmd {
38482 size_t pkt_size;
38483 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38484-};
38485+} __do_const;
38486
38487 static struct asender_cmd asender_tbl[] = {
38488 [P_PING] = { 0, got_Ping },
38489diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38490index d0fae55..4469096 100644
38491--- a/drivers/block/drbd/drbd_worker.c
38492+++ b/drivers/block/drbd/drbd_worker.c
38493@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38494 list_add_tail(&peer_req->w.list, &device->read_ee);
38495 spin_unlock_irq(&device->resource->req_lock);
38496
38497- atomic_add(size >> 9, &device->rs_sect_ev);
38498+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38499 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38500 return 0;
38501
38502@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38503 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38504 int number, mxb;
38505
38506- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38507+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38508 device->rs_in_flight -= sect_in;
38509
38510 rcu_read_lock();
38511@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38512 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38513 struct fifo_buffer *plan;
38514
38515- atomic_set(&device->rs_sect_in, 0);
38516- atomic_set(&device->rs_sect_ev, 0);
38517+ atomic_set_unchecked(&device->rs_sect_in, 0);
38518+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38519 device->rs_in_flight = 0;
38520 device->rs_last_events =
38521 (int)part_stat_read(&disk->part0, sectors[0]) +
38522diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38523index 09e628da..7607aaa 100644
38524--- a/drivers/block/pktcdvd.c
38525+++ b/drivers/block/pktcdvd.c
38526@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38527
38528 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38529 {
38530- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38531+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38532 }
38533
38534 /*
38535@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38536 return -EROFS;
38537 }
38538 pd->settings.fp = ti.fp;
38539- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38540+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38541
38542 if (ti.nwa_v) {
38543 pd->nwa = be32_to_cpu(ti.next_writable);
38544diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38545index 010ce0b..7c0049e 100644
38546--- a/drivers/block/rbd.c
38547+++ b/drivers/block/rbd.c
38548@@ -64,7 +64,7 @@
38549 * If the counter is already at its maximum value returns
38550 * -EINVAL without updating it.
38551 */
38552-static int atomic_inc_return_safe(atomic_t *v)
38553+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38554 {
38555 unsigned int counter;
38556
38557diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38558index e5565fb..71be10b4 100644
38559--- a/drivers/block/smart1,2.h
38560+++ b/drivers/block/smart1,2.h
38561@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38562 }
38563
38564 static struct access_method smart4_access = {
38565- smart4_submit_command,
38566- smart4_intr_mask,
38567- smart4_fifo_full,
38568- smart4_intr_pending,
38569- smart4_completed,
38570+ .submit_command = smart4_submit_command,
38571+ .set_intr_mask = smart4_intr_mask,
38572+ .fifo_full = smart4_fifo_full,
38573+ .intr_pending = smart4_intr_pending,
38574+ .command_completed = smart4_completed,
38575 };
38576
38577 /*
38578@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38579 }
38580
38581 static struct access_method smart2_access = {
38582- smart2_submit_command,
38583- smart2_intr_mask,
38584- smart2_fifo_full,
38585- smart2_intr_pending,
38586- smart2_completed,
38587+ .submit_command = smart2_submit_command,
38588+ .set_intr_mask = smart2_intr_mask,
38589+ .fifo_full = smart2_fifo_full,
38590+ .intr_pending = smart2_intr_pending,
38591+ .command_completed = smart2_completed,
38592 };
38593
38594 /*
38595@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38596 }
38597
38598 static struct access_method smart2e_access = {
38599- smart2e_submit_command,
38600- smart2e_intr_mask,
38601- smart2e_fifo_full,
38602- smart2e_intr_pending,
38603- smart2e_completed,
38604+ .submit_command = smart2e_submit_command,
38605+ .set_intr_mask = smart2e_intr_mask,
38606+ .fifo_full = smart2e_fifo_full,
38607+ .intr_pending = smart2e_intr_pending,
38608+ .command_completed = smart2e_completed,
38609 };
38610
38611 /*
38612@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38613 }
38614
38615 static struct access_method smart1_access = {
38616- smart1_submit_command,
38617- smart1_intr_mask,
38618- smart1_fifo_full,
38619- smart1_intr_pending,
38620- smart1_completed,
38621+ .submit_command = smart1_submit_command,
38622+ .set_intr_mask = smart1_intr_mask,
38623+ .fifo_full = smart1_fifo_full,
38624+ .intr_pending = smart1_intr_pending,
38625+ .command_completed = smart1_completed,
38626 };
38627diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38628index 55c135b..9f8d60c 100644
38629--- a/drivers/bluetooth/btwilink.c
38630+++ b/drivers/bluetooth/btwilink.c
38631@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38632
38633 static int bt_ti_probe(struct platform_device *pdev)
38634 {
38635- static struct ti_st *hst;
38636+ struct ti_st *hst;
38637 struct hci_dev *hdev;
38638 int err;
38639
38640diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38641index 5d28a45..a538f90 100644
38642--- a/drivers/cdrom/cdrom.c
38643+++ b/drivers/cdrom/cdrom.c
38644@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38645 ENSURE(reset, CDC_RESET);
38646 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38647 cdi->mc_flags = 0;
38648- cdo->n_minors = 0;
38649 cdi->options = CDO_USE_FFLAGS;
38650
38651 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38652@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38653 else
38654 cdi->cdda_method = CDDA_OLD;
38655
38656- if (!cdo->generic_packet)
38657- cdo->generic_packet = cdrom_dummy_generic_packet;
38658+ if (!cdo->generic_packet) {
38659+ pax_open_kernel();
38660+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38661+ pax_close_kernel();
38662+ }
38663
38664 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38665 mutex_lock(&cdrom_mutex);
38666@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38667 if (cdi->exit)
38668 cdi->exit(cdi);
38669
38670- cdi->ops->n_minors--;
38671 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38672 }
38673
38674@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38675 */
38676 nr = nframes;
38677 do {
38678- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38679+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38680 if (cgc.buffer)
38681 break;
38682
38683@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38684 struct cdrom_device_info *cdi;
38685 int ret;
38686
38687- ret = scnprintf(info + *pos, max_size - *pos, header);
38688+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38689 if (!ret)
38690 return 1;
38691
38692diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38693index 584bc31..e64a12c 100644
38694--- a/drivers/cdrom/gdrom.c
38695+++ b/drivers/cdrom/gdrom.c
38696@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38697 .audio_ioctl = gdrom_audio_ioctl,
38698 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38699 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38700- .n_minors = 1,
38701 };
38702
38703 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38704diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38705index a4af822..ed58cd1 100644
38706--- a/drivers/char/Kconfig
38707+++ b/drivers/char/Kconfig
38708@@ -17,7 +17,8 @@ config DEVMEM
38709
38710 config DEVKMEM
38711 bool "/dev/kmem virtual device support"
38712- default y
38713+ default n
38714+ depends on !GRKERNSEC_KMEM
38715 help
38716 Say Y here if you want to support the /dev/kmem device. The
38717 /dev/kmem device is rarely used, but can be used for certain
38718@@ -586,6 +587,7 @@ config DEVPORT
38719 bool
38720 depends on !M68K
38721 depends on ISA || PCI
38722+ depends on !GRKERNSEC_KMEM
38723 default y
38724
38725 source "drivers/s390/char/Kconfig"
38726diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38727index a48e05b..6bac831 100644
38728--- a/drivers/char/agp/compat_ioctl.c
38729+++ b/drivers/char/agp/compat_ioctl.c
38730@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38731 return -ENOMEM;
38732 }
38733
38734- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38735+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38736 sizeof(*usegment) * ureserve.seg_count)) {
38737 kfree(usegment);
38738 kfree(ksegment);
38739diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38740index 09f17eb..8531d2f 100644
38741--- a/drivers/char/agp/frontend.c
38742+++ b/drivers/char/agp/frontend.c
38743@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38744 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38745 return -EFAULT;
38746
38747- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38748+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38749 return -EFAULT;
38750
38751 client = agp_find_client_by_pid(reserve.pid);
38752@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38753 if (segment == NULL)
38754 return -ENOMEM;
38755
38756- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38757+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38758 sizeof(struct agp_segment) * reserve.seg_count)) {
38759 kfree(segment);
38760 return -EFAULT;
38761diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38762index 4f94375..413694e 100644
38763--- a/drivers/char/genrtc.c
38764+++ b/drivers/char/genrtc.c
38765@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38766 switch (cmd) {
38767
38768 case RTC_PLL_GET:
38769+ memset(&pll, 0, sizeof(pll));
38770 if (get_rtc_pll(&pll))
38771 return -EINVAL;
38772 else
38773diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38774index 5c0baa9..44011b1 100644
38775--- a/drivers/char/hpet.c
38776+++ b/drivers/char/hpet.c
38777@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38778 }
38779
38780 static int
38781-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38782+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38783 struct hpet_info *info)
38784 {
38785 struct hpet_timer __iomem *timer;
38786diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
38787index 3c1a123..a33c99f 100644
38788--- a/drivers/char/i8k.c
38789+++ b/drivers/char/i8k.c
38790@@ -790,7 +790,7 @@ static const struct i8k_config_data i8k_config_data[] = {
38791 },
38792 };
38793
38794-static struct dmi_system_id i8k_dmi_table[] __initdata = {
38795+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
38796 {
38797 .ident = "Dell Inspiron",
38798 .matches = {
38799diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38800index bf75f63..359fa10 100644
38801--- a/drivers/char/ipmi/ipmi_msghandler.c
38802+++ b/drivers/char/ipmi/ipmi_msghandler.c
38803@@ -436,7 +436,7 @@ struct ipmi_smi {
38804 struct proc_dir_entry *proc_dir;
38805 char proc_dir_name[10];
38806
38807- atomic_t stats[IPMI_NUM_STATS];
38808+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38809
38810 /*
38811 * run_to_completion duplicate of smb_info, smi_info
38812@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
38813 static DEFINE_MUTEX(smi_watchers_mutex);
38814
38815 #define ipmi_inc_stat(intf, stat) \
38816- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38817+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38818 #define ipmi_get_stat(intf, stat) \
38819- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38820+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38821
38822 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
38823 "ACPI", "SMBIOS", "PCI",
38824@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38825 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38826 init_waitqueue_head(&intf->waitq);
38827 for (i = 0; i < IPMI_NUM_STATS; i++)
38828- atomic_set(&intf->stats[i], 0);
38829+ atomic_set_unchecked(&intf->stats[i], 0);
38830
38831 intf->proc_dir = NULL;
38832
38833diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38834index 8a45e92..e41b1c7 100644
38835--- a/drivers/char/ipmi/ipmi_si_intf.c
38836+++ b/drivers/char/ipmi/ipmi_si_intf.c
38837@@ -289,7 +289,7 @@ struct smi_info {
38838 unsigned char slave_addr;
38839
38840 /* Counters and things for the proc filesystem. */
38841- atomic_t stats[SI_NUM_STATS];
38842+ atomic_unchecked_t stats[SI_NUM_STATS];
38843
38844 struct task_struct *thread;
38845
38846@@ -298,9 +298,9 @@ struct smi_info {
38847 };
38848
38849 #define smi_inc_stat(smi, stat) \
38850- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38851+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38852 #define smi_get_stat(smi, stat) \
38853- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38854+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38855
38856 #define SI_MAX_PARMS 4
38857
38858@@ -3500,7 +3500,7 @@ static int try_smi_init(struct smi_info *new_smi)
38859 atomic_set(&new_smi->req_events, 0);
38860 new_smi->run_to_completion = false;
38861 for (i = 0; i < SI_NUM_STATS; i++)
38862- atomic_set(&new_smi->stats[i], 0);
38863+ atomic_set_unchecked(&new_smi->stats[i], 0);
38864
38865 new_smi->interrupt_disabled = true;
38866 atomic_set(&new_smi->need_watch, 0);
38867diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38868index 6b1721f..fda9398 100644
38869--- a/drivers/char/mem.c
38870+++ b/drivers/char/mem.c
38871@@ -18,6 +18,7 @@
38872 #include <linux/raw.h>
38873 #include <linux/tty.h>
38874 #include <linux/capability.h>
38875+#include <linux/security.h>
38876 #include <linux/ptrace.h>
38877 #include <linux/device.h>
38878 #include <linux/highmem.h>
38879@@ -36,6 +37,10 @@
38880
38881 #define DEVPORT_MINOR 4
38882
38883+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38884+extern const struct file_operations grsec_fops;
38885+#endif
38886+
38887 static inline unsigned long size_inside_page(unsigned long start,
38888 unsigned long size)
38889 {
38890@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38891
38892 while (cursor < to) {
38893 if (!devmem_is_allowed(pfn)) {
38894+#ifdef CONFIG_GRKERNSEC_KMEM
38895+ gr_handle_mem_readwrite(from, to);
38896+#else
38897 printk(KERN_INFO
38898 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38899 current->comm, from, to);
38900+#endif
38901 return 0;
38902 }
38903 cursor += PAGE_SIZE;
38904@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38905 }
38906 return 1;
38907 }
38908+#elif defined(CONFIG_GRKERNSEC_KMEM)
38909+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38910+{
38911+ return 0;
38912+}
38913 #else
38914 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38915 {
38916@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38917 #endif
38918
38919 while (count > 0) {
38920- unsigned long remaining;
38921+ unsigned long remaining = 0;
38922+ char *temp;
38923
38924 sz = size_inside_page(p, count);
38925
38926@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38927 if (!ptr)
38928 return -EFAULT;
38929
38930- remaining = copy_to_user(buf, ptr, sz);
38931+#ifdef CONFIG_PAX_USERCOPY
38932+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38933+ if (!temp) {
38934+ unxlate_dev_mem_ptr(p, ptr);
38935+ return -ENOMEM;
38936+ }
38937+ remaining = probe_kernel_read(temp, ptr, sz);
38938+#else
38939+ temp = ptr;
38940+#endif
38941+
38942+ if (!remaining)
38943+ remaining = copy_to_user(buf, temp, sz);
38944+
38945+#ifdef CONFIG_PAX_USERCOPY
38946+ kfree(temp);
38947+#endif
38948+
38949 unxlate_dev_mem_ptr(p, ptr);
38950 if (remaining)
38951 return -EFAULT;
38952@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38953 size_t count, loff_t *ppos)
38954 {
38955 unsigned long p = *ppos;
38956- ssize_t low_count, read, sz;
38957+ ssize_t low_count, read, sz, err = 0;
38958 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38959- int err = 0;
38960
38961 read = 0;
38962 if (p < (unsigned long) high_memory) {
38963@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38964 }
38965 #endif
38966 while (low_count > 0) {
38967+ char *temp;
38968+
38969 sz = size_inside_page(p, low_count);
38970
38971 /*
38972@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38973 */
38974 kbuf = xlate_dev_kmem_ptr((void *)p);
38975
38976- if (copy_to_user(buf, kbuf, sz))
38977+#ifdef CONFIG_PAX_USERCOPY
38978+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38979+ if (!temp)
38980+ return -ENOMEM;
38981+ err = probe_kernel_read(temp, kbuf, sz);
38982+#else
38983+ temp = kbuf;
38984+#endif
38985+
38986+ if (!err)
38987+ err = copy_to_user(buf, temp, sz);
38988+
38989+#ifdef CONFIG_PAX_USERCOPY
38990+ kfree(temp);
38991+#endif
38992+
38993+ if (err)
38994 return -EFAULT;
38995 buf += sz;
38996 p += sz;
38997@@ -802,6 +851,9 @@ static const struct memdev {
38998 #ifdef CONFIG_PRINTK
38999 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
39000 #endif
39001+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39002+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
39003+#endif
39004 };
39005
39006 static int memory_open(struct inode *inode, struct file *filp)
39007@@ -863,7 +915,7 @@ static int __init chr_dev_init(void)
39008 continue;
39009
39010 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
39011- NULL, devlist[minor].name);
39012+ NULL, "%s", devlist[minor].name);
39013 }
39014
39015 return tty_init();
39016diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
39017index 9df78e2..01ba9ae 100644
39018--- a/drivers/char/nvram.c
39019+++ b/drivers/char/nvram.c
39020@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
39021
39022 spin_unlock_irq(&rtc_lock);
39023
39024- if (copy_to_user(buf, contents, tmp - contents))
39025+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
39026 return -EFAULT;
39027
39028 *ppos = i;
39029diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
39030index 0ea9986..e7b07e4 100644
39031--- a/drivers/char/pcmcia/synclink_cs.c
39032+++ b/drivers/char/pcmcia/synclink_cs.c
39033@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39034
39035 if (debug_level >= DEBUG_LEVEL_INFO)
39036 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
39037- __FILE__, __LINE__, info->device_name, port->count);
39038+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
39039
39040 if (tty_port_close_start(port, tty, filp) == 0)
39041 goto cleanup;
39042@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39043 cleanup:
39044 if (debug_level >= DEBUG_LEVEL_INFO)
39045 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39046- tty->driver->name, port->count);
39047+ tty->driver->name, atomic_read(&port->count));
39048 }
39049
39050 /* Wait until the transmitter is empty.
39051@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39052
39053 if (debug_level >= DEBUG_LEVEL_INFO)
39054 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39055- __FILE__, __LINE__, tty->driver->name, port->count);
39056+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39057
39058 /* If port is closing, signal caller to try again */
39059 if (port->flags & ASYNC_CLOSING){
39060@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39061 goto cleanup;
39062 }
39063 spin_lock(&port->lock);
39064- port->count++;
39065+ atomic_inc(&port->count);
39066 spin_unlock(&port->lock);
39067 spin_unlock_irqrestore(&info->netlock, flags);
39068
39069- if (port->count == 1) {
39070+ if (atomic_read(&port->count) == 1) {
39071 /* 1st open on this device, init hardware */
39072 retval = startup(info, tty);
39073 if (retval < 0)
39074@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39075 unsigned short new_crctype;
39076
39077 /* return error if TTY interface open */
39078- if (info->port.count)
39079+ if (atomic_read(&info->port.count))
39080 return -EBUSY;
39081
39082 switch (encoding)
39083@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39084
39085 /* arbitrate between network and tty opens */
39086 spin_lock_irqsave(&info->netlock, flags);
39087- if (info->port.count != 0 || info->netcount != 0) {
39088+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39089 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39090 spin_unlock_irqrestore(&info->netlock, flags);
39091 return -EBUSY;
39092@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39093 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39094
39095 /* return error if TTY interface open */
39096- if (info->port.count)
39097+ if (atomic_read(&info->port.count))
39098 return -EBUSY;
39099
39100 if (cmd != SIOCWANDEV)
39101diff --git a/drivers/char/random.c b/drivers/char/random.c
39102index 9cd6968..6416f00 100644
39103--- a/drivers/char/random.c
39104+++ b/drivers/char/random.c
39105@@ -289,9 +289,6 @@
39106 /*
39107 * To allow fractional bits to be tracked, the entropy_count field is
39108 * denominated in units of 1/8th bits.
39109- *
39110- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39111- * credit_entropy_bits() needs to be 64 bits wide.
39112 */
39113 #define ENTROPY_SHIFT 3
39114 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39115@@ -439,9 +436,9 @@ struct entropy_store {
39116 };
39117
39118 static void push_to_pool(struct work_struct *work);
39119-static __u32 input_pool_data[INPUT_POOL_WORDS];
39120-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39121-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39122+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39123+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39124+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39125
39126 static struct entropy_store input_pool = {
39127 .poolinfo = &poolinfo_table[0],
39128@@ -635,7 +632,7 @@ retry:
39129 /* The +2 corresponds to the /4 in the denominator */
39130
39131 do {
39132- unsigned int anfrac = min(pnfrac, pool_size/2);
39133+ u64 anfrac = min(pnfrac, pool_size/2);
39134 unsigned int add =
39135 ((pool_size - entropy_count)*anfrac*3) >> s;
39136
39137@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39138
39139 extract_buf(r, tmp);
39140 i = min_t(int, nbytes, EXTRACT_SIZE);
39141- if (copy_to_user(buf, tmp, i)) {
39142+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39143 ret = -EFAULT;
39144 break;
39145 }
39146@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39147 static int proc_do_uuid(struct ctl_table *table, int write,
39148 void __user *buffer, size_t *lenp, loff_t *ppos)
39149 {
39150- struct ctl_table fake_table;
39151+ ctl_table_no_const fake_table;
39152 unsigned char buf[64], tmp_uuid[16], *uuid;
39153
39154 uuid = table->data;
39155@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39156 static int proc_do_entropy(struct ctl_table *table, int write,
39157 void __user *buffer, size_t *lenp, loff_t *ppos)
39158 {
39159- struct ctl_table fake_table;
39160+ ctl_table_no_const fake_table;
39161 int entropy_count;
39162
39163 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39164diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39165index e496dae..3db53b6 100644
39166--- a/drivers/char/sonypi.c
39167+++ b/drivers/char/sonypi.c
39168@@ -54,6 +54,7 @@
39169
39170 #include <asm/uaccess.h>
39171 #include <asm/io.h>
39172+#include <asm/local.h>
39173
39174 #include <linux/sonypi.h>
39175
39176@@ -490,7 +491,7 @@ static struct sonypi_device {
39177 spinlock_t fifo_lock;
39178 wait_queue_head_t fifo_proc_list;
39179 struct fasync_struct *fifo_async;
39180- int open_count;
39181+ local_t open_count;
39182 int model;
39183 struct input_dev *input_jog_dev;
39184 struct input_dev *input_key_dev;
39185@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39186 static int sonypi_misc_release(struct inode *inode, struct file *file)
39187 {
39188 mutex_lock(&sonypi_device.lock);
39189- sonypi_device.open_count--;
39190+ local_dec(&sonypi_device.open_count);
39191 mutex_unlock(&sonypi_device.lock);
39192 return 0;
39193 }
39194@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39195 {
39196 mutex_lock(&sonypi_device.lock);
39197 /* Flush input queue on first open */
39198- if (!sonypi_device.open_count)
39199+ if (!local_read(&sonypi_device.open_count))
39200 kfifo_reset(&sonypi_device.fifo);
39201- sonypi_device.open_count++;
39202+ local_inc(&sonypi_device.open_count);
39203 mutex_unlock(&sonypi_device.lock);
39204
39205 return 0;
39206@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39207
39208 static struct platform_device *sonypi_platform_device;
39209
39210-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39211+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39212 {
39213 .ident = "Sony Vaio",
39214 .matches = {
39215diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39216index 565a947..dcdc06e 100644
39217--- a/drivers/char/tpm/tpm_acpi.c
39218+++ b/drivers/char/tpm/tpm_acpi.c
39219@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39220 virt = acpi_os_map_iomem(start, len);
39221 if (!virt) {
39222 kfree(log->bios_event_log);
39223+ log->bios_event_log = NULL;
39224 printk("%s: ERROR - Unable to map memory\n", __func__);
39225 return -EIO;
39226 }
39227
39228- memcpy_fromio(log->bios_event_log, virt, len);
39229+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39230
39231 acpi_os_unmap_iomem(virt, len);
39232 return 0;
39233diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39234index 3a56a13..f8cbd25 100644
39235--- a/drivers/char/tpm/tpm_eventlog.c
39236+++ b/drivers/char/tpm/tpm_eventlog.c
39237@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39238 event = addr;
39239
39240 if ((event->event_type == 0 && event->event_size == 0) ||
39241- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39242+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39243 return NULL;
39244
39245 return addr;
39246@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39247 return NULL;
39248
39249 if ((event->event_type == 0 && event->event_size == 0) ||
39250- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39251+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39252 return NULL;
39253
39254 (*pos)++;
39255@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39256 int i;
39257
39258 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39259- seq_putc(m, data[i]);
39260+ if (!seq_putc(m, data[i]))
39261+ return -EFAULT;
39262
39263 return 0;
39264 }
39265diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39266index 50754d20..9561cdc 100644
39267--- a/drivers/char/virtio_console.c
39268+++ b/drivers/char/virtio_console.c
39269@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39270 if (to_user) {
39271 ssize_t ret;
39272
39273- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39274+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39275 if (ret)
39276 return -EFAULT;
39277 } else {
39278@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39279 if (!port_has_data(port) && !port->host_connected)
39280 return 0;
39281
39282- return fill_readbuf(port, ubuf, count, true);
39283+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39284 }
39285
39286 static int wait_port_writable(struct port *port, bool nonblock)
39287diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39288index 956b7e5..b655045 100644
39289--- a/drivers/clk/clk-composite.c
39290+++ b/drivers/clk/clk-composite.c
39291@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39292 struct clk *clk;
39293 struct clk_init_data init;
39294 struct clk_composite *composite;
39295- struct clk_ops *clk_composite_ops;
39296+ clk_ops_no_const *clk_composite_ops;
39297
39298 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39299 if (!composite) {
39300diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c
39301index 69a094c..1fa2a8d 100644
39302--- a/drivers/clk/clk-mux.c
39303+++ b/drivers/clk/clk-mux.c
39304@@ -114,7 +114,7 @@ const struct clk_ops clk_mux_ro_ops = {
39305 EXPORT_SYMBOL_GPL(clk_mux_ro_ops);
39306
39307 struct clk *clk_register_mux_table(struct device *dev, const char *name,
39308- const char **parent_names, u8 num_parents, unsigned long flags,
39309+ const char * const *parent_names, u8 num_parents, unsigned long flags,
39310 void __iomem *reg, u8 shift, u32 mask,
39311 u8 clk_mux_flags, u32 *table, spinlock_t *lock)
39312 {
39313@@ -166,7 +166,7 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name,
39314 EXPORT_SYMBOL_GPL(clk_register_mux_table);
39315
39316 struct clk *clk_register_mux(struct device *dev, const char *name,
39317- const char **parent_names, u8 num_parents, unsigned long flags,
39318+ const char * const *parent_names, u8 num_parents, unsigned long flags,
39319 void __iomem *reg, u8 shift, u8 width,
39320 u8 clk_mux_flags, spinlock_t *lock)
39321 {
39322diff --git a/drivers/clk/samsung/clk.h b/drivers/clk/samsung/clk.h
39323index e4c7538..9d5c18a 100644
39324--- a/drivers/clk/samsung/clk.h
39325+++ b/drivers/clk/samsung/clk.h
39326@@ -121,7 +121,7 @@ struct samsung_mux_clock {
39327 unsigned int id;
39328 const char *dev_name;
39329 const char *name;
39330- const char **parent_names;
39331+ const char * const *parent_names;
39332 u8 num_parents;
39333 unsigned long flags;
39334 unsigned long offset;
39335@@ -260,7 +260,7 @@ struct samsung_gate_clock {
39336 #define GATE_DA(_id, dname, cname, pname, o, b, f, gf, a) \
39337 __GATE(_id, dname, cname, pname, o, b, f, gf, a)
39338
39339-#define PNAME(x) static const char *x[] __initdata
39340+#define PNAME(x) static const char * const x[] __initconst
39341
39342 /**
39343 * struct samsung_clk_reg_dump: register dump of clock controller registers.
39344diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39345index dd3a78c..386d49c 100644
39346--- a/drivers/clk/socfpga/clk-gate.c
39347+++ b/drivers/clk/socfpga/clk-gate.c
39348@@ -22,6 +22,7 @@
39349 #include <linux/mfd/syscon.h>
39350 #include <linux/of.h>
39351 #include <linux/regmap.h>
39352+#include <asm/pgtable.h>
39353
39354 #include "clk.h"
39355
39356@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39357 return 0;
39358 }
39359
39360-static struct clk_ops gateclk_ops = {
39361+static clk_ops_no_const gateclk_ops __read_only = {
39362 .prepare = socfpga_clk_prepare,
39363 .recalc_rate = socfpga_clk_recalc_rate,
39364 .get_parent = socfpga_clk_get_parent,
39365@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39366 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39367 socfpga_clk->hw.bit_idx = clk_gate[1];
39368
39369- gateclk_ops.enable = clk_gate_ops.enable;
39370- gateclk_ops.disable = clk_gate_ops.disable;
39371+ pax_open_kernel();
39372+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39373+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39374+ pax_close_kernel();
39375 }
39376
39377 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39378diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39379index de6da95..c98278b 100644
39380--- a/drivers/clk/socfpga/clk-pll.c
39381+++ b/drivers/clk/socfpga/clk-pll.c
39382@@ -21,6 +21,7 @@
39383 #include <linux/io.h>
39384 #include <linux/of.h>
39385 #include <linux/of_address.h>
39386+#include <asm/pgtable.h>
39387
39388 #include "clk.h"
39389
39390@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39391 CLK_MGR_PLL_CLK_SRC_MASK;
39392 }
39393
39394-static struct clk_ops clk_pll_ops = {
39395+static clk_ops_no_const clk_pll_ops __read_only = {
39396 .recalc_rate = clk_pll_recalc_rate,
39397 .get_parent = clk_pll_get_parent,
39398 };
39399@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39400 pll_clk->hw.hw.init = &init;
39401
39402 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39403- clk_pll_ops.enable = clk_gate_ops.enable;
39404- clk_pll_ops.disable = clk_gate_ops.disable;
39405+ pax_open_kernel();
39406+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39407+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39408+ pax_close_kernel();
39409
39410 clk = clk_register(NULL, &pll_clk->hw.hw);
39411 if (WARN_ON(IS_ERR(clk))) {
39412diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39413index b0c18ed..1713a80 100644
39414--- a/drivers/cpufreq/acpi-cpufreq.c
39415+++ b/drivers/cpufreq/acpi-cpufreq.c
39416@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39417 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39418 per_cpu(acfreq_data, cpu) = data;
39419
39420- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39421- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39422+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39423+ pax_open_kernel();
39424+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39425+ pax_close_kernel();
39426+ }
39427
39428 result = acpi_processor_register_performance(data->acpi_data, cpu);
39429 if (result)
39430@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39431 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39432 break;
39433 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39434- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39435+ pax_open_kernel();
39436+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39437+ pax_close_kernel();
39438 break;
39439 default:
39440 break;
39441@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39442 if (!msrs)
39443 return;
39444
39445- acpi_cpufreq_driver.boost_supported = true;
39446- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39447+ pax_open_kernel();
39448+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39449+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39450+ pax_close_kernel();
39451
39452 cpu_notifier_register_begin();
39453
39454diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39455index bab67db..91af7e3 100644
39456--- a/drivers/cpufreq/cpufreq-dt.c
39457+++ b/drivers/cpufreq/cpufreq-dt.c
39458@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39459 if (!IS_ERR(cpu_reg))
39460 regulator_put(cpu_reg);
39461
39462- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39463+ pax_open_kernel();
39464+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39465+ pax_close_kernel();
39466
39467 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39468 if (ret)
39469diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39470index 8ae655c..3141442 100644
39471--- a/drivers/cpufreq/cpufreq.c
39472+++ b/drivers/cpufreq/cpufreq.c
39473@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39474 }
39475
39476 mutex_lock(&cpufreq_governor_mutex);
39477- list_del(&governor->governor_list);
39478+ pax_list_del(&governor->governor_list);
39479 mutex_unlock(&cpufreq_governor_mutex);
39480 return;
39481 }
39482@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39483 return NOTIFY_OK;
39484 }
39485
39486-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39487+static struct notifier_block cpufreq_cpu_notifier = {
39488 .notifier_call = cpufreq_cpu_callback,
39489 };
39490
39491@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39492 return 0;
39493
39494 write_lock_irqsave(&cpufreq_driver_lock, flags);
39495- cpufreq_driver->boost_enabled = state;
39496+ pax_open_kernel();
39497+ *(bool *)&cpufreq_driver->boost_enabled = state;
39498+ pax_close_kernel();
39499 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39500
39501 ret = cpufreq_driver->set_boost(state);
39502 if (ret) {
39503 write_lock_irqsave(&cpufreq_driver_lock, flags);
39504- cpufreq_driver->boost_enabled = !state;
39505+ pax_open_kernel();
39506+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39507+ pax_close_kernel();
39508 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39509
39510 pr_err("%s: Cannot %s BOOST\n",
39511@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39512 cpufreq_driver = driver_data;
39513 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39514
39515- if (driver_data->setpolicy)
39516- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39517+ if (driver_data->setpolicy) {
39518+ pax_open_kernel();
39519+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39520+ pax_close_kernel();
39521+ }
39522
39523 if (cpufreq_boost_supported()) {
39524 /*
39525 * Check if driver provides function to enable boost -
39526 * if not, use cpufreq_boost_set_sw as default
39527 */
39528- if (!cpufreq_driver->set_boost)
39529- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39530+ if (!cpufreq_driver->set_boost) {
39531+ pax_open_kernel();
39532+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39533+ pax_close_kernel();
39534+ }
39535
39536 ret = cpufreq_sysfs_create_file(&boost.attr);
39537 if (ret) {
39538diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39539index 1b44496..b80ff5e 100644
39540--- a/drivers/cpufreq/cpufreq_governor.c
39541+++ b/drivers/cpufreq/cpufreq_governor.c
39542@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39543 struct dbs_data *dbs_data;
39544 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39545 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39546- struct od_ops *od_ops = NULL;
39547+ const struct od_ops *od_ops = NULL;
39548 struct od_dbs_tuners *od_tuners = NULL;
39549 struct cs_dbs_tuners *cs_tuners = NULL;
39550 struct cpu_dbs_common_info *cpu_cdbs;
39551@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39552
39553 if ((cdata->governor == GOV_CONSERVATIVE) &&
39554 (!policy->governor->initialized)) {
39555- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39556+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39557
39558 cpufreq_register_notifier(cs_ops->notifier_block,
39559 CPUFREQ_TRANSITION_NOTIFIER);
39560@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39561
39562 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39563 (policy->governor->initialized == 1)) {
39564- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39565+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39566
39567 cpufreq_unregister_notifier(cs_ops->notifier_block,
39568 CPUFREQ_TRANSITION_NOTIFIER);
39569diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39570index cc401d1..8197340 100644
39571--- a/drivers/cpufreq/cpufreq_governor.h
39572+++ b/drivers/cpufreq/cpufreq_governor.h
39573@@ -212,7 +212,7 @@ struct common_dbs_data {
39574 void (*exit)(struct dbs_data *dbs_data);
39575
39576 /* Governor specific ops, see below */
39577- void *gov_ops;
39578+ const void *gov_ops;
39579 };
39580
39581 /* Governor Per policy data */
39582@@ -232,7 +232,7 @@ struct od_ops {
39583 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39584 unsigned int freq_next, unsigned int relation);
39585 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39586-};
39587+} __no_const;
39588
39589 struct cs_ops {
39590 struct notifier_block *notifier_block;
39591diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39592index ad3f38f..8f086cd 100644
39593--- a/drivers/cpufreq/cpufreq_ondemand.c
39594+++ b/drivers/cpufreq/cpufreq_ondemand.c
39595@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39596
39597 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39598
39599-static struct od_ops od_ops = {
39600+static struct od_ops od_ops __read_only = {
39601 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39602 .powersave_bias_target = generic_powersave_bias_target,
39603 .freq_increase = dbs_freq_increase,
39604@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39605 (struct cpufreq_policy *, unsigned int, unsigned int),
39606 unsigned int powersave_bias)
39607 {
39608- od_ops.powersave_bias_target = f;
39609+ pax_open_kernel();
39610+ *(void **)&od_ops.powersave_bias_target = f;
39611+ pax_close_kernel();
39612 od_set_powersave_bias(powersave_bias);
39613 }
39614 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39615
39616 void od_unregister_powersave_bias_handler(void)
39617 {
39618- od_ops.powersave_bias_target = generic_powersave_bias_target;
39619+ pax_open_kernel();
39620+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39621+ pax_close_kernel();
39622 od_set_powersave_bias(0);
39623 }
39624 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39625diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39626index 6f9d27f..14385d1 100644
39627--- a/drivers/cpufreq/intel_pstate.c
39628+++ b/drivers/cpufreq/intel_pstate.c
39629@@ -134,10 +134,10 @@ struct pstate_funcs {
39630 struct cpu_defaults {
39631 struct pstate_adjust_policy pid_policy;
39632 struct pstate_funcs funcs;
39633-};
39634+} __do_const;
39635
39636 static struct pstate_adjust_policy pid_params;
39637-static struct pstate_funcs pstate_funcs;
39638+static struct pstate_funcs *pstate_funcs;
39639 static int hwp_active;
39640
39641 struct perf_limits {
39642@@ -722,18 +722,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39643
39644 cpu->pstate.current_pstate = pstate;
39645
39646- pstate_funcs.set(cpu, pstate);
39647+ pstate_funcs->set(cpu, pstate);
39648 }
39649
39650 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39651 {
39652- cpu->pstate.min_pstate = pstate_funcs.get_min();
39653- cpu->pstate.max_pstate = pstate_funcs.get_max();
39654- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39655- cpu->pstate.scaling = pstate_funcs.get_scaling();
39656+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39657+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39658+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39659+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39660
39661- if (pstate_funcs.get_vid)
39662- pstate_funcs.get_vid(cpu);
39663+ if (pstate_funcs->get_vid)
39664+ pstate_funcs->get_vid(cpu);
39665 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39666 }
39667
39668@@ -1057,15 +1057,15 @@ static unsigned int force_load;
39669
39670 static int intel_pstate_msrs_not_valid(void)
39671 {
39672- if (!pstate_funcs.get_max() ||
39673- !pstate_funcs.get_min() ||
39674- !pstate_funcs.get_turbo())
39675+ if (!pstate_funcs->get_max() ||
39676+ !pstate_funcs->get_min() ||
39677+ !pstate_funcs->get_turbo())
39678 return -ENODEV;
39679
39680 return 0;
39681 }
39682
39683-static void copy_pid_params(struct pstate_adjust_policy *policy)
39684+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39685 {
39686 pid_params.sample_rate_ms = policy->sample_rate_ms;
39687 pid_params.p_gain_pct = policy->p_gain_pct;
39688@@ -1077,12 +1077,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39689
39690 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39691 {
39692- pstate_funcs.get_max = funcs->get_max;
39693- pstate_funcs.get_min = funcs->get_min;
39694- pstate_funcs.get_turbo = funcs->get_turbo;
39695- pstate_funcs.get_scaling = funcs->get_scaling;
39696- pstate_funcs.set = funcs->set;
39697- pstate_funcs.get_vid = funcs->get_vid;
39698+ pstate_funcs = funcs;
39699 }
39700
39701 #if IS_ENABLED(CONFIG_ACPI)
39702diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39703index 529cfd9..0e28fff 100644
39704--- a/drivers/cpufreq/p4-clockmod.c
39705+++ b/drivers/cpufreq/p4-clockmod.c
39706@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39707 case 0x0F: /* Core Duo */
39708 case 0x16: /* Celeron Core */
39709 case 0x1C: /* Atom */
39710- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39711+ pax_open_kernel();
39712+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39713+ pax_close_kernel();
39714 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39715 case 0x0D: /* Pentium M (Dothan) */
39716- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39717+ pax_open_kernel();
39718+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39719+ pax_close_kernel();
39720 /* fall through */
39721 case 0x09: /* Pentium M (Banias) */
39722 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39723@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39724
39725 /* on P-4s, the TSC runs with constant frequency independent whether
39726 * throttling is active or not. */
39727- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39728+ pax_open_kernel();
39729+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39730+ pax_close_kernel();
39731
39732 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39733 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39734diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39735index 9bb42ba..b01b4a2 100644
39736--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39737+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39738@@ -18,14 +18,12 @@
39739 #include <asm/head.h>
39740 #include <asm/timer.h>
39741
39742-static struct cpufreq_driver *cpufreq_us3_driver;
39743-
39744 struct us3_freq_percpu_info {
39745 struct cpufreq_frequency_table table[4];
39746 };
39747
39748 /* Indexed by cpu number. */
39749-static struct us3_freq_percpu_info *us3_freq_table;
39750+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39751
39752 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39753 * in the Safari config register.
39754@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39755
39756 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39757 {
39758- if (cpufreq_us3_driver)
39759- us3_freq_target(policy, 0);
39760+ us3_freq_target(policy, 0);
39761
39762 return 0;
39763 }
39764
39765+static int __init us3_freq_init(void);
39766+static void __exit us3_freq_exit(void);
39767+
39768+static struct cpufreq_driver cpufreq_us3_driver = {
39769+ .init = us3_freq_cpu_init,
39770+ .verify = cpufreq_generic_frequency_table_verify,
39771+ .target_index = us3_freq_target,
39772+ .get = us3_freq_get,
39773+ .exit = us3_freq_cpu_exit,
39774+ .name = "UltraSPARC-III",
39775+
39776+};
39777+
39778 static int __init us3_freq_init(void)
39779 {
39780 unsigned long manuf, impl, ver;
39781- int ret;
39782
39783 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39784 return -ENODEV;
39785@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39786 (impl == CHEETAH_IMPL ||
39787 impl == CHEETAH_PLUS_IMPL ||
39788 impl == JAGUAR_IMPL ||
39789- impl == PANTHER_IMPL)) {
39790- struct cpufreq_driver *driver;
39791-
39792- ret = -ENOMEM;
39793- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39794- if (!driver)
39795- goto err_out;
39796-
39797- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39798- GFP_KERNEL);
39799- if (!us3_freq_table)
39800- goto err_out;
39801-
39802- driver->init = us3_freq_cpu_init;
39803- driver->verify = cpufreq_generic_frequency_table_verify;
39804- driver->target_index = us3_freq_target;
39805- driver->get = us3_freq_get;
39806- driver->exit = us3_freq_cpu_exit;
39807- strcpy(driver->name, "UltraSPARC-III");
39808-
39809- cpufreq_us3_driver = driver;
39810- ret = cpufreq_register_driver(driver);
39811- if (ret)
39812- goto err_out;
39813-
39814- return 0;
39815-
39816-err_out:
39817- if (driver) {
39818- kfree(driver);
39819- cpufreq_us3_driver = NULL;
39820- }
39821- kfree(us3_freq_table);
39822- us3_freq_table = NULL;
39823- return ret;
39824- }
39825+ impl == PANTHER_IMPL))
39826+ return cpufreq_register_driver(&cpufreq_us3_driver);
39827
39828 return -ENODEV;
39829 }
39830
39831 static void __exit us3_freq_exit(void)
39832 {
39833- if (cpufreq_us3_driver) {
39834- cpufreq_unregister_driver(cpufreq_us3_driver);
39835- kfree(cpufreq_us3_driver);
39836- cpufreq_us3_driver = NULL;
39837- kfree(us3_freq_table);
39838- us3_freq_table = NULL;
39839- }
39840+ cpufreq_unregister_driver(&cpufreq_us3_driver);
39841 }
39842
39843 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39844diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39845index 7d4a315..21bb886 100644
39846--- a/drivers/cpufreq/speedstep-centrino.c
39847+++ b/drivers/cpufreq/speedstep-centrino.c
39848@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39849 !cpu_has(cpu, X86_FEATURE_EST))
39850 return -ENODEV;
39851
39852- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39853- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39854+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39855+ pax_open_kernel();
39856+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39857+ pax_close_kernel();
39858+ }
39859
39860 if (policy->cpu != 0)
39861 return -ENODEV;
39862diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39863index 5db1478..e90e25e 100644
39864--- a/drivers/cpuidle/driver.c
39865+++ b/drivers/cpuidle/driver.c
39866@@ -193,7 +193,7 @@ static int poll_idle(struct cpuidle_device *dev,
39867
39868 static void poll_idle_init(struct cpuidle_driver *drv)
39869 {
39870- struct cpuidle_state *state = &drv->states[0];
39871+ cpuidle_state_no_const *state = &drv->states[0];
39872
39873 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39874 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39875diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39876index fb9f511..213e6cc 100644
39877--- a/drivers/cpuidle/governor.c
39878+++ b/drivers/cpuidle/governor.c
39879@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39880 mutex_lock(&cpuidle_lock);
39881 if (__cpuidle_find_governor(gov->name) == NULL) {
39882 ret = 0;
39883- list_add_tail(&gov->governor_list, &cpuidle_governors);
39884+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39885 if (!cpuidle_curr_governor ||
39886 cpuidle_curr_governor->rating < gov->rating)
39887 cpuidle_switch_governor(gov);
39888diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39889index 832a2c3..1794080 100644
39890--- a/drivers/cpuidle/sysfs.c
39891+++ b/drivers/cpuidle/sysfs.c
39892@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39893 NULL
39894 };
39895
39896-static struct attribute_group cpuidle_attr_group = {
39897+static attribute_group_no_const cpuidle_attr_group = {
39898 .attrs = cpuidle_default_attrs,
39899 .name = "cpuidle",
39900 };
39901diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39902index 8d2a772..33826c9 100644
39903--- a/drivers/crypto/hifn_795x.c
39904+++ b/drivers/crypto/hifn_795x.c
39905@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39906 MODULE_PARM_DESC(hifn_pll_ref,
39907 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39908
39909-static atomic_t hifn_dev_number;
39910+static atomic_unchecked_t hifn_dev_number;
39911
39912 #define ACRYPTO_OP_DECRYPT 0
39913 #define ACRYPTO_OP_ENCRYPT 1
39914@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39915 goto err_out_disable_pci_device;
39916
39917 snprintf(name, sizeof(name), "hifn%d",
39918- atomic_inc_return(&hifn_dev_number)-1);
39919+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
39920
39921 err = pci_request_regions(pdev, name);
39922 if (err)
39923diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39924index ca1b362..01cae6a 100644
39925--- a/drivers/devfreq/devfreq.c
39926+++ b/drivers/devfreq/devfreq.c
39927@@ -672,7 +672,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39928 goto err_out;
39929 }
39930
39931- list_add(&governor->node, &devfreq_governor_list);
39932+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39933
39934 list_for_each_entry(devfreq, &devfreq_list, node) {
39935 int ret = 0;
39936@@ -760,7 +760,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39937 }
39938 }
39939
39940- list_del(&governor->node);
39941+ pax_list_del((struct list_head *)&governor->node);
39942 err_out:
39943 mutex_unlock(&devfreq_list_lock);
39944
39945diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39946index 10fcaba..326f709 100644
39947--- a/drivers/dma/sh/shdma-base.c
39948+++ b/drivers/dma/sh/shdma-base.c
39949@@ -227,8 +227,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39950 schan->slave_id = -EINVAL;
39951 }
39952
39953- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39954- sdev->desc_size, GFP_KERNEL);
39955+ schan->desc = kcalloc(sdev->desc_size,
39956+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39957 if (!schan->desc) {
39958 ret = -ENOMEM;
39959 goto edescalloc;
39960diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39961index 11707df..2ea96f7 100644
39962--- a/drivers/dma/sh/shdmac.c
39963+++ b/drivers/dma/sh/shdmac.c
39964@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39965 return ret;
39966 }
39967
39968-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39969+static struct notifier_block sh_dmae_nmi_notifier = {
39970 .notifier_call = sh_dmae_nmi_handler,
39971
39972 /* Run before NMI debug handler and KGDB */
39973diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39974index 592af5f..bb1d583 100644
39975--- a/drivers/edac/edac_device.c
39976+++ b/drivers/edac/edac_device.c
39977@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39978 */
39979 int edac_device_alloc_index(void)
39980 {
39981- static atomic_t device_indexes = ATOMIC_INIT(0);
39982+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39983
39984- return atomic_inc_return(&device_indexes) - 1;
39985+ return atomic_inc_return_unchecked(&device_indexes) - 1;
39986 }
39987 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39988
39989diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39990index 112d63a..5443a61 100644
39991--- a/drivers/edac/edac_mc_sysfs.c
39992+++ b/drivers/edac/edac_mc_sysfs.c
39993@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
39994 struct dev_ch_attribute {
39995 struct device_attribute attr;
39996 int channel;
39997-};
39998+} __do_const;
39999
40000 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
40001 static struct dev_ch_attribute dev_attr_legacy_##_name = \
40002diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
40003index 2cf44b4d..6dd2dc7 100644
40004--- a/drivers/edac/edac_pci.c
40005+++ b/drivers/edac/edac_pci.c
40006@@ -29,7 +29,7 @@
40007
40008 static DEFINE_MUTEX(edac_pci_ctls_mutex);
40009 static LIST_HEAD(edac_pci_list);
40010-static atomic_t pci_indexes = ATOMIC_INIT(0);
40011+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
40012
40013 /*
40014 * edac_pci_alloc_ctl_info
40015@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
40016 */
40017 int edac_pci_alloc_index(void)
40018 {
40019- return atomic_inc_return(&pci_indexes) - 1;
40020+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
40021 }
40022 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
40023
40024diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
40025index 24d877f..4e30133 100644
40026--- a/drivers/edac/edac_pci_sysfs.c
40027+++ b/drivers/edac/edac_pci_sysfs.c
40028@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
40029 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
40030 static int edac_pci_poll_msec = 1000; /* one second workq period */
40031
40032-static atomic_t pci_parity_count = ATOMIC_INIT(0);
40033-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
40034+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
40035+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
40036
40037 static struct kobject *edac_pci_top_main_kobj;
40038 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
40039@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
40040 void *value;
40041 ssize_t(*show) (void *, char *);
40042 ssize_t(*store) (void *, const char *, size_t);
40043-};
40044+} __do_const;
40045
40046 /* Set of show/store abstract level functions for PCI Parity object */
40047 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40048@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40049 edac_printk(KERN_CRIT, EDAC_PCI,
40050 "Signaled System Error on %s\n",
40051 pci_name(dev));
40052- atomic_inc(&pci_nonparity_count);
40053+ atomic_inc_unchecked(&pci_nonparity_count);
40054 }
40055
40056 if (status & (PCI_STATUS_PARITY)) {
40057@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40058 "Master Data Parity Error on %s\n",
40059 pci_name(dev));
40060
40061- atomic_inc(&pci_parity_count);
40062+ atomic_inc_unchecked(&pci_parity_count);
40063 }
40064
40065 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40066@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40067 "Detected Parity Error on %s\n",
40068 pci_name(dev));
40069
40070- atomic_inc(&pci_parity_count);
40071+ atomic_inc_unchecked(&pci_parity_count);
40072 }
40073 }
40074
40075@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40076 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40077 "Signaled System Error on %s\n",
40078 pci_name(dev));
40079- atomic_inc(&pci_nonparity_count);
40080+ atomic_inc_unchecked(&pci_nonparity_count);
40081 }
40082
40083 if (status & (PCI_STATUS_PARITY)) {
40084@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40085 "Master Data Parity Error on "
40086 "%s\n", pci_name(dev));
40087
40088- atomic_inc(&pci_parity_count);
40089+ atomic_inc_unchecked(&pci_parity_count);
40090 }
40091
40092 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40093@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40094 "Detected Parity Error on %s\n",
40095 pci_name(dev));
40096
40097- atomic_inc(&pci_parity_count);
40098+ atomic_inc_unchecked(&pci_parity_count);
40099 }
40100 }
40101 }
40102@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40103 if (!check_pci_errors)
40104 return;
40105
40106- before_count = atomic_read(&pci_parity_count);
40107+ before_count = atomic_read_unchecked(&pci_parity_count);
40108
40109 /* scan all PCI devices looking for a Parity Error on devices and
40110 * bridges.
40111@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40112 /* Only if operator has selected panic on PCI Error */
40113 if (edac_pci_get_panic_on_pe()) {
40114 /* If the count is different 'after' from 'before' */
40115- if (before_count != atomic_read(&pci_parity_count))
40116+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40117 panic("EDAC: PCI Parity Error");
40118 }
40119 }
40120diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40121index c2359a1..8bd119d 100644
40122--- a/drivers/edac/mce_amd.h
40123+++ b/drivers/edac/mce_amd.h
40124@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40125 bool (*mc0_mce)(u16, u8);
40126 bool (*mc1_mce)(u16, u8);
40127 bool (*mc2_mce)(u16, u8);
40128-};
40129+} __no_const;
40130
40131 void amd_report_gart_errors(bool);
40132 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40133diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40134index 57ea7f4..af06b76 100644
40135--- a/drivers/firewire/core-card.c
40136+++ b/drivers/firewire/core-card.c
40137@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40138 const struct fw_card_driver *driver,
40139 struct device *device)
40140 {
40141- static atomic_t index = ATOMIC_INIT(-1);
40142+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40143
40144- card->index = atomic_inc_return(&index);
40145+ card->index = atomic_inc_return_unchecked(&index);
40146 card->driver = driver;
40147 card->device = device;
40148 card->current_tlabel = 0;
40149@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40150
40151 void fw_core_remove_card(struct fw_card *card)
40152 {
40153- struct fw_card_driver dummy_driver = dummy_driver_template;
40154+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40155
40156 card->driver->update_phy_reg(card, 4,
40157 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40158diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40159index f9e3aee..269dbdb 100644
40160--- a/drivers/firewire/core-device.c
40161+++ b/drivers/firewire/core-device.c
40162@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40163 struct config_rom_attribute {
40164 struct device_attribute attr;
40165 u32 key;
40166-};
40167+} __do_const;
40168
40169 static ssize_t show_immediate(struct device *dev,
40170 struct device_attribute *dattr, char *buf)
40171diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40172index d6a09b9..18e90dd 100644
40173--- a/drivers/firewire/core-transaction.c
40174+++ b/drivers/firewire/core-transaction.c
40175@@ -38,6 +38,7 @@
40176 #include <linux/timer.h>
40177 #include <linux/types.h>
40178 #include <linux/workqueue.h>
40179+#include <linux/sched.h>
40180
40181 #include <asm/byteorder.h>
40182
40183diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40184index e1480ff6..1a429bd 100644
40185--- a/drivers/firewire/core.h
40186+++ b/drivers/firewire/core.h
40187@@ -111,6 +111,7 @@ struct fw_card_driver {
40188
40189 int (*stop_iso)(struct fw_iso_context *ctx);
40190 };
40191+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40192
40193 void fw_card_initialize(struct fw_card *card,
40194 const struct fw_card_driver *driver, struct device *device);
40195diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40196index f51d376..b118e40 100644
40197--- a/drivers/firewire/ohci.c
40198+++ b/drivers/firewire/ohci.c
40199@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40200 be32_to_cpu(ohci->next_header));
40201 }
40202
40203+#ifndef CONFIG_GRKERNSEC
40204 if (param_remote_dma) {
40205 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40206 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40207 }
40208+#endif
40209
40210 spin_unlock_irq(&ohci->lock);
40211
40212@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40213 unsigned long flags;
40214 int n, ret = 0;
40215
40216+#ifndef CONFIG_GRKERNSEC
40217 if (param_remote_dma)
40218 return 0;
40219+#endif
40220
40221 /*
40222 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40223diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40224index 94a58a0..f5eba42 100644
40225--- a/drivers/firmware/dmi-id.c
40226+++ b/drivers/firmware/dmi-id.c
40227@@ -16,7 +16,7 @@
40228 struct dmi_device_attribute{
40229 struct device_attribute dev_attr;
40230 int field;
40231-};
40232+} __do_const;
40233 #define to_dmi_dev_attr(_dev_attr) \
40234 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40235
40236diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40237index d425374..1da1716 100644
40238--- a/drivers/firmware/efi/cper.c
40239+++ b/drivers/firmware/efi/cper.c
40240@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40241 */
40242 u64 cper_next_record_id(void)
40243 {
40244- static atomic64_t seq;
40245+ static atomic64_unchecked_t seq;
40246
40247- if (!atomic64_read(&seq))
40248- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40249+ if (!atomic64_read_unchecked(&seq))
40250+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40251
40252- return atomic64_inc_return(&seq);
40253+ return atomic64_inc_return_unchecked(&seq);
40254 }
40255 EXPORT_SYMBOL_GPL(cper_next_record_id);
40256
40257diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40258index 63226e9..302716e 100644
40259--- a/drivers/firmware/efi/efi.c
40260+++ b/drivers/firmware/efi/efi.c
40261@@ -164,14 +164,16 @@ static struct attribute_group efi_subsys_attr_group = {
40262 };
40263
40264 static struct efivars generic_efivars;
40265-static struct efivar_operations generic_ops;
40266+static efivar_operations_no_const generic_ops __read_only;
40267
40268 static int generic_ops_register(void)
40269 {
40270- generic_ops.get_variable = efi.get_variable;
40271- generic_ops.set_variable = efi.set_variable;
40272- generic_ops.get_next_variable = efi.get_next_variable;
40273- generic_ops.query_variable_store = efi_query_variable_store;
40274+ pax_open_kernel();
40275+ *(void **)&generic_ops.get_variable = efi.get_variable;
40276+ *(void **)&generic_ops.set_variable = efi.set_variable;
40277+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40278+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40279+ pax_close_kernel();
40280
40281 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40282 }
40283diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40284index 7b2e049..a253334 100644
40285--- a/drivers/firmware/efi/efivars.c
40286+++ b/drivers/firmware/efi/efivars.c
40287@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40288 static int
40289 create_efivars_bin_attributes(void)
40290 {
40291- struct bin_attribute *attr;
40292+ bin_attribute_no_const *attr;
40293 int error;
40294
40295 /* new_var */
40296diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40297index 5c55227..97f4978 100644
40298--- a/drivers/firmware/efi/runtime-map.c
40299+++ b/drivers/firmware/efi/runtime-map.c
40300@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40301 kfree(entry);
40302 }
40303
40304-static struct kobj_type __refdata map_ktype = {
40305+static const struct kobj_type __refconst map_ktype = {
40306 .sysfs_ops = &map_attr_ops,
40307 .default_attrs = def_attrs,
40308 .release = map_release,
40309diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40310index f1ab05e..ab51228 100644
40311--- a/drivers/firmware/google/gsmi.c
40312+++ b/drivers/firmware/google/gsmi.c
40313@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40314 return local_hash_64(input, 32);
40315 }
40316
40317-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40318+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40319 {
40320 .ident = "Google Board",
40321 .matches = {
40322diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40323index 2f569aa..26e4f39 100644
40324--- a/drivers/firmware/google/memconsole.c
40325+++ b/drivers/firmware/google/memconsole.c
40326@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40327 return false;
40328 }
40329
40330-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40331+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40332 {
40333 .ident = "Google Board",
40334 .matches = {
40335@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40336 if (!found_memconsole())
40337 return -ENODEV;
40338
40339- memconsole_bin_attr.size = memconsole_length;
40340+ pax_open_kernel();
40341+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40342+ pax_close_kernel();
40343+
40344 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40345 }
40346
40347diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40348index cc016c61..d35279e 100644
40349--- a/drivers/firmware/memmap.c
40350+++ b/drivers/firmware/memmap.c
40351@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40352 kfree(entry);
40353 }
40354
40355-static struct kobj_type __refdata memmap_ktype = {
40356+static const struct kobj_type __refconst memmap_ktype = {
40357 .release = release_firmware_map_entry,
40358 .sysfs_ops = &memmap_attr_ops,
40359 .default_attrs = def_attrs,
40360diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40361index 3cfcfc6..09d6f117 100644
40362--- a/drivers/gpio/gpio-em.c
40363+++ b/drivers/gpio/gpio-em.c
40364@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40365 struct em_gio_priv *p;
40366 struct resource *io[2], *irq[2];
40367 struct gpio_chip *gpio_chip;
40368- struct irq_chip *irq_chip;
40369+ irq_chip_no_const *irq_chip;
40370 const char *name = dev_name(&pdev->dev);
40371 int ret;
40372
40373diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40374index 4ba7ed5..1536b5d 100644
40375--- a/drivers/gpio/gpio-ich.c
40376+++ b/drivers/gpio/gpio-ich.c
40377@@ -94,7 +94,7 @@ struct ichx_desc {
40378 * this option allows driver caching written output values
40379 */
40380 bool use_outlvl_cache;
40381-};
40382+} __do_const;
40383
40384 static struct {
40385 spinlock_t lock;
40386diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40387index b232397..ce8c4dc 100644
40388--- a/drivers/gpio/gpio-omap.c
40389+++ b/drivers/gpio/gpio-omap.c
40390@@ -1054,7 +1054,7 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
40391 dev_err(bank->dev, "Could not get gpio dbck\n");
40392 }
40393
40394-static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
40395+static int omap_gpio_chip_init(struct gpio_bank *bank, irq_chip_no_const *irqc)
40396 {
40397 static int gpio;
40398 int irq_base = 0;
40399@@ -1137,7 +1137,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40400 const struct omap_gpio_platform_data *pdata;
40401 struct resource *res;
40402 struct gpio_bank *bank;
40403- struct irq_chip *irqc;
40404+ irq_chip_no_const *irqc;
40405 int ret;
40406
40407 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40408diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40409index 1e14a6c..0442450 100644
40410--- a/drivers/gpio/gpio-rcar.c
40411+++ b/drivers/gpio/gpio-rcar.c
40412@@ -379,7 +379,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40413 struct gpio_rcar_priv *p;
40414 struct resource *io, *irq;
40415 struct gpio_chip *gpio_chip;
40416- struct irq_chip *irq_chip;
40417+ irq_chip_no_const *irq_chip;
40418 struct device *dev = &pdev->dev;
40419 const char *name = dev_name(dev);
40420 int ret;
40421diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40422index c1caa45..f0f97d2 100644
40423--- a/drivers/gpio/gpio-vr41xx.c
40424+++ b/drivers/gpio/gpio-vr41xx.c
40425@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40426 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40427 maskl, pendl, maskh, pendh);
40428
40429- atomic_inc(&irq_err_count);
40430+ atomic_inc_unchecked(&irq_err_count);
40431
40432 return -EINVAL;
40433 }
40434diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40435index 6bc612b..3932464 100644
40436--- a/drivers/gpio/gpiolib.c
40437+++ b/drivers/gpio/gpiolib.c
40438@@ -558,8 +558,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40439 }
40440
40441 if (gpiochip->irqchip) {
40442- gpiochip->irqchip->irq_request_resources = NULL;
40443- gpiochip->irqchip->irq_release_resources = NULL;
40444+ pax_open_kernel();
40445+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40446+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40447+ pax_close_kernel();
40448 gpiochip->irqchip = NULL;
40449 }
40450 }
40451@@ -625,8 +627,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40452 gpiochip->irqchip = NULL;
40453 return -EINVAL;
40454 }
40455- irqchip->irq_request_resources = gpiochip_irq_reqres;
40456- irqchip->irq_release_resources = gpiochip_irq_relres;
40457+
40458+ pax_open_kernel();
40459+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40460+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40461+ pax_close_kernel();
40462
40463 /*
40464 * Prepare the mapping since the irqchip shall be orthogonal to
40465diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40466index 488f51d..301d462 100644
40467--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40468+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40469@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40470 enum cache_policy alternate_policy,
40471 void __user *alternate_aperture_base,
40472 uint64_t alternate_aperture_size);
40473-};
40474+} __no_const;
40475
40476 /**
40477 * struct device_queue_manager
40478diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40479index 5940531..a75b0e5 100644
40480--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40481+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40482@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40483
40484 void (*submit_packet)(struct kernel_queue *kq);
40485 void (*rollback_packet)(struct kernel_queue *kq);
40486-};
40487+} __no_const;
40488
40489 struct kernel_queue {
40490 struct kernel_queue_ops ops;
40491diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c
40492index 9b23525..65f4110 100644
40493--- a/drivers/gpu/drm/drm_context.c
40494+++ b/drivers/gpu/drm/drm_context.c
40495@@ -53,6 +53,9 @@ struct drm_ctx_list {
40496 */
40497 void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle)
40498 {
40499+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40500+ return;
40501+
40502 mutex_lock(&dev->struct_mutex);
40503 idr_remove(&dev->ctx_idr, ctx_handle);
40504 mutex_unlock(&dev->struct_mutex);
40505@@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev)
40506 */
40507 int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40508 {
40509+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40510+ return -EINVAL;
40511+
40512 idr_init(&dev->ctx_idr);
40513 return 0;
40514 }
40515@@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev)
40516 */
40517 void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev)
40518 {
40519+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40520+ return;
40521+
40522 mutex_lock(&dev->struct_mutex);
40523 idr_destroy(&dev->ctx_idr);
40524 mutex_unlock(&dev->struct_mutex);
40525@@ -119,11 +128,14 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file)
40526 {
40527 struct drm_ctx_list *pos, *tmp;
40528
40529+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40530+ return;
40531+
40532 mutex_lock(&dev->ctxlist_mutex);
40533
40534 list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) {
40535 if (pos->tag == file &&
40536- pos->handle != DRM_KERNEL_CONTEXT) {
40537+ _DRM_LOCKING_CONTEXT(pos->handle) != DRM_KERNEL_CONTEXT) {
40538 if (dev->driver->context_dtor)
40539 dev->driver->context_dtor(dev, pos->handle);
40540
40541@@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data,
40542 struct drm_local_map *map;
40543 struct drm_map_list *_entry;
40544
40545+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40546+ return -EINVAL;
40547+
40548 mutex_lock(&dev->struct_mutex);
40549
40550 map = idr_find(&dev->ctx_idr, request->ctx_id);
40551@@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data,
40552 struct drm_local_map *map = NULL;
40553 struct drm_map_list *r_list = NULL;
40554
40555+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40556+ return -EINVAL;
40557+
40558 mutex_lock(&dev->struct_mutex);
40559 list_for_each_entry(r_list, &dev->maplist, head) {
40560 if (r_list->map
40561@@ -277,7 +295,13 @@ static int drm_context_switch_complete(struct drm_device *dev,
40562 {
40563 dev->last_context = new; /* PRE/POST: This is the _only_ writer. */
40564
40565- if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40566+ if (file_priv->master->lock.hw_lock == NULL) {
40567+ DRM_ERROR(
40568+ "Device has been unregistered. Hard exit. Process %d\n",
40569+ task_pid_nr(current));
40570+ send_sig(SIGTERM, current, 0);
40571+ return -EPERM;
40572+ } else if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) {
40573 DRM_ERROR("Lock isn't held after context switch\n");
40574 }
40575
40576@@ -305,6 +329,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data,
40577 struct drm_ctx ctx;
40578 int i;
40579
40580+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40581+ return -EINVAL;
40582+
40583 if (res->count >= DRM_RESERVED_CONTEXTS) {
40584 memset(&ctx, 0, sizeof(ctx));
40585 for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) {
40586@@ -335,8 +362,11 @@ int drm_legacy_addctx(struct drm_device *dev, void *data,
40587 struct drm_ctx_list *ctx_entry;
40588 struct drm_ctx *ctx = data;
40589
40590+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40591+ return -EINVAL;
40592+
40593 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40594- if (ctx->handle == DRM_KERNEL_CONTEXT) {
40595+ if (_DRM_LOCKING_CONTEXT(ctx->handle) == DRM_KERNEL_CONTEXT) {
40596 /* Skip kernel's context and get a new one. */
40597 ctx->handle = drm_legacy_ctxbitmap_next(dev);
40598 }
40599@@ -378,6 +408,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data,
40600 {
40601 struct drm_ctx *ctx = data;
40602
40603+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40604+ return -EINVAL;
40605+
40606 /* This is 0, because we don't handle any context flags */
40607 ctx->flags = 0;
40608
40609@@ -400,6 +433,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data,
40610 {
40611 struct drm_ctx *ctx = data;
40612
40613+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40614+ return -EINVAL;
40615+
40616 DRM_DEBUG("%d\n", ctx->handle);
40617 return drm_context_switch(dev, dev->last_context, ctx->handle);
40618 }
40619@@ -420,6 +456,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data,
40620 {
40621 struct drm_ctx *ctx = data;
40622
40623+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40624+ return -EINVAL;
40625+
40626 DRM_DEBUG("%d\n", ctx->handle);
40627 drm_context_switch_complete(dev, file_priv, ctx->handle);
40628
40629@@ -442,8 +481,11 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data,
40630 {
40631 struct drm_ctx *ctx = data;
40632
40633+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40634+ return -EINVAL;
40635+
40636 DRM_DEBUG("%d\n", ctx->handle);
40637- if (ctx->handle != DRM_KERNEL_CONTEXT) {
40638+ if (_DRM_LOCKING_CONTEXT(ctx->handle) != DRM_KERNEL_CONTEXT) {
40639 if (dev->driver->context_dtor)
40640 dev->driver->context_dtor(dev, ctx->handle);
40641 drm_legacy_ctxbitmap_free(dev, ctx->handle);
40642diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40643index 800a025..c88f1a4 100644
40644--- a/drivers/gpu/drm/drm_crtc.c
40645+++ b/drivers/gpu/drm/drm_crtc.c
40646@@ -4179,7 +4179,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40647 goto done;
40648 }
40649
40650- if (copy_to_user(&enum_ptr[copied].name,
40651+ if (copy_to_user(enum_ptr[copied].name,
40652 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40653 ret = -EFAULT;
40654 goto done;
40655diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40656index 48f7359..8c3b594 100644
40657--- a/drivers/gpu/drm/drm_drv.c
40658+++ b/drivers/gpu/drm/drm_drv.c
40659@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
40660
40661 drm_device_set_unplugged(dev);
40662
40663- if (dev->open_count == 0) {
40664+ if (local_read(&dev->open_count) == 0) {
40665 drm_put_dev(dev);
40666 }
40667 mutex_unlock(&drm_global_mutex);
40668@@ -596,10 +596,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
40669 if (drm_ht_create(&dev->map_hash, 12))
40670 goto err_minors;
40671
40672- ret = drm_legacy_ctxbitmap_init(dev);
40673- if (ret) {
40674- DRM_ERROR("Cannot allocate memory for context bitmap.\n");
40675- goto err_ht;
40676+ if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) {
40677+ ret = drm_legacy_ctxbitmap_init(dev);
40678+ if (ret) {
40679+ DRM_ERROR(
40680+ "Cannot allocate memory for context bitmap.\n");
40681+ goto err_ht;
40682+ }
40683 }
40684
40685 if (drm_core_check_feature(dev, DRIVER_GEM)) {
40686diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40687index 076dd60..e4a4ba7 100644
40688--- a/drivers/gpu/drm/drm_fops.c
40689+++ b/drivers/gpu/drm/drm_fops.c
40690@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40691 return PTR_ERR(minor);
40692
40693 dev = minor->dev;
40694- if (!dev->open_count++)
40695+ if (local_inc_return(&dev->open_count) == 1)
40696 need_setup = 1;
40697
40698 /* share address_space across all char-devs of a single device */
40699@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40700 return 0;
40701
40702 err_undo:
40703- dev->open_count--;
40704+ local_dec(&dev->open_count);
40705 drm_minor_release(minor);
40706 return retcode;
40707 }
40708@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40709
40710 mutex_lock(&drm_global_mutex);
40711
40712- DRM_DEBUG("open_count = %d\n", dev->open_count);
40713+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40714
40715 mutex_lock(&dev->struct_mutex);
40716 list_del(&file_priv->lhead);
40717@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40718 * Begin inline drm_release
40719 */
40720
40721- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40722+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40723 task_pid_nr(current),
40724 (long)old_encode_dev(file_priv->minor->kdev->devt),
40725- dev->open_count);
40726+ local_read(&dev->open_count));
40727
40728 /* Release any auth tokens that might point to this file_priv,
40729 (do that under the drm_global_mutex) */
40730@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40731 * End inline drm_release
40732 */
40733
40734- if (!--dev->open_count) {
40735+ if (local_dec_and_test(&dev->open_count)) {
40736 retcode = drm_lastclose(dev);
40737 if (drm_device_is_unplugged(dev))
40738 drm_put_dev(dev);
40739diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40740index 3d2e91c..d31c4c9 100644
40741--- a/drivers/gpu/drm/drm_global.c
40742+++ b/drivers/gpu/drm/drm_global.c
40743@@ -36,7 +36,7 @@
40744 struct drm_global_item {
40745 struct mutex mutex;
40746 void *object;
40747- int refcount;
40748+ atomic_t refcount;
40749 };
40750
40751 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40752@@ -49,7 +49,7 @@ void drm_global_init(void)
40753 struct drm_global_item *item = &glob[i];
40754 mutex_init(&item->mutex);
40755 item->object = NULL;
40756- item->refcount = 0;
40757+ atomic_set(&item->refcount, 0);
40758 }
40759 }
40760
40761@@ -59,7 +59,7 @@ void drm_global_release(void)
40762 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40763 struct drm_global_item *item = &glob[i];
40764 BUG_ON(item->object != NULL);
40765- BUG_ON(item->refcount != 0);
40766+ BUG_ON(atomic_read(&item->refcount) != 0);
40767 }
40768 }
40769
40770@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40771 struct drm_global_item *item = &glob[ref->global_type];
40772
40773 mutex_lock(&item->mutex);
40774- if (item->refcount == 0) {
40775+ if (atomic_read(&item->refcount) == 0) {
40776 item->object = kzalloc(ref->size, GFP_KERNEL);
40777 if (unlikely(item->object == NULL)) {
40778 ret = -ENOMEM;
40779@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40780 goto out_err;
40781
40782 }
40783- ++item->refcount;
40784+ atomic_inc(&item->refcount);
40785 ref->object = item->object;
40786 mutex_unlock(&item->mutex);
40787 return 0;
40788@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40789 struct drm_global_item *item = &glob[ref->global_type];
40790
40791 mutex_lock(&item->mutex);
40792- BUG_ON(item->refcount == 0);
40793+ BUG_ON(atomic_read(&item->refcount) == 0);
40794 BUG_ON(ref->object != item->object);
40795- if (--item->refcount == 0) {
40796+ if (atomic_dec_and_test(&item->refcount)) {
40797 ref->release(ref);
40798 item->object = NULL;
40799 }
40800diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40801index cbb4fc0..5c756cb9 100644
40802--- a/drivers/gpu/drm/drm_info.c
40803+++ b/drivers/gpu/drm/drm_info.c
40804@@ -77,10 +77,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40805 struct drm_local_map *map;
40806 struct drm_map_list *r_list;
40807
40808- /* Hardcoded from _DRM_FRAME_BUFFER,
40809- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40810- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40811- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40812+ static const char * const types[] = {
40813+ [_DRM_FRAME_BUFFER] = "FB",
40814+ [_DRM_REGISTERS] = "REG",
40815+ [_DRM_SHM] = "SHM",
40816+ [_DRM_AGP] = "AGP",
40817+ [_DRM_SCATTER_GATHER] = "SG",
40818+ [_DRM_CONSISTENT] = "PCI"};
40819 const char *type;
40820 int i;
40821
40822@@ -91,7 +94,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40823 map = r_list->map;
40824 if (!map)
40825 continue;
40826- if (map->type < 0 || map->type > 5)
40827+ if (map->type >= ARRAY_SIZE(types))
40828 type = "??";
40829 else
40830 type = types[map->type];
40831diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40832index 9cfcd0a..7142a7f 100644
40833--- a/drivers/gpu/drm/drm_ioc32.c
40834+++ b/drivers/gpu/drm/drm_ioc32.c
40835@@ -459,7 +459,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40836 request = compat_alloc_user_space(nbytes);
40837 if (!access_ok(VERIFY_WRITE, request, nbytes))
40838 return -EFAULT;
40839- list = (struct drm_buf_desc *) (request + 1);
40840+ list = (struct drm_buf_desc __user *) (request + 1);
40841
40842 if (__put_user(count, &request->count)
40843 || __put_user(list, &request->list))
40844@@ -520,7 +520,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40845 request = compat_alloc_user_space(nbytes);
40846 if (!access_ok(VERIFY_WRITE, request, nbytes))
40847 return -EFAULT;
40848- list = (struct drm_buf_pub *) (request + 1);
40849+ list = (struct drm_buf_pub __user *) (request + 1);
40850
40851 if (__put_user(count, &request->count)
40852 || __put_user(list, &request->list))
40853@@ -1075,7 +1075,7 @@ static int compat_drm_mode_addfb2(struct file *file, unsigned int cmd,
40854 return 0;
40855 }
40856
40857-static drm_ioctl_compat_t *drm_compat_ioctls[] = {
40858+static drm_ioctl_compat_t drm_compat_ioctls[] = {
40859 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40860 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40861 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40862@@ -1122,7 +1122,6 @@ static drm_ioctl_compat_t *drm_compat_ioctls[] = {
40863 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40864 {
40865 unsigned int nr = DRM_IOCTL_NR(cmd);
40866- drm_ioctl_compat_t *fn;
40867 int ret;
40868
40869 /* Assume that ioctls without an explicit compat routine will just
40870@@ -1132,10 +1131,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40871 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40872 return drm_ioctl(filp, cmd, arg);
40873
40874- fn = drm_compat_ioctls[nr];
40875-
40876- if (fn != NULL)
40877- ret = (*fn) (filp, cmd, arg);
40878+ if (drm_compat_ioctls[nr] != NULL)
40879+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40880 else
40881 ret = drm_ioctl(filp, cmd, arg);
40882
40883diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40884index 266dcd6..d0194d9 100644
40885--- a/drivers/gpu/drm/drm_ioctl.c
40886+++ b/drivers/gpu/drm/drm_ioctl.c
40887@@ -663,7 +663,7 @@ long drm_ioctl(struct file *filp,
40888 struct drm_file *file_priv = filp->private_data;
40889 struct drm_device *dev;
40890 const struct drm_ioctl_desc *ioctl = NULL;
40891- drm_ioctl_t *func;
40892+ drm_ioctl_no_const_t func;
40893 unsigned int nr = DRM_IOCTL_NR(cmd);
40894 int retcode = -EINVAL;
40895 char stack_kdata[128];
40896diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
40897index f861361..b61d4c7 100644
40898--- a/drivers/gpu/drm/drm_lock.c
40899+++ b/drivers/gpu/drm/drm_lock.c
40900@@ -61,9 +61,12 @@ int drm_legacy_lock(struct drm_device *dev, void *data,
40901 struct drm_master *master = file_priv->master;
40902 int ret = 0;
40903
40904+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40905+ return -EINVAL;
40906+
40907 ++file_priv->lock_count;
40908
40909- if (lock->context == DRM_KERNEL_CONTEXT) {
40910+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
40911 DRM_ERROR("Process %d using kernel context %d\n",
40912 task_pid_nr(current), lock->context);
40913 return -EINVAL;
40914@@ -153,12 +156,23 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
40915 struct drm_lock *lock = data;
40916 struct drm_master *master = file_priv->master;
40917
40918- if (lock->context == DRM_KERNEL_CONTEXT) {
40919+ if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT))
40920+ return -EINVAL;
40921+
40922+ if (_DRM_LOCKING_CONTEXT(lock->context) == DRM_KERNEL_CONTEXT) {
40923 DRM_ERROR("Process %d using kernel context %d\n",
40924 task_pid_nr(current), lock->context);
40925 return -EINVAL;
40926 }
40927
40928+ if (!master->lock.hw_lock) {
40929+ DRM_ERROR(
40930+ "Device has been unregistered. Hard exit. Process %d\n",
40931+ task_pid_nr(current));
40932+ send_sig(SIGTERM, current, 0);
40933+ return -EPERM;
40934+ }
40935+
40936 if (drm_legacy_lock_free(&master->lock, lock->context)) {
40937 /* FIXME: Should really bail out here. */
40938 }
40939diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40940index d4813e0..6c1ab4d 100644
40941--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40942+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40943@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
40944 u32 pipeconf_reg = PIPEACONF;
40945 u32 dspcntr_reg = DSPACNTR;
40946
40947- u32 pipeconf = dev_priv->pipeconf[pipe];
40948- u32 dspcntr = dev_priv->dspcntr[pipe];
40949+ u32 pipeconf;
40950+ u32 dspcntr;
40951 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
40952
40953+ if (pipe == -1)
40954+ return;
40955+
40956+ pipeconf = dev_priv->pipeconf[pipe];
40957+ dspcntr = dev_priv->dspcntr[pipe];
40958+
40959 if (pipe) {
40960 pipeconf_reg = PIPECCONF;
40961 dspcntr_reg = DSPCCNTR;
40962diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40963index 93ec5dc..82acbaf 100644
40964--- a/drivers/gpu/drm/i810/i810_drv.h
40965+++ b/drivers/gpu/drm/i810/i810_drv.h
40966@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40967 int page_flipping;
40968
40969 wait_queue_head_t irq_queue;
40970- atomic_t irq_received;
40971- atomic_t irq_emitted;
40972+ atomic_unchecked_t irq_received;
40973+ atomic_unchecked_t irq_emitted;
40974
40975 int front_offset;
40976 } drm_i810_private_t;
40977diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40978index 68e0c85..3303192 100644
40979--- a/drivers/gpu/drm/i915/i915_dma.c
40980+++ b/drivers/gpu/drm/i915/i915_dma.c
40981@@ -162,6 +162,8 @@ static int i915_getparam(struct drm_device *dev, void *data,
40982 value = INTEL_INFO(dev)->eu_total;
40983 if (!value)
40984 return -ENODEV;
40985+ case I915_PARAM_HAS_LEGACY_CONTEXT:
40986+ value = drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT);
40987 break;
40988 default:
40989 DRM_DEBUG("Unknown parameter %d\n", param->param);
40990@@ -376,7 +378,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40991 * locking inversion with the driver load path. And the access here is
40992 * completely racy anyway. So don't bother with locking for now.
40993 */
40994- return dev->open_count == 0;
40995+ return local_read(&dev->open_count) == 0;
40996 }
40997
40998 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40999diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41000index a3190e79..86b06cb 100644
41001--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41002+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
41003@@ -936,12 +936,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
41004 static int
41005 validate_exec_list(struct drm_device *dev,
41006 struct drm_i915_gem_exec_object2 *exec,
41007- int count)
41008+ unsigned int count)
41009 {
41010 unsigned relocs_total = 0;
41011 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
41012 unsigned invalid_flags;
41013- int i;
41014+ unsigned int i;
41015
41016 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
41017 if (USES_FULL_PPGTT(dev))
41018diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
41019index 23aa04c..1d25960 100644
41020--- a/drivers/gpu/drm/i915/i915_ioc32.c
41021+++ b/drivers/gpu/drm/i915/i915_ioc32.c
41022@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
41023 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
41024 || __put_user(batchbuffer32.num_cliprects,
41025 &batchbuffer->num_cliprects)
41026- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
41027+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
41028 &batchbuffer->cliprects))
41029 return -EFAULT;
41030
41031@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
41032
41033 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
41034 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
41035- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
41036+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
41037 &cmdbuffer->buf)
41038 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
41039 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
41040 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
41041 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
41042- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
41043+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
41044 &cmdbuffer->cliprects))
41045 return -EFAULT;
41046
41047@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
41048 (unsigned long)request);
41049 }
41050
41051-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41052+static drm_ioctl_compat_t i915_compat_ioctls[] = {
41053 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
41054 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
41055 [DRM_I915_GETPARAM] = compat_i915_getparam,
41056@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
41057 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41058 {
41059 unsigned int nr = DRM_IOCTL_NR(cmd);
41060- drm_ioctl_compat_t *fn = NULL;
41061 int ret;
41062
41063 if (nr < DRM_COMMAND_BASE || nr >= DRM_COMMAND_END)
41064 return drm_compat_ioctl(filp, cmd, arg);
41065
41066- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
41067- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
41068-
41069- if (fn != NULL)
41070- ret = (*fn) (filp, cmd, arg);
41071+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
41072+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
41073 else
41074 ret = drm_ioctl(filp, cmd, arg);
41075
41076diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
41077index 57c8878..8ef38a7 100644
41078--- a/drivers/gpu/drm/i915/intel_display.c
41079+++ b/drivers/gpu/drm/i915/intel_display.c
41080@@ -13617,13 +13617,13 @@ struct intel_quirk {
41081 int subsystem_vendor;
41082 int subsystem_device;
41083 void (*hook)(struct drm_device *dev);
41084-};
41085+} __do_const;
41086
41087 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
41088 struct intel_dmi_quirk {
41089 void (*hook)(struct drm_device *dev);
41090 const struct dmi_system_id (*dmi_id_list)[];
41091-};
41092+} __do_const;
41093
41094 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41095 {
41096@@ -13631,18 +13631,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
41097 return 1;
41098 }
41099
41100-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41101+static const struct dmi_system_id intel_dmi_quirks_table[] = {
41102 {
41103- .dmi_id_list = &(const struct dmi_system_id[]) {
41104- {
41105- .callback = intel_dmi_reverse_brightness,
41106- .ident = "NCR Corporation",
41107- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41108- DMI_MATCH(DMI_PRODUCT_NAME, ""),
41109- },
41110- },
41111- { } /* terminating entry */
41112+ .callback = intel_dmi_reverse_brightness,
41113+ .ident = "NCR Corporation",
41114+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
41115+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
41116 },
41117+ },
41118+ { } /* terminating entry */
41119+};
41120+
41121+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
41122+ {
41123+ .dmi_id_list = &intel_dmi_quirks_table,
41124 .hook = quirk_invert_brightness,
41125 },
41126 };
41127diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
41128index 74f505b..21f6914 100644
41129--- a/drivers/gpu/drm/imx/imx-drm-core.c
41130+++ b/drivers/gpu/drm/imx/imx-drm-core.c
41131@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
41132 if (imxdrm->pipes >= MAX_CRTC)
41133 return -EINVAL;
41134
41135- if (imxdrm->drm->open_count)
41136+ if (local_read(&imxdrm->drm->open_count))
41137 return -EBUSY;
41138
41139 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
41140diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
41141index b4a20149..219ab78 100644
41142--- a/drivers/gpu/drm/mga/mga_drv.h
41143+++ b/drivers/gpu/drm/mga/mga_drv.h
41144@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
41145 u32 clear_cmd;
41146 u32 maccess;
41147
41148- atomic_t vbl_received; /**< Number of vblanks received. */
41149+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
41150 wait_queue_head_t fence_queue;
41151- atomic_t last_fence_retired;
41152+ atomic_unchecked_t last_fence_retired;
41153 u32 next_fence_to_post;
41154
41155 unsigned int fb_cpp;
41156diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
41157index 729bfd5..14bae78 100644
41158--- a/drivers/gpu/drm/mga/mga_ioc32.c
41159+++ b/drivers/gpu/drm/mga/mga_ioc32.c
41160@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
41161 return 0;
41162 }
41163
41164-drm_ioctl_compat_t *mga_compat_ioctls[] = {
41165+drm_ioctl_compat_t mga_compat_ioctls[] = {
41166 [DRM_MGA_INIT] = compat_mga_init,
41167 [DRM_MGA_GETPARAM] = compat_mga_getparam,
41168 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
41169@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
41170 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41171 {
41172 unsigned int nr = DRM_IOCTL_NR(cmd);
41173- drm_ioctl_compat_t *fn = NULL;
41174 int ret;
41175
41176 if (nr < DRM_COMMAND_BASE)
41177 return drm_compat_ioctl(filp, cmd, arg);
41178
41179- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
41180- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
41181-
41182- if (fn != NULL)
41183- ret = (*fn) (filp, cmd, arg);
41184+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
41185+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41186 else
41187 ret = drm_ioctl(filp, cmd, arg);
41188
41189diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
41190index 1b071b8..de8601a 100644
41191--- a/drivers/gpu/drm/mga/mga_irq.c
41192+++ b/drivers/gpu/drm/mga/mga_irq.c
41193@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
41194 if (crtc != 0)
41195 return 0;
41196
41197- return atomic_read(&dev_priv->vbl_received);
41198+ return atomic_read_unchecked(&dev_priv->vbl_received);
41199 }
41200
41201
41202@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41203 /* VBLANK interrupt */
41204 if (status & MGA_VLINEPEN) {
41205 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
41206- atomic_inc(&dev_priv->vbl_received);
41207+ atomic_inc_unchecked(&dev_priv->vbl_received);
41208 drm_handle_vblank(dev, 0);
41209 handled = 1;
41210 }
41211@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
41212 if ((prim_start & ~0x03) != (prim_end & ~0x03))
41213 MGA_WRITE(MGA_PRIMEND, prim_end);
41214
41215- atomic_inc(&dev_priv->last_fence_retired);
41216+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
41217 wake_up(&dev_priv->fence_queue);
41218 handled = 1;
41219 }
41220@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41221 * using fences.
41222 */
41223 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41224- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41225+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41226 - *sequence) <= (1 << 23)));
41227
41228 *sequence = cur_fence;
41229diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41230index 0190b69..60c3eaf 100644
41231--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41232+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41233@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41234 struct bit_table {
41235 const char id;
41236 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41237-};
41238+} __no_const;
41239
41240 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41241
41242diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
41243index cd6dae0..f25eb48 100644
41244--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
41245+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
41246@@ -943,7 +943,8 @@ static struct drm_driver
41247 driver_stub = {
41248 .driver_features =
41249 DRIVER_USE_AGP |
41250- DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER,
41251+ DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER |
41252+ DRIVER_KMS_LEGACY_CONTEXT,
41253
41254 .load = nouveau_drm_load,
41255 .unload = nouveau_drm_unload,
41256diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41257index dd72652..1fd2368 100644
41258--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41259+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41260@@ -123,7 +123,6 @@ struct nouveau_drm {
41261 struct drm_global_reference mem_global_ref;
41262 struct ttm_bo_global_ref bo_global_ref;
41263 struct ttm_bo_device bdev;
41264- atomic_t validate_sequence;
41265 int (*move)(struct nouveau_channel *,
41266 struct ttm_buffer_object *,
41267 struct ttm_mem_reg *, struct ttm_mem_reg *);
41268diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41269index 462679a..88e32a7 100644
41270--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41271+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41272@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41273 unsigned long arg)
41274 {
41275 unsigned int nr = DRM_IOCTL_NR(cmd);
41276- drm_ioctl_compat_t *fn = NULL;
41277+ drm_ioctl_compat_t fn = NULL;
41278 int ret;
41279
41280 if (nr < DRM_COMMAND_BASE)
41281diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41282index 18f4497..10f6025 100644
41283--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41284+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41285@@ -130,11 +130,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41286 }
41287
41288 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41289- nouveau_vram_manager_init,
41290- nouveau_vram_manager_fini,
41291- nouveau_vram_manager_new,
41292- nouveau_vram_manager_del,
41293- nouveau_vram_manager_debug
41294+ .init = nouveau_vram_manager_init,
41295+ .takedown = nouveau_vram_manager_fini,
41296+ .get_node = nouveau_vram_manager_new,
41297+ .put_node = nouveau_vram_manager_del,
41298+ .debug = nouveau_vram_manager_debug
41299 };
41300
41301 static int
41302@@ -198,11 +198,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41303 }
41304
41305 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41306- nouveau_gart_manager_init,
41307- nouveau_gart_manager_fini,
41308- nouveau_gart_manager_new,
41309- nouveau_gart_manager_del,
41310- nouveau_gart_manager_debug
41311+ .init = nouveau_gart_manager_init,
41312+ .takedown = nouveau_gart_manager_fini,
41313+ .get_node = nouveau_gart_manager_new,
41314+ .put_node = nouveau_gart_manager_del,
41315+ .debug = nouveau_gart_manager_debug
41316 };
41317
41318 /*XXX*/
41319@@ -271,11 +271,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41320 }
41321
41322 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41323- nv04_gart_manager_init,
41324- nv04_gart_manager_fini,
41325- nv04_gart_manager_new,
41326- nv04_gart_manager_del,
41327- nv04_gart_manager_debug
41328+ .init = nv04_gart_manager_init,
41329+ .takedown = nv04_gart_manager_fini,
41330+ .get_node = nv04_gart_manager_new,
41331+ .put_node = nv04_gart_manager_del,
41332+ .debug = nv04_gart_manager_debug
41333 };
41334
41335 int
41336diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41337index c7592ec..dd45ebc 100644
41338--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41339+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41340@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41341 * locking inversion with the driver load path. And the access here is
41342 * completely racy anyway. So don't bother with locking for now.
41343 */
41344- return dev->open_count == 0;
41345+ return local_read(&dev->open_count) == 0;
41346 }
41347
41348 static const struct vga_switcheroo_client_ops
41349diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41350index f33251d..22f6cb1 100644
41351--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41352+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41353@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41354 int ret;
41355
41356 mutex_lock(&qdev->async_io_mutex);
41357- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41358+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41359 if (qdev->last_sent_io_cmd > irq_num) {
41360 if (intr)
41361 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41362- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41363+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41364 else
41365 ret = wait_event_timeout(qdev->io_cmd_event,
41366- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41367+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41368 /* 0 is timeout, just bail the "hw" has gone away */
41369 if (ret <= 0)
41370 goto out;
41371- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41372+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41373 }
41374 outb(val, addr);
41375 qdev->last_sent_io_cmd = irq_num + 1;
41376 if (intr)
41377 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41378- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41379+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41380 else
41381 ret = wait_event_timeout(qdev->io_cmd_event,
41382- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41383+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41384 out:
41385 if (ret > 0)
41386 ret = 0;
41387diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41388index 6911b8c..89d6867 100644
41389--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41390+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41391@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41392 struct drm_info_node *node = (struct drm_info_node *) m->private;
41393 struct qxl_device *qdev = node->minor->dev->dev_private;
41394
41395- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41396- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41397- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41398- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41399+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41400+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41401+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41402+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41403 seq_printf(m, "%d\n", qdev->irq_received_error);
41404 return 0;
41405 }
41406diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41407index 7c6cafe..460f542 100644
41408--- a/drivers/gpu/drm/qxl/qxl_drv.h
41409+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41410@@ -290,10 +290,10 @@ struct qxl_device {
41411 unsigned int last_sent_io_cmd;
41412
41413 /* interrupt handling */
41414- atomic_t irq_received;
41415- atomic_t irq_received_display;
41416- atomic_t irq_received_cursor;
41417- atomic_t irq_received_io_cmd;
41418+ atomic_unchecked_t irq_received;
41419+ atomic_unchecked_t irq_received_display;
41420+ atomic_unchecked_t irq_received_cursor;
41421+ atomic_unchecked_t irq_received_io_cmd;
41422 unsigned irq_received_error;
41423 wait_queue_head_t display_event;
41424 wait_queue_head_t cursor_event;
41425diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41426index 7354a4c..f37d7f9 100644
41427--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41428+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41429@@ -183,7 +183,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41430
41431 /* TODO copy slow path code from i915 */
41432 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41433- 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);
41434+ 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);
41435
41436 {
41437 struct qxl_drawable *draw = fb_cmd;
41438@@ -203,7 +203,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41439 struct drm_qxl_reloc reloc;
41440
41441 if (copy_from_user(&reloc,
41442- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41443+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41444 sizeof(reloc))) {
41445 ret = -EFAULT;
41446 goto out_free_bos;
41447@@ -296,10 +296,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41448
41449 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41450
41451- struct drm_qxl_command *commands =
41452- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41453+ struct drm_qxl_command __user *commands =
41454+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41455
41456- if (copy_from_user(&user_cmd, &commands[cmd_num],
41457+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41458 sizeof(user_cmd)))
41459 return -EFAULT;
41460
41461diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41462index 0bf1e20..42a7310 100644
41463--- a/drivers/gpu/drm/qxl/qxl_irq.c
41464+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41465@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41466 if (!pending)
41467 return IRQ_NONE;
41468
41469- atomic_inc(&qdev->irq_received);
41470+ atomic_inc_unchecked(&qdev->irq_received);
41471
41472 if (pending & QXL_INTERRUPT_DISPLAY) {
41473- atomic_inc(&qdev->irq_received_display);
41474+ atomic_inc_unchecked(&qdev->irq_received_display);
41475 wake_up_all(&qdev->display_event);
41476 qxl_queue_garbage_collect(qdev, false);
41477 }
41478 if (pending & QXL_INTERRUPT_CURSOR) {
41479- atomic_inc(&qdev->irq_received_cursor);
41480+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41481 wake_up_all(&qdev->cursor_event);
41482 }
41483 if (pending & QXL_INTERRUPT_IO_CMD) {
41484- atomic_inc(&qdev->irq_received_io_cmd);
41485+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41486 wake_up_all(&qdev->io_cmd_event);
41487 }
41488 if (pending & QXL_INTERRUPT_ERROR) {
41489@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41490 init_waitqueue_head(&qdev->io_cmd_event);
41491 INIT_WORK(&qdev->client_monitors_config_work,
41492 qxl_client_monitors_config_work_func);
41493- atomic_set(&qdev->irq_received, 0);
41494- atomic_set(&qdev->irq_received_display, 0);
41495- atomic_set(&qdev->irq_received_cursor, 0);
41496- atomic_set(&qdev->irq_received_io_cmd, 0);
41497+ atomic_set_unchecked(&qdev->irq_received, 0);
41498+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41499+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41500+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41501 qdev->irq_received_error = 0;
41502 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41503 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41504diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41505index 0cbc4c9..0e46686 100644
41506--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41507+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41508@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41509 }
41510 }
41511
41512-static struct vm_operations_struct qxl_ttm_vm_ops;
41513+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41514 static const struct vm_operations_struct *ttm_vm_ops;
41515
41516 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41517@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41518 return r;
41519 if (unlikely(ttm_vm_ops == NULL)) {
41520 ttm_vm_ops = vma->vm_ops;
41521+ pax_open_kernel();
41522 qxl_ttm_vm_ops = *ttm_vm_ops;
41523 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41524+ pax_close_kernel();
41525 }
41526 vma->vm_ops = &qxl_ttm_vm_ops;
41527 return 0;
41528@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41529 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41530 {
41531 #if defined(CONFIG_DEBUG_FS)
41532- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41533- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41534- unsigned i;
41535+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41536+ {
41537+ .name = "qxl_mem_mm",
41538+ .show = &qxl_mm_dump_table,
41539+ },
41540+ {
41541+ .name = "qxl_surf_mm",
41542+ .show = &qxl_mm_dump_table,
41543+ }
41544+ };
41545
41546- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41547- if (i == 0)
41548- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41549- else
41550- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41551- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41552- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41553- qxl_mem_types_list[i].driver_features = 0;
41554- if (i == 0)
41555- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41556- else
41557- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41558+ pax_open_kernel();
41559+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41560+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41561+ pax_close_kernel();
41562
41563- }
41564- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41565+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41566 #else
41567 return 0;
41568 #endif
41569diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41570index 2c45ac9..5d740f8 100644
41571--- a/drivers/gpu/drm/r128/r128_cce.c
41572+++ b/drivers/gpu/drm/r128/r128_cce.c
41573@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41574
41575 /* GH: Simple idle check.
41576 */
41577- atomic_set(&dev_priv->idle_count, 0);
41578+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41579
41580 /* We don't support anything other than bus-mastering ring mode,
41581 * but the ring can be in either AGP or PCI space for the ring
41582diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41583index 723e5d6..102dbaf 100644
41584--- a/drivers/gpu/drm/r128/r128_drv.h
41585+++ b/drivers/gpu/drm/r128/r128_drv.h
41586@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41587 int is_pci;
41588 unsigned long cce_buffers_offset;
41589
41590- atomic_t idle_count;
41591+ atomic_unchecked_t idle_count;
41592
41593 int page_flipping;
41594 int current_page;
41595 u32 crtc_offset;
41596 u32 crtc_offset_cntl;
41597
41598- atomic_t vbl_received;
41599+ atomic_unchecked_t vbl_received;
41600
41601 u32 color_fmt;
41602 unsigned int front_offset;
41603diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41604index 663f38c..ec159a1 100644
41605--- a/drivers/gpu/drm/r128/r128_ioc32.c
41606+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41607@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41608 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41609 }
41610
41611-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41612+drm_ioctl_compat_t r128_compat_ioctls[] = {
41613 [DRM_R128_INIT] = compat_r128_init,
41614 [DRM_R128_DEPTH] = compat_r128_depth,
41615 [DRM_R128_STIPPLE] = compat_r128_stipple,
41616@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41617 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41618 {
41619 unsigned int nr = DRM_IOCTL_NR(cmd);
41620- drm_ioctl_compat_t *fn = NULL;
41621 int ret;
41622
41623 if (nr < DRM_COMMAND_BASE)
41624 return drm_compat_ioctl(filp, cmd, arg);
41625
41626- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41627- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41628-
41629- if (fn != NULL)
41630- ret = (*fn) (filp, cmd, arg);
41631+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
41632+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41633 else
41634 ret = drm_ioctl(filp, cmd, arg);
41635
41636diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41637index c2ae496..30b5993 100644
41638--- a/drivers/gpu/drm/r128/r128_irq.c
41639+++ b/drivers/gpu/drm/r128/r128_irq.c
41640@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41641 if (crtc != 0)
41642 return 0;
41643
41644- return atomic_read(&dev_priv->vbl_received);
41645+ return atomic_read_unchecked(&dev_priv->vbl_received);
41646 }
41647
41648 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41649@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41650 /* VBLANK interrupt */
41651 if (status & R128_CRTC_VBLANK_INT) {
41652 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41653- atomic_inc(&dev_priv->vbl_received);
41654+ atomic_inc_unchecked(&dev_priv->vbl_received);
41655 drm_handle_vblank(dev, 0);
41656 return IRQ_HANDLED;
41657 }
41658diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41659index 8fd2d9f..18c9660 100644
41660--- a/drivers/gpu/drm/r128/r128_state.c
41661+++ b/drivers/gpu/drm/r128/r128_state.c
41662@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41663
41664 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41665 {
41666- if (atomic_read(&dev_priv->idle_count) == 0)
41667+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41668 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41669 else
41670- atomic_set(&dev_priv->idle_count, 0);
41671+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41672 }
41673
41674 #endif
41675diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41676index b928c17..e5d9400 100644
41677--- a/drivers/gpu/drm/radeon/mkregtable.c
41678+++ b/drivers/gpu/drm/radeon/mkregtable.c
41679@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41680 regex_t mask_rex;
41681 regmatch_t match[4];
41682 char buf[1024];
41683- size_t end;
41684+ long end;
41685 int len;
41686 int done = 0;
41687 int r;
41688 unsigned o;
41689 struct offset *offset;
41690 char last_reg_s[10];
41691- int last_reg;
41692+ unsigned long last_reg;
41693
41694 if (regcomp
41695 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41696diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41697index 604c44d..6eb6c4b 100644
41698--- a/drivers/gpu/drm/radeon/radeon_device.c
41699+++ b/drivers/gpu/drm/radeon/radeon_device.c
41700@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41701 * locking inversion with the driver load path. And the access here is
41702 * completely racy anyway. So don't bother with locking for now.
41703 */
41704- return dev->open_count == 0;
41705+ return local_read(&dev->open_count) == 0;
41706 }
41707
41708 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41709diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41710index 46bd393..6ae4719 100644
41711--- a/drivers/gpu/drm/radeon/radeon_drv.h
41712+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41713@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41714
41715 /* SW interrupt */
41716 wait_queue_head_t swi_queue;
41717- atomic_t swi_emitted;
41718+ atomic_unchecked_t swi_emitted;
41719 int vblank_crtc;
41720 uint32_t irq_enable_reg;
41721 uint32_t r500_disp_irq_reg;
41722diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41723index 0b98ea1..a3c770f 100644
41724--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41725+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41726@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41727 request = compat_alloc_user_space(sizeof(*request));
41728 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41729 || __put_user(req32.param, &request->param)
41730- || __put_user((void __user *)(unsigned long)req32.value,
41731+ || __put_user((unsigned long)req32.value,
41732 &request->value))
41733 return -EFAULT;
41734
41735@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41736 #define compat_radeon_cp_setparam NULL
41737 #endif /* X86_64 || IA64 */
41738
41739-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41740+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41741 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41742 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41743 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41744@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41745 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41746 {
41747 unsigned int nr = DRM_IOCTL_NR(cmd);
41748- drm_ioctl_compat_t *fn = NULL;
41749 int ret;
41750
41751 if (nr < DRM_COMMAND_BASE)
41752 return drm_compat_ioctl(filp, cmd, arg);
41753
41754- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41755- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41756-
41757- if (fn != NULL)
41758- ret = (*fn) (filp, cmd, arg);
41759+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
41760+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41761 else
41762 ret = drm_ioctl(filp, cmd, arg);
41763
41764diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41765index 244b19b..c19226d 100644
41766--- a/drivers/gpu/drm/radeon/radeon_irq.c
41767+++ b/drivers/gpu/drm/radeon/radeon_irq.c
41768@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41769 unsigned int ret;
41770 RING_LOCALS;
41771
41772- atomic_inc(&dev_priv->swi_emitted);
41773- ret = atomic_read(&dev_priv->swi_emitted);
41774+ atomic_inc_unchecked(&dev_priv->swi_emitted);
41775+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41776
41777 BEGIN_RING(4);
41778 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41779@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41780 drm_radeon_private_t *dev_priv =
41781 (drm_radeon_private_t *) dev->dev_private;
41782
41783- atomic_set(&dev_priv->swi_emitted, 0);
41784+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41785 init_waitqueue_head(&dev_priv->swi_queue);
41786
41787 dev->max_vblank_count = 0x001fffff;
41788diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41789index 15aee72..cda326e 100644
41790--- a/drivers/gpu/drm/radeon/radeon_state.c
41791+++ b/drivers/gpu/drm/radeon/radeon_state.c
41792@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41793 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41794 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41795
41796- if (copy_from_user(&depth_boxes, clear->depth_boxes,
41797+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41798 sarea_priv->nbox * sizeof(depth_boxes[0])))
41799 return -EFAULT;
41800
41801@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41802 {
41803 drm_radeon_private_t *dev_priv = dev->dev_private;
41804 drm_radeon_getparam_t *param = data;
41805- int value;
41806+ int value = 0;
41807
41808 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41809
41810diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41811index edafd3c..3af7c9c 100644
41812--- a/drivers/gpu/drm/radeon/radeon_ttm.c
41813+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41814@@ -961,7 +961,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41815 man->size = size >> PAGE_SHIFT;
41816 }
41817
41818-static struct vm_operations_struct radeon_ttm_vm_ops;
41819+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41820 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41821
41822 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41823@@ -1002,8 +1002,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41824 }
41825 if (unlikely(ttm_vm_ops == NULL)) {
41826 ttm_vm_ops = vma->vm_ops;
41827+ pax_open_kernel();
41828 radeon_ttm_vm_ops = *ttm_vm_ops;
41829 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41830+ pax_close_kernel();
41831 }
41832 vma->vm_ops = &radeon_ttm_vm_ops;
41833 return 0;
41834diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41835index a287e4f..df1d5dd 100644
41836--- a/drivers/gpu/drm/tegra/dc.c
41837+++ b/drivers/gpu/drm/tegra/dc.c
41838@@ -1594,7 +1594,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41839 }
41840
41841 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41842- dc->debugfs_files[i].data = dc;
41843+ *(void **)&dc->debugfs_files[i].data = dc;
41844
41845 err = drm_debugfs_create_files(dc->debugfs_files,
41846 ARRAY_SIZE(debugfs_files),
41847diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41848index ed970f6..4eeea42 100644
41849--- a/drivers/gpu/drm/tegra/dsi.c
41850+++ b/drivers/gpu/drm/tegra/dsi.c
41851@@ -62,7 +62,7 @@ struct tegra_dsi {
41852 struct clk *clk_lp;
41853 struct clk *clk;
41854
41855- struct drm_info_list *debugfs_files;
41856+ drm_info_list_no_const *debugfs_files;
41857 struct drm_minor *minor;
41858 struct dentry *debugfs;
41859
41860diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41861index 06ab178..b5324e4 100644
41862--- a/drivers/gpu/drm/tegra/hdmi.c
41863+++ b/drivers/gpu/drm/tegra/hdmi.c
41864@@ -64,7 +64,7 @@ struct tegra_hdmi {
41865 bool stereo;
41866 bool dvi;
41867
41868- struct drm_info_list *debugfs_files;
41869+ drm_info_list_no_const *debugfs_files;
41870 struct drm_minor *minor;
41871 struct dentry *debugfs;
41872 };
41873diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
41874index 7591d89..463e2b6 100644
41875--- a/drivers/gpu/drm/tegra/sor.c
41876+++ b/drivers/gpu/drm/tegra/sor.c
41877@@ -826,8 +826,11 @@ static int tegra_sor_debugfs_init(struct tegra_sor *sor,
41878 goto remove;
41879 }
41880
41881- for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41882- sor->debugfs_files[i].data = sor;
41883+ for (i = 0; i < ARRAY_SIZE(debugfs_files); i++) {
41884+ pax_open_kernel();
41885+ *(void **)&sor->debugfs_files[i].data = sor;
41886+ pax_close_kernel();
41887+ }
41888
41889 err = drm_debugfs_create_files(sor->debugfs_files,
41890 ARRAY_SIZE(debugfs_files),
41891diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41892index aa0bd054..aea6a01 100644
41893--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41894+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41895@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41896 }
41897
41898 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41899- ttm_bo_man_init,
41900- ttm_bo_man_takedown,
41901- ttm_bo_man_get_node,
41902- ttm_bo_man_put_node,
41903- ttm_bo_man_debug
41904+ .init = ttm_bo_man_init,
41905+ .takedown = ttm_bo_man_takedown,
41906+ .get_node = ttm_bo_man_get_node,
41907+ .put_node = ttm_bo_man_put_node,
41908+ .debug = ttm_bo_man_debug
41909 };
41910 EXPORT_SYMBOL(ttm_bo_manager_func);
41911diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41912index a1803fb..c53f6b0 100644
41913--- a/drivers/gpu/drm/ttm/ttm_memory.c
41914+++ b/drivers/gpu/drm/ttm/ttm_memory.c
41915@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41916 zone->glob = glob;
41917 glob->zone_kernel = zone;
41918 ret = kobject_init_and_add(
41919- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41920+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41921 if (unlikely(ret != 0)) {
41922 kobject_put(&zone->kobj);
41923 return ret;
41924@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41925 zone->glob = glob;
41926 glob->zone_dma32 = zone;
41927 ret = kobject_init_and_add(
41928- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41929+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41930 if (unlikely(ret != 0)) {
41931 kobject_put(&zone->kobj);
41932 return ret;
41933diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41934index 025c429..314062f 100644
41935--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41936+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41937@@ -54,7 +54,7 @@
41938
41939 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41940 #define SMALL_ALLOCATION 16
41941-#define FREE_ALL_PAGES (~0U)
41942+#define FREE_ALL_PAGES (~0UL)
41943 /* times are in msecs */
41944 #define PAGE_FREE_INTERVAL 1000
41945
41946@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41947 * @free_all: If set to true will free all pages in pool
41948 * @use_static: Safe to use static buffer
41949 **/
41950-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41951+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41952 bool use_static)
41953 {
41954 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41955 unsigned long irq_flags;
41956 struct page *p;
41957 struct page **pages_to_free;
41958- unsigned freed_pages = 0,
41959- npages_to_free = nr_free;
41960+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41961
41962 if (NUM_PAGES_TO_ALLOC < nr_free)
41963 npages_to_free = NUM_PAGES_TO_ALLOC;
41964@@ -371,7 +370,8 @@ restart:
41965 __list_del(&p->lru, &pool->list);
41966
41967 ttm_pool_update_free_locked(pool, freed_pages);
41968- nr_free -= freed_pages;
41969+ if (likely(nr_free != FREE_ALL_PAGES))
41970+ nr_free -= freed_pages;
41971 }
41972
41973 spin_unlock_irqrestore(&pool->lock, irq_flags);
41974@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41975 unsigned i;
41976 unsigned pool_offset;
41977 struct ttm_page_pool *pool;
41978- int shrink_pages = sc->nr_to_scan;
41979+ unsigned long shrink_pages = sc->nr_to_scan;
41980 unsigned long freed = 0;
41981
41982 if (!mutex_trylock(&lock))
41983@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41984 pool_offset = ++start_pool % NUM_POOLS;
41985 /* select start pool in round robin fashion */
41986 for (i = 0; i < NUM_POOLS; ++i) {
41987- unsigned nr_free = shrink_pages;
41988+ unsigned long nr_free = shrink_pages;
41989 if (shrink_pages == 0)
41990 break;
41991 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41992@@ -673,7 +673,7 @@ out:
41993 }
41994
41995 /* Put all pages in pages list to correct pool to wait for reuse */
41996-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41997+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41998 enum ttm_caching_state cstate)
41999 {
42000 unsigned long irq_flags;
42001@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
42002 struct list_head plist;
42003 struct page *p = NULL;
42004 gfp_t gfp_flags = GFP_USER;
42005- unsigned count;
42006+ unsigned long count;
42007 int r;
42008
42009 /* set zero flag for page allocation if required */
42010diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42011index 01e1d27..aaa018a 100644
42012--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42013+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
42014@@ -56,7 +56,7 @@
42015
42016 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
42017 #define SMALL_ALLOCATION 4
42018-#define FREE_ALL_PAGES (~0U)
42019+#define FREE_ALL_PAGES (~0UL)
42020 /* times are in msecs */
42021 #define IS_UNDEFINED (0)
42022 #define IS_WC (1<<1)
42023@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
42024 * @nr_free: If set to true will free all pages in pool
42025 * @use_static: Safe to use static buffer
42026 **/
42027-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42028+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
42029 bool use_static)
42030 {
42031 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
42032@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
42033 struct dma_page *dma_p, *tmp;
42034 struct page **pages_to_free;
42035 struct list_head d_pages;
42036- unsigned freed_pages = 0,
42037- npages_to_free = nr_free;
42038+ unsigned long freed_pages = 0, npages_to_free = nr_free;
42039
42040 if (NUM_PAGES_TO_ALLOC < nr_free)
42041 npages_to_free = NUM_PAGES_TO_ALLOC;
42042@@ -499,7 +498,8 @@ restart:
42043 /* remove range of pages from the pool */
42044 if (freed_pages) {
42045 ttm_pool_update_free_locked(pool, freed_pages);
42046- nr_free -= freed_pages;
42047+ if (likely(nr_free != FREE_ALL_PAGES))
42048+ nr_free -= freed_pages;
42049 }
42050
42051 spin_unlock_irqrestore(&pool->lock, irq_flags);
42052@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
42053 struct dma_page *d_page, *next;
42054 enum pool_type type;
42055 bool is_cached = false;
42056- unsigned count = 0, i, npages = 0;
42057+ unsigned long count = 0, i, npages = 0;
42058 unsigned long irq_flags;
42059
42060 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
42061@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42062 static unsigned start_pool;
42063 unsigned idx = 0;
42064 unsigned pool_offset;
42065- unsigned shrink_pages = sc->nr_to_scan;
42066+ unsigned long shrink_pages = sc->nr_to_scan;
42067 struct device_pools *p;
42068 unsigned long freed = 0;
42069
42070@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42071 goto out;
42072 pool_offset = ++start_pool % _manager->npools;
42073 list_for_each_entry(p, &_manager->pools, pools) {
42074- unsigned nr_free;
42075+ unsigned long nr_free;
42076
42077 if (!p->dev)
42078 continue;
42079@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
42080 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
42081 freed += nr_free - shrink_pages;
42082
42083- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
42084+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
42085 p->pool->dev_name, p->pool->name, current->pid,
42086 nr_free, shrink_pages);
42087 }
42088diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
42089index 5fc16ce..1bd84ec 100644
42090--- a/drivers/gpu/drm/udl/udl_fb.c
42091+++ b/drivers/gpu/drm/udl/udl_fb.c
42092@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
42093 fb_deferred_io_cleanup(info);
42094 kfree(info->fbdefio);
42095 info->fbdefio = NULL;
42096- info->fbops->fb_mmap = udl_fb_mmap;
42097 }
42098
42099 pr_warn("released /dev/fb%d user=%d count=%d\n",
42100diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
42101index ef8c500..01030c8 100644
42102--- a/drivers/gpu/drm/via/via_drv.h
42103+++ b/drivers/gpu/drm/via/via_drv.h
42104@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
42105 typedef uint32_t maskarray_t[5];
42106
42107 typedef struct drm_via_irq {
42108- atomic_t irq_received;
42109+ atomic_unchecked_t irq_received;
42110 uint32_t pending_mask;
42111 uint32_t enable_mask;
42112 wait_queue_head_t irq_queue;
42113@@ -77,7 +77,7 @@ typedef struct drm_via_private {
42114 struct timeval last_vblank;
42115 int last_vblank_valid;
42116 unsigned usec_per_vblank;
42117- atomic_t vbl_received;
42118+ atomic_unchecked_t vbl_received;
42119 drm_via_state_t hc_state;
42120 char pci_buf[VIA_PCI_BUF_SIZE];
42121 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
42122diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
42123index 1319433..a993b0c 100644
42124--- a/drivers/gpu/drm/via/via_irq.c
42125+++ b/drivers/gpu/drm/via/via_irq.c
42126@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
42127 if (crtc != 0)
42128 return 0;
42129
42130- return atomic_read(&dev_priv->vbl_received);
42131+ return atomic_read_unchecked(&dev_priv->vbl_received);
42132 }
42133
42134 irqreturn_t via_driver_irq_handler(int irq, void *arg)
42135@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42136
42137 status = VIA_READ(VIA_REG_INTERRUPT);
42138 if (status & VIA_IRQ_VBLANK_PENDING) {
42139- atomic_inc(&dev_priv->vbl_received);
42140- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
42141+ atomic_inc_unchecked(&dev_priv->vbl_received);
42142+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
42143 do_gettimeofday(&cur_vblank);
42144 if (dev_priv->last_vblank_valid) {
42145 dev_priv->usec_per_vblank =
42146@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42147 dev_priv->last_vblank = cur_vblank;
42148 dev_priv->last_vblank_valid = 1;
42149 }
42150- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
42151+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
42152 DRM_DEBUG("US per vblank is: %u\n",
42153 dev_priv->usec_per_vblank);
42154 }
42155@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
42156
42157 for (i = 0; i < dev_priv->num_irqs; ++i) {
42158 if (status & cur_irq->pending_mask) {
42159- atomic_inc(&cur_irq->irq_received);
42160+ atomic_inc_unchecked(&cur_irq->irq_received);
42161 wake_up(&cur_irq->irq_queue);
42162 handled = 1;
42163 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
42164@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
42165 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42166 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
42167 masks[irq][4]));
42168- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
42169+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
42170 } else {
42171 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
42172 (((cur_irq_sequence =
42173- atomic_read(&cur_irq->irq_received)) -
42174+ atomic_read_unchecked(&cur_irq->irq_received)) -
42175 *sequence) <= (1 << 23)));
42176 }
42177 *sequence = cur_irq_sequence;
42178@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
42179 }
42180
42181 for (i = 0; i < dev_priv->num_irqs; ++i) {
42182- atomic_set(&cur_irq->irq_received, 0);
42183+ atomic_set_unchecked(&cur_irq->irq_received, 0);
42184 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
42185 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
42186 init_waitqueue_head(&cur_irq->irq_queue);
42187@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
42188 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
42189 case VIA_IRQ_RELATIVE:
42190 irqwait->request.sequence +=
42191- atomic_read(&cur_irq->irq_received);
42192+ atomic_read_unchecked(&cur_irq->irq_received);
42193 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
42194 case VIA_IRQ_ABSOLUTE:
42195 break;
42196diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42197index d26a6da..5fa41ed 100644
42198--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42199+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
42200@@ -447,7 +447,7 @@ struct vmw_private {
42201 * Fencing and IRQs.
42202 */
42203
42204- atomic_t marker_seq;
42205+ atomic_unchecked_t marker_seq;
42206 wait_queue_head_t fence_queue;
42207 wait_queue_head_t fifo_queue;
42208 spinlock_t waiter_lock;
42209diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42210index 39f2b03..d1b0a64 100644
42211--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42212+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
42213@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
42214 (unsigned int) min,
42215 (unsigned int) fifo->capabilities);
42216
42217- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42218+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
42219 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
42220 vmw_marker_queue_init(&fifo->marker_queue);
42221 return vmw_fifo_send_fence(dev_priv, &dummy);
42222@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
42223 if (reserveable)
42224 iowrite32(bytes, fifo_mem +
42225 SVGA_FIFO_RESERVED);
42226- return fifo_mem + (next_cmd >> 2);
42227+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
42228 } else {
42229 need_bounce = true;
42230 }
42231@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42232
42233 fm = vmw_fifo_reserve(dev_priv, bytes);
42234 if (unlikely(fm == NULL)) {
42235- *seqno = atomic_read(&dev_priv->marker_seq);
42236+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42237 ret = -ENOMEM;
42238 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
42239 false, 3*HZ);
42240@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
42241 }
42242
42243 do {
42244- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
42245+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
42246 } while (*seqno == 0);
42247
42248 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
42249diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42250index 170b61b..fec7348 100644
42251--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42252+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42253@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42254 }
42255
42256 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42257- vmw_gmrid_man_init,
42258- vmw_gmrid_man_takedown,
42259- vmw_gmrid_man_get_node,
42260- vmw_gmrid_man_put_node,
42261- vmw_gmrid_man_debug
42262+ .init = vmw_gmrid_man_init,
42263+ .takedown = vmw_gmrid_man_takedown,
42264+ .get_node = vmw_gmrid_man_get_node,
42265+ .put_node = vmw_gmrid_man_put_node,
42266+ .debug = vmw_gmrid_man_debug
42267 };
42268diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42269index 69c8ce2..cacb0ab 100644
42270--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42271+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42272@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42273 int ret;
42274
42275 num_clips = arg->num_clips;
42276- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42277+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42278
42279 if (unlikely(num_clips == 0))
42280 return 0;
42281@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42282 int ret;
42283
42284 num_clips = arg->num_clips;
42285- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42286+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42287
42288 if (unlikely(num_clips == 0))
42289 return 0;
42290diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42291index 9fe9827..0aa2fc0 100644
42292--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42293+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42294@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42295 * emitted. Then the fence is stale and signaled.
42296 */
42297
42298- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42299+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42300 > VMW_FENCE_WRAP);
42301
42302 return ret;
42303@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42304
42305 if (fifo_idle)
42306 down_read(&fifo_state->rwsem);
42307- signal_seq = atomic_read(&dev_priv->marker_seq);
42308+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42309 ret = 0;
42310
42311 for (;;) {
42312diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42313index efd1ffd..0ae13ca 100644
42314--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42315+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42316@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42317 while (!vmw_lag_lt(queue, us)) {
42318 spin_lock(&queue->lock);
42319 if (list_empty(&queue->head))
42320- seqno = atomic_read(&dev_priv->marker_seq);
42321+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42322 else {
42323 marker = list_first_entry(&queue->head,
42324 struct vmw_marker, head);
42325diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42326index 37ac7b5..d52a5c9 100644
42327--- a/drivers/gpu/vga/vga_switcheroo.c
42328+++ b/drivers/gpu/vga/vga_switcheroo.c
42329@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42330
42331 /* this version is for the case where the power switch is separate
42332 to the device being powered down. */
42333-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42334+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42335 {
42336 /* copy over all the bus versions */
42337 if (dev->bus && dev->bus->pm) {
42338@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42339 return ret;
42340 }
42341
42342-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42343+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42344 {
42345 /* copy over all the bus versions */
42346 if (dev->bus && dev->bus->pm) {
42347diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42348index 722a925..594c312 100644
42349--- a/drivers/hid/hid-core.c
42350+++ b/drivers/hid/hid-core.c
42351@@ -2552,7 +2552,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42352
42353 int hid_add_device(struct hid_device *hdev)
42354 {
42355- static atomic_t id = ATOMIC_INIT(0);
42356+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42357 int ret;
42358
42359 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42360@@ -2595,7 +2595,7 @@ int hid_add_device(struct hid_device *hdev)
42361 /* XXX hack, any other cleaner solution after the driver core
42362 * is converted to allow more than 20 bytes as the device name? */
42363 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42364- hdev->vendor, hdev->product, atomic_inc_return(&id));
42365+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42366
42367 hid_debug_register(hdev, dev_name(&hdev->dev));
42368 ret = device_add(&hdev->dev);
42369diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
42370index 008e89b..32d52d2 100644
42371--- a/drivers/hid/hid-input.c
42372+++ b/drivers/hid/hid-input.c
42373@@ -462,12 +462,15 @@ out:
42374
42375 static void hidinput_cleanup_battery(struct hid_device *dev)
42376 {
42377+ const struct power_supply_desc *psy_desc;
42378+
42379 if (!dev->battery)
42380 return;
42381
42382+ psy_desc = dev->battery->desc;
42383 power_supply_unregister(dev->battery);
42384- kfree(dev->battery->desc->name);
42385- kfree(dev->battery->desc);
42386+ kfree(psy_desc->name);
42387+ kfree(psy_desc);
42388 dev->battery = NULL;
42389 }
42390 #else /* !CONFIG_HID_BATTERY_STRENGTH */
42391diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c
42392index 5614fee..8301fbf 100644
42393--- a/drivers/hid/hid-sensor-custom.c
42394+++ b/drivers/hid/hid-sensor-custom.c
42395@@ -34,7 +34,7 @@ struct hid_sensor_custom_field {
42396 int report_id;
42397 char group_name[HID_CUSTOM_NAME_LENGTH];
42398 struct hid_sensor_hub_attribute_info attribute;
42399- struct device_attribute sd_attrs[HID_CUSTOM_MAX_CORE_ATTRS];
42400+ device_attribute_no_const sd_attrs[HID_CUSTOM_MAX_CORE_ATTRS];
42401 char attr_name[HID_CUSTOM_TOTAL_ATTRS][HID_CUSTOM_NAME_LENGTH];
42402 struct attribute *attrs[HID_CUSTOM_TOTAL_ATTRS];
42403 struct attribute_group hid_custom_attribute_group;
42404@@ -590,7 +590,7 @@ static int hid_sensor_custom_add_attributes(struct hid_sensor_custom
42405 j = 0;
42406 while (j < HID_CUSTOM_TOTAL_ATTRS &&
42407 hid_custom_attrs[j].name) {
42408- struct device_attribute *device_attr;
42409+ device_attribute_no_const *device_attr;
42410
42411 device_attr = &sensor_inst->fields[i].sd_attrs[j];
42412
42413diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42414index c13fb5b..55a3802 100644
42415--- a/drivers/hid/hid-wiimote-debug.c
42416+++ b/drivers/hid/hid-wiimote-debug.c
42417@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42418 else if (size == 0)
42419 return -EIO;
42420
42421- if (copy_to_user(u, buf, size))
42422+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42423 return -EFAULT;
42424
42425 *off += size;
42426diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42427index 54da66d..aa3a3d7 100644
42428--- a/drivers/hv/channel.c
42429+++ b/drivers/hv/channel.c
42430@@ -373,7 +373,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42431 int ret = 0;
42432
42433 next_gpadl_handle =
42434- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42435+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42436
42437 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42438 if (ret)
42439diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42440index d3943bc..3de28a9 100644
42441--- a/drivers/hv/hv.c
42442+++ b/drivers/hv/hv.c
42443@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42444 u64 output_address = (output) ? virt_to_phys(output) : 0;
42445 u32 output_address_hi = output_address >> 32;
42446 u32 output_address_lo = output_address & 0xFFFFFFFF;
42447- void *hypercall_page = hv_context.hypercall_page;
42448+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42449
42450 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42451 "=a"(hv_status_lo) : "d" (control_hi),
42452@@ -164,7 +164,7 @@ int hv_init(void)
42453 /* See if the hypercall page is already set */
42454 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42455
42456- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42457+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42458
42459 if (!virtaddr)
42460 goto cleanup;
42461diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42462index cb5b7dc..6052f22 100644
42463--- a/drivers/hv/hv_balloon.c
42464+++ b/drivers/hv/hv_balloon.c
42465@@ -469,7 +469,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42466
42467 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42468 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42469-static atomic_t trans_id = ATOMIC_INIT(0);
42470+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42471
42472 static int dm_ring_size = (5 * PAGE_SIZE);
42473
42474@@ -941,7 +941,7 @@ static void hot_add_req(struct work_struct *dummy)
42475 pr_info("Memory hot add failed\n");
42476
42477 dm->state = DM_INITIALIZED;
42478- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42479+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42480 vmbus_sendpacket(dm->dev->channel, &resp,
42481 sizeof(struct dm_hot_add_response),
42482 (unsigned long)NULL,
42483@@ -1022,7 +1022,7 @@ static void post_status(struct hv_dynmem_device *dm)
42484 memset(&status, 0, sizeof(struct dm_status));
42485 status.hdr.type = DM_STATUS_REPORT;
42486 status.hdr.size = sizeof(struct dm_status);
42487- status.hdr.trans_id = atomic_inc_return(&trans_id);
42488+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42489
42490 /*
42491 * The host expects the guest to report free and committed memory.
42492@@ -1046,7 +1046,7 @@ static void post_status(struct hv_dynmem_device *dm)
42493 * send the status. This can happen if we were interrupted
42494 * after we picked our transaction ID.
42495 */
42496- if (status.hdr.trans_id != atomic_read(&trans_id))
42497+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42498 return;
42499
42500 /*
42501@@ -1191,7 +1191,7 @@ static void balloon_up(struct work_struct *dummy)
42502 */
42503
42504 do {
42505- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42506+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42507 ret = vmbus_sendpacket(dm_device.dev->channel,
42508 bl_resp,
42509 bl_resp->hdr.size,
42510@@ -1237,7 +1237,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42511
42512 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42513 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42514- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42515+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42516 resp.hdr.size = sizeof(struct dm_unballoon_response);
42517
42518 vmbus_sendpacket(dm_device.dev->channel, &resp,
42519@@ -1298,7 +1298,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42520 memset(&version_req, 0, sizeof(struct dm_version_request));
42521 version_req.hdr.type = DM_VERSION_REQUEST;
42522 version_req.hdr.size = sizeof(struct dm_version_request);
42523- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42524+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42525 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42526 version_req.is_last_attempt = 1;
42527
42528@@ -1471,7 +1471,7 @@ static int balloon_probe(struct hv_device *dev,
42529 memset(&version_req, 0, sizeof(struct dm_version_request));
42530 version_req.hdr.type = DM_VERSION_REQUEST;
42531 version_req.hdr.size = sizeof(struct dm_version_request);
42532- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42533+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42534 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42535 version_req.is_last_attempt = 0;
42536
42537@@ -1502,7 +1502,7 @@ static int balloon_probe(struct hv_device *dev,
42538 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42539 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42540 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42541- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42542+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42543
42544 cap_msg.caps.cap_bits.balloon = 1;
42545 cap_msg.caps.cap_bits.hot_add = 1;
42546diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42547index 887287a..238a626 100644
42548--- a/drivers/hv/hyperv_vmbus.h
42549+++ b/drivers/hv/hyperv_vmbus.h
42550@@ -645,7 +645,7 @@ enum vmbus_connect_state {
42551 struct vmbus_connection {
42552 enum vmbus_connect_state conn_state;
42553
42554- atomic_t next_gpadl_handle;
42555+ atomic_unchecked_t next_gpadl_handle;
42556
42557 /*
42558 * Represents channel interrupts. Each bit position represents a
42559diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42560index 579bdf9..0dac21d5 100644
42561--- a/drivers/hwmon/acpi_power_meter.c
42562+++ b/drivers/hwmon/acpi_power_meter.c
42563@@ -116,7 +116,7 @@ struct sensor_template {
42564 struct device_attribute *devattr,
42565 const char *buf, size_t count);
42566 int index;
42567-};
42568+} __do_const;
42569
42570 /* Averaging interval */
42571 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42572@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42573 struct sensor_template *attrs)
42574 {
42575 struct device *dev = &resource->acpi_dev->dev;
42576- struct sensor_device_attribute *sensors =
42577+ sensor_device_attribute_no_const *sensors =
42578 &resource->sensors[resource->num_sensors];
42579 int res = 0;
42580
42581@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42582 return 0;
42583 }
42584
42585-static struct dmi_system_id __initdata pm_dmi_table[] = {
42586+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42587 {
42588 enable_cap_knobs, "IBM Active Energy Manager",
42589 {
42590diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42591index 0af63da..05a183a 100644
42592--- a/drivers/hwmon/applesmc.c
42593+++ b/drivers/hwmon/applesmc.c
42594@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42595 {
42596 struct applesmc_node_group *grp;
42597 struct applesmc_dev_attr *node;
42598- struct attribute *attr;
42599+ attribute_no_const *attr;
42600 int ret, i;
42601
42602 for (grp = groups; grp->format; grp++) {
42603diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42604index cccef87..06ce8ec 100644
42605--- a/drivers/hwmon/asus_atk0110.c
42606+++ b/drivers/hwmon/asus_atk0110.c
42607@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42608 struct atk_sensor_data {
42609 struct list_head list;
42610 struct atk_data *data;
42611- struct device_attribute label_attr;
42612- struct device_attribute input_attr;
42613- struct device_attribute limit1_attr;
42614- struct device_attribute limit2_attr;
42615+ device_attribute_no_const label_attr;
42616+ device_attribute_no_const input_attr;
42617+ device_attribute_no_const limit1_attr;
42618+ device_attribute_no_const limit2_attr;
42619 char label_attr_name[ATTR_NAME_SIZE];
42620 char input_attr_name[ATTR_NAME_SIZE];
42621 char limit1_attr_name[ATTR_NAME_SIZE];
42622@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42623 static struct device_attribute atk_name_attr =
42624 __ATTR(name, 0444, atk_name_show, NULL);
42625
42626-static void atk_init_attribute(struct device_attribute *attr, char *name,
42627+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42628 sysfs_show_func show)
42629 {
42630 sysfs_attr_init(&attr->attr);
42631diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42632index ed303ba..e24bd26f 100644
42633--- a/drivers/hwmon/coretemp.c
42634+++ b/drivers/hwmon/coretemp.c
42635@@ -782,7 +782,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42636 return NOTIFY_OK;
42637 }
42638
42639-static struct notifier_block coretemp_cpu_notifier __refdata = {
42640+static struct notifier_block coretemp_cpu_notifier = {
42641 .notifier_call = coretemp_cpu_callback,
42642 };
42643
42644diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42645index 7a8a6fb..015c1fd 100644
42646--- a/drivers/hwmon/ibmaem.c
42647+++ b/drivers/hwmon/ibmaem.c
42648@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42649 struct aem_rw_sensor_template *rw)
42650 {
42651 struct device *dev = &data->pdev->dev;
42652- struct sensor_device_attribute *sensors = data->sensors;
42653+ sensor_device_attribute_no_const *sensors = data->sensors;
42654 int err;
42655
42656 /* Set up read-only sensors */
42657diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42658index 17ae2eb..21b71dd 100644
42659--- a/drivers/hwmon/iio_hwmon.c
42660+++ b/drivers/hwmon/iio_hwmon.c
42661@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42662 {
42663 struct device *dev = &pdev->dev;
42664 struct iio_hwmon_state *st;
42665- struct sensor_device_attribute *a;
42666+ sensor_device_attribute_no_const *a;
42667 int ret, i;
42668 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42669 enum iio_chan_type type;
42670diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42671index 37f0170..414ec2c 100644
42672--- a/drivers/hwmon/nct6683.c
42673+++ b/drivers/hwmon/nct6683.c
42674@@ -397,11 +397,11 @@ static struct attribute_group *
42675 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42676 int repeat)
42677 {
42678- struct sensor_device_attribute_2 *a2;
42679- struct sensor_device_attribute *a;
42680+ sensor_device_attribute_2_no_const *a2;
42681+ sensor_device_attribute_no_const *a;
42682 struct sensor_device_template **t;
42683 struct sensor_device_attr_u *su;
42684- struct attribute_group *group;
42685+ attribute_group_no_const *group;
42686 struct attribute **attrs;
42687 int i, j, count;
42688
42689diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42690index bd1c99d..2fa55ad 100644
42691--- a/drivers/hwmon/nct6775.c
42692+++ b/drivers/hwmon/nct6775.c
42693@@ -953,10 +953,10 @@ static struct attribute_group *
42694 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42695 int repeat)
42696 {
42697- struct attribute_group *group;
42698+ attribute_group_no_const *group;
42699 struct sensor_device_attr_u *su;
42700- struct sensor_device_attribute *a;
42701- struct sensor_device_attribute_2 *a2;
42702+ sensor_device_attribute_no_const *a;
42703+ sensor_device_attribute_2_no_const *a2;
42704 struct attribute **attrs;
42705 struct sensor_device_template **t;
42706 int i, count;
42707diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42708index f2e47c7..45d7941 100644
42709--- a/drivers/hwmon/pmbus/pmbus_core.c
42710+++ b/drivers/hwmon/pmbus/pmbus_core.c
42711@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42712 return 0;
42713 }
42714
42715-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42716+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42717 const char *name,
42718 umode_t mode,
42719 ssize_t (*show)(struct device *dev,
42720@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42721 dev_attr->store = store;
42722 }
42723
42724-static void pmbus_attr_init(struct sensor_device_attribute *a,
42725+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42726 const char *name,
42727 umode_t mode,
42728 ssize_t (*show)(struct device *dev,
42729@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42730 u16 reg, u8 mask)
42731 {
42732 struct pmbus_boolean *boolean;
42733- struct sensor_device_attribute *a;
42734+ sensor_device_attribute_no_const *a;
42735
42736 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42737 if (!boolean)
42738@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42739 bool update, bool readonly)
42740 {
42741 struct pmbus_sensor *sensor;
42742- struct device_attribute *a;
42743+ device_attribute_no_const *a;
42744
42745 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42746 if (!sensor)
42747@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42748 const char *lstring, int index)
42749 {
42750 struct pmbus_label *label;
42751- struct device_attribute *a;
42752+ device_attribute_no_const *a;
42753
42754 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42755 if (!label)
42756diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42757index d4f0935..7420593 100644
42758--- a/drivers/hwmon/sht15.c
42759+++ b/drivers/hwmon/sht15.c
42760@@ -169,7 +169,7 @@ struct sht15_data {
42761 int supply_uv;
42762 bool supply_uv_valid;
42763 struct work_struct update_supply_work;
42764- atomic_t interrupt_handled;
42765+ atomic_unchecked_t interrupt_handled;
42766 };
42767
42768 /**
42769@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42770 ret = gpio_direction_input(data->pdata->gpio_data);
42771 if (ret)
42772 return ret;
42773- atomic_set(&data->interrupt_handled, 0);
42774+ atomic_set_unchecked(&data->interrupt_handled, 0);
42775
42776 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42777 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42778 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42779 /* Only relevant if the interrupt hasn't occurred. */
42780- if (!atomic_read(&data->interrupt_handled))
42781+ if (!atomic_read_unchecked(&data->interrupt_handled))
42782 schedule_work(&data->read_work);
42783 }
42784 ret = wait_event_timeout(data->wait_queue,
42785@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42786
42787 /* First disable the interrupt */
42788 disable_irq_nosync(irq);
42789- atomic_inc(&data->interrupt_handled);
42790+ atomic_inc_unchecked(&data->interrupt_handled);
42791 /* Then schedule a reading work struct */
42792 if (data->state != SHT15_READING_NOTHING)
42793 schedule_work(&data->read_work);
42794@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42795 * If not, then start the interrupt again - care here as could
42796 * have gone low in meantime so verify it hasn't!
42797 */
42798- atomic_set(&data->interrupt_handled, 0);
42799+ atomic_set_unchecked(&data->interrupt_handled, 0);
42800 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42801 /* If still not occurred or another handler was scheduled */
42802 if (gpio_get_value(data->pdata->gpio_data)
42803- || atomic_read(&data->interrupt_handled))
42804+ || atomic_read_unchecked(&data->interrupt_handled))
42805 return;
42806 }
42807
42808diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42809index ac91c07..8e69663 100644
42810--- a/drivers/hwmon/via-cputemp.c
42811+++ b/drivers/hwmon/via-cputemp.c
42812@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42813 return NOTIFY_OK;
42814 }
42815
42816-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42817+static struct notifier_block via_cputemp_cpu_notifier = {
42818 .notifier_call = via_cputemp_cpu_callback,
42819 };
42820
42821diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42822index 65e3240..e6c511d 100644
42823--- a/drivers/i2c/busses/i2c-amd756-s4882.c
42824+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42825@@ -39,7 +39,7 @@
42826 extern struct i2c_adapter amd756_smbus;
42827
42828 static struct i2c_adapter *s4882_adapter;
42829-static struct i2c_algorithm *s4882_algo;
42830+static i2c_algorithm_no_const *s4882_algo;
42831
42832 /* Wrapper access functions for multiplexed SMBus */
42833 static DEFINE_MUTEX(amd756_lock);
42834diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42835index b19a310..d6eece0 100644
42836--- a/drivers/i2c/busses/i2c-diolan-u2c.c
42837+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42838@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42839 /* usb layer */
42840
42841 /* Send command to device, and get response. */
42842-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42843+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42844 {
42845 int ret = 0;
42846 int actual;
42847diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42848index 88eda09..cf40434 100644
42849--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42850+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42851@@ -37,7 +37,7 @@
42852 extern struct i2c_adapter *nforce2_smbus;
42853
42854 static struct i2c_adapter *s4985_adapter;
42855-static struct i2c_algorithm *s4985_algo;
42856+static i2c_algorithm_no_const *s4985_algo;
42857
42858 /* Wrapper access functions for multiplexed SMBus */
42859 static DEFINE_MUTEX(nforce2_lock);
42860diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42861index 71c7a39..71dd3e0 100644
42862--- a/drivers/i2c/i2c-dev.c
42863+++ b/drivers/i2c/i2c-dev.c
42864@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42865 break;
42866 }
42867
42868- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42869+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42870 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42871 if (IS_ERR(rdwr_pa[i].buf)) {
42872 res = PTR_ERR(rdwr_pa[i].buf);
42873diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42874index 0b510ba..4fbb5085 100644
42875--- a/drivers/ide/ide-cd.c
42876+++ b/drivers/ide/ide-cd.c
42877@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42878 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42879 if ((unsigned long)buf & alignment
42880 || blk_rq_bytes(rq) & q->dma_pad_mask
42881- || object_is_on_stack(buf))
42882+ || object_starts_on_stack(buf))
42883 drive->dma = 0;
42884 }
42885 }
42886diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42887index 4df97f6..c751151 100644
42888--- a/drivers/iio/industrialio-core.c
42889+++ b/drivers/iio/industrialio-core.c
42890@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42891 }
42892
42893 static
42894-int __iio_device_attr_init(struct device_attribute *dev_attr,
42895+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42896 const char *postfix,
42897 struct iio_chan_spec const *chan,
42898 ssize_t (*readfunc)(struct device *dev,
42899diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42900index 0271608..81998c5 100644
42901--- a/drivers/infiniband/core/cm.c
42902+++ b/drivers/infiniband/core/cm.c
42903@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42904
42905 struct cm_counter_group {
42906 struct kobject obj;
42907- atomic_long_t counter[CM_ATTR_COUNT];
42908+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42909 };
42910
42911 struct cm_counter_attribute {
42912@@ -1397,7 +1397,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42913 struct ib_mad_send_buf *msg = NULL;
42914 int ret;
42915
42916- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42917+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42918 counter[CM_REQ_COUNTER]);
42919
42920 /* Quick state check to discard duplicate REQs. */
42921@@ -1784,7 +1784,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42922 if (!cm_id_priv)
42923 return;
42924
42925- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42926+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42927 counter[CM_REP_COUNTER]);
42928 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42929 if (ret)
42930@@ -1951,7 +1951,7 @@ static int cm_rtu_handler(struct cm_work *work)
42931 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42932 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42933 spin_unlock_irq(&cm_id_priv->lock);
42934- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42935+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42936 counter[CM_RTU_COUNTER]);
42937 goto out;
42938 }
42939@@ -2134,7 +2134,7 @@ static int cm_dreq_handler(struct cm_work *work)
42940 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42941 dreq_msg->local_comm_id);
42942 if (!cm_id_priv) {
42943- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42944+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42945 counter[CM_DREQ_COUNTER]);
42946 cm_issue_drep(work->port, work->mad_recv_wc);
42947 return -EINVAL;
42948@@ -2159,7 +2159,7 @@ static int cm_dreq_handler(struct cm_work *work)
42949 case IB_CM_MRA_REP_RCVD:
42950 break;
42951 case IB_CM_TIMEWAIT:
42952- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42953+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42954 counter[CM_DREQ_COUNTER]);
42955 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42956 goto unlock;
42957@@ -2173,7 +2173,7 @@ static int cm_dreq_handler(struct cm_work *work)
42958 cm_free_msg(msg);
42959 goto deref;
42960 case IB_CM_DREQ_RCVD:
42961- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42962+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42963 counter[CM_DREQ_COUNTER]);
42964 goto unlock;
42965 default:
42966@@ -2540,7 +2540,7 @@ static int cm_mra_handler(struct cm_work *work)
42967 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42968 cm_id_priv->msg, timeout)) {
42969 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42970- atomic_long_inc(&work->port->
42971+ atomic_long_inc_unchecked(&work->port->
42972 counter_group[CM_RECV_DUPLICATES].
42973 counter[CM_MRA_COUNTER]);
42974 goto out;
42975@@ -2549,7 +2549,7 @@ static int cm_mra_handler(struct cm_work *work)
42976 break;
42977 case IB_CM_MRA_REQ_RCVD:
42978 case IB_CM_MRA_REP_RCVD:
42979- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42980+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42981 counter[CM_MRA_COUNTER]);
42982 /* fall through */
42983 default:
42984@@ -2711,7 +2711,7 @@ static int cm_lap_handler(struct cm_work *work)
42985 case IB_CM_LAP_IDLE:
42986 break;
42987 case IB_CM_MRA_LAP_SENT:
42988- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42989+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42990 counter[CM_LAP_COUNTER]);
42991 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42992 goto unlock;
42993@@ -2727,7 +2727,7 @@ static int cm_lap_handler(struct cm_work *work)
42994 cm_free_msg(msg);
42995 goto deref;
42996 case IB_CM_LAP_RCVD:
42997- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42998+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42999 counter[CM_LAP_COUNTER]);
43000 goto unlock;
43001 default:
43002@@ -3011,7 +3011,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
43003 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
43004 if (cur_cm_id_priv) {
43005 spin_unlock_irq(&cm.lock);
43006- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
43007+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
43008 counter[CM_SIDR_REQ_COUNTER]);
43009 goto out; /* Duplicate message. */
43010 }
43011@@ -3223,10 +3223,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
43012 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
43013 msg->retries = 1;
43014
43015- atomic_long_add(1 + msg->retries,
43016+ atomic_long_add_unchecked(1 + msg->retries,
43017 &port->counter_group[CM_XMIT].counter[attr_index]);
43018 if (msg->retries)
43019- atomic_long_add(msg->retries,
43020+ atomic_long_add_unchecked(msg->retries,
43021 &port->counter_group[CM_XMIT_RETRIES].
43022 counter[attr_index]);
43023
43024@@ -3436,7 +3436,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
43025 }
43026
43027 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
43028- atomic_long_inc(&port->counter_group[CM_RECV].
43029+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
43030 counter[attr_id - CM_ATTR_ID_OFFSET]);
43031
43032 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
43033@@ -3667,7 +3667,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
43034 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
43035
43036 return sprintf(buf, "%ld\n",
43037- atomic_long_read(&group->counter[cm_attr->index]));
43038+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
43039 }
43040
43041 static const struct sysfs_ops cm_counter_ops = {
43042diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
43043index 9f5ad7c..588cd84 100644
43044--- a/drivers/infiniband/core/fmr_pool.c
43045+++ b/drivers/infiniband/core/fmr_pool.c
43046@@ -98,8 +98,8 @@ struct ib_fmr_pool {
43047
43048 struct task_struct *thread;
43049
43050- atomic_t req_ser;
43051- atomic_t flush_ser;
43052+ atomic_unchecked_t req_ser;
43053+ atomic_unchecked_t flush_ser;
43054
43055 wait_queue_head_t force_wait;
43056 };
43057@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43058 struct ib_fmr_pool *pool = pool_ptr;
43059
43060 do {
43061- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
43062+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
43063 ib_fmr_batch_release(pool);
43064
43065- atomic_inc(&pool->flush_ser);
43066+ atomic_inc_unchecked(&pool->flush_ser);
43067 wake_up_interruptible(&pool->force_wait);
43068
43069 if (pool->flush_function)
43070@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
43071 }
43072
43073 set_current_state(TASK_INTERRUPTIBLE);
43074- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
43075+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
43076 !kthread_should_stop())
43077 schedule();
43078 __set_current_state(TASK_RUNNING);
43079@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
43080 pool->dirty_watermark = params->dirty_watermark;
43081 pool->dirty_len = 0;
43082 spin_lock_init(&pool->pool_lock);
43083- atomic_set(&pool->req_ser, 0);
43084- atomic_set(&pool->flush_ser, 0);
43085+ atomic_set_unchecked(&pool->req_ser, 0);
43086+ atomic_set_unchecked(&pool->flush_ser, 0);
43087 init_waitqueue_head(&pool->force_wait);
43088
43089 pool->thread = kthread_run(ib_fmr_cleanup_thread,
43090@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
43091 }
43092 spin_unlock_irq(&pool->pool_lock);
43093
43094- serial = atomic_inc_return(&pool->req_ser);
43095+ serial = atomic_inc_return_unchecked(&pool->req_ser);
43096 wake_up_process(pool->thread);
43097
43098 if (wait_event_interruptible(pool->force_wait,
43099- atomic_read(&pool->flush_ser) - serial >= 0))
43100+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
43101 return -EINTR;
43102
43103 return 0;
43104@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
43105 } else {
43106 list_add_tail(&fmr->list, &pool->dirty_list);
43107 if (++pool->dirty_len >= pool->dirty_watermark) {
43108- atomic_inc(&pool->req_ser);
43109+ atomic_inc_unchecked(&pool->req_ser);
43110 wake_up_process(pool->thread);
43111 }
43112 }
43113diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
43114index a9f0489..27a161b 100644
43115--- a/drivers/infiniband/core/uverbs_cmd.c
43116+++ b/drivers/infiniband/core/uverbs_cmd.c
43117@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
43118 if (copy_from_user(&cmd, buf, sizeof cmd))
43119 return -EFAULT;
43120
43121+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
43122+ return -EFAULT;
43123+
43124 INIT_UDATA(&udata, buf + sizeof cmd,
43125 (unsigned long) cmd.response + sizeof resp,
43126 in_len - sizeof cmd, out_len - sizeof resp);
43127diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
43128index cff815b..75576dd 100644
43129--- a/drivers/infiniband/hw/cxgb4/mem.c
43130+++ b/drivers/infiniband/hw/cxgb4/mem.c
43131@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43132 int err;
43133 struct fw_ri_tpte tpt;
43134 u32 stag_idx;
43135- static atomic_t key;
43136+ static atomic_unchecked_t key;
43137
43138 if (c4iw_fatal_error(rdev))
43139 return -EIO;
43140@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
43141 if (rdev->stats.stag.cur > rdev->stats.stag.max)
43142 rdev->stats.stag.max = rdev->stats.stag.cur;
43143 mutex_unlock(&rdev->stats.lock);
43144- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
43145+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
43146 }
43147 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
43148 __func__, stag_state, type, pdid, stag_idx);
43149diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
43150index 79b3dbc..96e5fcc 100644
43151--- a/drivers/infiniband/hw/ipath/ipath_rc.c
43152+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
43153@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43154 struct ib_atomic_eth *ateth;
43155 struct ipath_ack_entry *e;
43156 u64 vaddr;
43157- atomic64_t *maddr;
43158+ atomic64_unchecked_t *maddr;
43159 u64 sdata;
43160 u32 rkey;
43161 u8 next;
43162@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
43163 IB_ACCESS_REMOTE_ATOMIC)))
43164 goto nack_acc_unlck;
43165 /* Perform atomic OP and save result. */
43166- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43167+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43168 sdata = be64_to_cpu(ateth->swap_data);
43169 e = &qp->s_ack_queue[qp->r_head_ack_queue];
43170 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
43171- (u64) atomic64_add_return(sdata, maddr) - sdata :
43172+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43173 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43174 be64_to_cpu(ateth->compare_data),
43175 sdata);
43176diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
43177index 1f95bba..9530f87 100644
43178--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
43179+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
43180@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
43181 unsigned long flags;
43182 struct ib_wc wc;
43183 u64 sdata;
43184- atomic64_t *maddr;
43185+ atomic64_unchecked_t *maddr;
43186 enum ib_wc_status send_status;
43187
43188 /*
43189@@ -382,11 +382,11 @@ again:
43190 IB_ACCESS_REMOTE_ATOMIC)))
43191 goto acc_err;
43192 /* Perform atomic OP and save result. */
43193- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
43194+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
43195 sdata = wqe->wr.wr.atomic.compare_add;
43196 *(u64 *) sqp->s_sge.sge.vaddr =
43197 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
43198- (u64) atomic64_add_return(sdata, maddr) - sdata :
43199+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
43200 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
43201 sdata, wqe->wr.wr.atomic.swap);
43202 goto send_comp;
43203diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
43204index 9cd2b00..7486df4 100644
43205--- a/drivers/infiniband/hw/mlx4/mad.c
43206+++ b/drivers/infiniband/hw/mlx4/mad.c
43207@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
43208
43209 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
43210 {
43211- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
43212+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
43213 cpu_to_be64(0xff00000000000000LL);
43214 }
43215
43216diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
43217index ed327e6..ca1739e0 100644
43218--- a/drivers/infiniband/hw/mlx4/mcg.c
43219+++ b/drivers/infiniband/hw/mlx4/mcg.c
43220@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
43221 {
43222 char name[20];
43223
43224- atomic_set(&ctx->tid, 0);
43225+ atomic_set_unchecked(&ctx->tid, 0);
43226 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
43227 ctx->mcg_wq = create_singlethread_workqueue(name);
43228 if (!ctx->mcg_wq)
43229diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43230index fce39343..9d8fdff 100644
43231--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
43232+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
43233@@ -435,7 +435,7 @@ struct mlx4_ib_demux_ctx {
43234 struct list_head mcg_mgid0_list;
43235 struct workqueue_struct *mcg_wq;
43236 struct mlx4_ib_demux_pv_ctx **tun;
43237- atomic_t tid;
43238+ atomic_unchecked_t tid;
43239 int flushing; /* flushing the work queue */
43240 };
43241
43242diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
43243index 9d3e5c1..6f166df 100644
43244--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
43245+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
43246@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
43247 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
43248 }
43249
43250-int mthca_QUERY_FW(struct mthca_dev *dev)
43251+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
43252 {
43253 struct mthca_mailbox *mailbox;
43254 u32 *outbox;
43255@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43256 CMD_TIME_CLASS_B);
43257 }
43258
43259-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43260+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43261 int num_mtt)
43262 {
43263 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
43264@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
43265 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
43266 }
43267
43268-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43269+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
43270 int eq_num)
43271 {
43272 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
43273@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
43274 CMD_TIME_CLASS_B);
43275 }
43276
43277-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43278+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43279 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43280 void *in_mad, void *response_mad)
43281 {
43282diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43283index ded76c1..0cf0a08 100644
43284--- a/drivers/infiniband/hw/mthca/mthca_main.c
43285+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43286@@ -692,7 +692,7 @@ err_close:
43287 return err;
43288 }
43289
43290-static int mthca_setup_hca(struct mthca_dev *dev)
43291+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43292 {
43293 int err;
43294
43295diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43296index ed9a989..6aa5dc2 100644
43297--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43298+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43299@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43300 * through the bitmaps)
43301 */
43302
43303-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43304+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43305 {
43306 int o;
43307 int m;
43308@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43309 return key;
43310 }
43311
43312-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43313+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43314 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43315 {
43316 struct mthca_mailbox *mailbox;
43317@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43318 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43319 }
43320
43321-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43322+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43323 u64 *buffer_list, int buffer_size_shift,
43324 int list_len, u64 iova, u64 total_size,
43325 u32 access, struct mthca_mr *mr)
43326diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43327index 415f8e1..e34214e 100644
43328--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43329+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43330@@ -764,7 +764,7 @@ unlock:
43331 return 0;
43332 }
43333
43334-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43335+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43336 {
43337 struct mthca_dev *dev = to_mdev(ibcq->device);
43338 struct mthca_cq *cq = to_mcq(ibcq);
43339diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43340index 9f9d5c5..3c19aac 100644
43341--- a/drivers/infiniband/hw/nes/nes.c
43342+++ b/drivers/infiniband/hw/nes/nes.c
43343@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43344 LIST_HEAD(nes_adapter_list);
43345 static LIST_HEAD(nes_dev_list);
43346
43347-atomic_t qps_destroyed;
43348+atomic_unchecked_t qps_destroyed;
43349
43350 static unsigned int ee_flsh_adapter;
43351 static unsigned int sysfs_nonidx_addr;
43352@@ -279,7 +279,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43353 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43354 struct nes_adapter *nesadapter = nesdev->nesadapter;
43355
43356- atomic_inc(&qps_destroyed);
43357+ atomic_inc_unchecked(&qps_destroyed);
43358
43359 /* Free the control structures */
43360
43361diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43362index bd9d132..70d84f4 100644
43363--- a/drivers/infiniband/hw/nes/nes.h
43364+++ b/drivers/infiniband/hw/nes/nes.h
43365@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43366 extern unsigned int wqm_quanta;
43367 extern struct list_head nes_adapter_list;
43368
43369-extern atomic_t cm_connects;
43370-extern atomic_t cm_accepts;
43371-extern atomic_t cm_disconnects;
43372-extern atomic_t cm_closes;
43373-extern atomic_t cm_connecteds;
43374-extern atomic_t cm_connect_reqs;
43375-extern atomic_t cm_rejects;
43376-extern atomic_t mod_qp_timouts;
43377-extern atomic_t qps_created;
43378-extern atomic_t qps_destroyed;
43379-extern atomic_t sw_qps_destroyed;
43380+extern atomic_unchecked_t cm_connects;
43381+extern atomic_unchecked_t cm_accepts;
43382+extern atomic_unchecked_t cm_disconnects;
43383+extern atomic_unchecked_t cm_closes;
43384+extern atomic_unchecked_t cm_connecteds;
43385+extern atomic_unchecked_t cm_connect_reqs;
43386+extern atomic_unchecked_t cm_rejects;
43387+extern atomic_unchecked_t mod_qp_timouts;
43388+extern atomic_unchecked_t qps_created;
43389+extern atomic_unchecked_t qps_destroyed;
43390+extern atomic_unchecked_t sw_qps_destroyed;
43391 extern u32 mh_detected;
43392 extern u32 mh_pauses_sent;
43393 extern u32 cm_packets_sent;
43394@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43395 extern u32 cm_packets_received;
43396 extern u32 cm_packets_dropped;
43397 extern u32 cm_packets_retrans;
43398-extern atomic_t cm_listens_created;
43399-extern atomic_t cm_listens_destroyed;
43400+extern atomic_unchecked_t cm_listens_created;
43401+extern atomic_unchecked_t cm_listens_destroyed;
43402 extern u32 cm_backlog_drops;
43403-extern atomic_t cm_loopbacks;
43404-extern atomic_t cm_nodes_created;
43405-extern atomic_t cm_nodes_destroyed;
43406-extern atomic_t cm_accel_dropped_pkts;
43407-extern atomic_t cm_resets_recvd;
43408-extern atomic_t pau_qps_created;
43409-extern atomic_t pau_qps_destroyed;
43410+extern atomic_unchecked_t cm_loopbacks;
43411+extern atomic_unchecked_t cm_nodes_created;
43412+extern atomic_unchecked_t cm_nodes_destroyed;
43413+extern atomic_unchecked_t cm_accel_dropped_pkts;
43414+extern atomic_unchecked_t cm_resets_recvd;
43415+extern atomic_unchecked_t pau_qps_created;
43416+extern atomic_unchecked_t pau_qps_destroyed;
43417
43418 extern u32 int_mod_timer_init;
43419 extern u32 int_mod_cq_depth_256;
43420diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43421index 72b4341..2600332 100644
43422--- a/drivers/infiniband/hw/nes/nes_cm.c
43423+++ b/drivers/infiniband/hw/nes/nes_cm.c
43424@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43425 u32 cm_packets_retrans;
43426 u32 cm_packets_created;
43427 u32 cm_packets_received;
43428-atomic_t cm_listens_created;
43429-atomic_t cm_listens_destroyed;
43430+atomic_unchecked_t cm_listens_created;
43431+atomic_unchecked_t cm_listens_destroyed;
43432 u32 cm_backlog_drops;
43433-atomic_t cm_loopbacks;
43434-atomic_t cm_nodes_created;
43435-atomic_t cm_nodes_destroyed;
43436-atomic_t cm_accel_dropped_pkts;
43437-atomic_t cm_resets_recvd;
43438+atomic_unchecked_t cm_loopbacks;
43439+atomic_unchecked_t cm_nodes_created;
43440+atomic_unchecked_t cm_nodes_destroyed;
43441+atomic_unchecked_t cm_accel_dropped_pkts;
43442+atomic_unchecked_t cm_resets_recvd;
43443
43444 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43445 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43446@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43447 /* instance of function pointers for client API */
43448 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43449 static struct nes_cm_ops nes_cm_api = {
43450- mini_cm_accelerated,
43451- mini_cm_listen,
43452- mini_cm_del_listen,
43453- mini_cm_connect,
43454- mini_cm_close,
43455- mini_cm_accept,
43456- mini_cm_reject,
43457- mini_cm_recv_pkt,
43458- mini_cm_dealloc_core,
43459- mini_cm_get,
43460- mini_cm_set
43461+ .accelerated = mini_cm_accelerated,
43462+ .listen = mini_cm_listen,
43463+ .stop_listener = mini_cm_del_listen,
43464+ .connect = mini_cm_connect,
43465+ .close = mini_cm_close,
43466+ .accept = mini_cm_accept,
43467+ .reject = mini_cm_reject,
43468+ .recv_pkt = mini_cm_recv_pkt,
43469+ .destroy_cm_core = mini_cm_dealloc_core,
43470+ .get = mini_cm_get,
43471+ .set = mini_cm_set
43472 };
43473
43474 static struct nes_cm_core *g_cm_core;
43475
43476-atomic_t cm_connects;
43477-atomic_t cm_accepts;
43478-atomic_t cm_disconnects;
43479-atomic_t cm_closes;
43480-atomic_t cm_connecteds;
43481-atomic_t cm_connect_reqs;
43482-atomic_t cm_rejects;
43483+atomic_unchecked_t cm_connects;
43484+atomic_unchecked_t cm_accepts;
43485+atomic_unchecked_t cm_disconnects;
43486+atomic_unchecked_t cm_closes;
43487+atomic_unchecked_t cm_connecteds;
43488+atomic_unchecked_t cm_connect_reqs;
43489+atomic_unchecked_t cm_rejects;
43490
43491 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43492 {
43493@@ -1461,7 +1461,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43494 kfree(listener);
43495 listener = NULL;
43496 ret = 0;
43497- atomic_inc(&cm_listens_destroyed);
43498+ atomic_inc_unchecked(&cm_listens_destroyed);
43499 } else {
43500 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43501 }
43502@@ -1667,7 +1667,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43503 cm_node->rem_mac);
43504
43505 add_hte_node(cm_core, cm_node);
43506- atomic_inc(&cm_nodes_created);
43507+ atomic_inc_unchecked(&cm_nodes_created);
43508
43509 return cm_node;
43510 }
43511@@ -1728,7 +1728,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43512 }
43513
43514 atomic_dec(&cm_core->node_cnt);
43515- atomic_inc(&cm_nodes_destroyed);
43516+ atomic_inc_unchecked(&cm_nodes_destroyed);
43517 nesqp = cm_node->nesqp;
43518 if (nesqp) {
43519 nesqp->cm_node = NULL;
43520@@ -1792,7 +1792,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43521
43522 static void drop_packet(struct sk_buff *skb)
43523 {
43524- atomic_inc(&cm_accel_dropped_pkts);
43525+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43526 dev_kfree_skb_any(skb);
43527 }
43528
43529@@ -1855,7 +1855,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43530 {
43531
43532 int reset = 0; /* whether to send reset in case of err.. */
43533- atomic_inc(&cm_resets_recvd);
43534+ atomic_inc_unchecked(&cm_resets_recvd);
43535 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43536 " refcnt=%d\n", cm_node, cm_node->state,
43537 atomic_read(&cm_node->ref_count));
43538@@ -2523,7 +2523,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43539 rem_ref_cm_node(cm_node->cm_core, cm_node);
43540 return NULL;
43541 }
43542- atomic_inc(&cm_loopbacks);
43543+ atomic_inc_unchecked(&cm_loopbacks);
43544 loopbackremotenode->loopbackpartner = cm_node;
43545 loopbackremotenode->tcp_cntxt.rcv_wscale =
43546 NES_CM_DEFAULT_RCV_WND_SCALE;
43547@@ -2804,7 +2804,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43548 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43549 else {
43550 rem_ref_cm_node(cm_core, cm_node);
43551- atomic_inc(&cm_accel_dropped_pkts);
43552+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43553 dev_kfree_skb_any(skb);
43554 }
43555 break;
43556@@ -3112,7 +3112,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43557
43558 if ((cm_id) && (cm_id->event_handler)) {
43559 if (issue_disconn) {
43560- atomic_inc(&cm_disconnects);
43561+ atomic_inc_unchecked(&cm_disconnects);
43562 cm_event.event = IW_CM_EVENT_DISCONNECT;
43563 cm_event.status = disconn_status;
43564 cm_event.local_addr = cm_id->local_addr;
43565@@ -3134,7 +3134,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43566 }
43567
43568 if (issue_close) {
43569- atomic_inc(&cm_closes);
43570+ atomic_inc_unchecked(&cm_closes);
43571 nes_disconnect(nesqp, 1);
43572
43573 cm_id->provider_data = nesqp;
43574@@ -3272,7 +3272,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43575
43576 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43577 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43578- atomic_inc(&cm_accepts);
43579+ atomic_inc_unchecked(&cm_accepts);
43580
43581 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43582 netdev_refcnt_read(nesvnic->netdev));
43583@@ -3470,7 +3470,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43584 struct nes_cm_core *cm_core;
43585 u8 *start_buff;
43586
43587- atomic_inc(&cm_rejects);
43588+ atomic_inc_unchecked(&cm_rejects);
43589 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43590 loopback = cm_node->loopbackpartner;
43591 cm_core = cm_node->cm_core;
43592@@ -3535,7 +3535,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43593 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43594 ntohs(laddr->sin_port));
43595
43596- atomic_inc(&cm_connects);
43597+ atomic_inc_unchecked(&cm_connects);
43598 nesqp->active_conn = 1;
43599
43600 /* cache the cm_id in the qp */
43601@@ -3680,7 +3680,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43602 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43603 return err;
43604 }
43605- atomic_inc(&cm_listens_created);
43606+ atomic_inc_unchecked(&cm_listens_created);
43607 }
43608
43609 cm_id->add_ref(cm_id);
43610@@ -3787,7 +3787,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43611
43612 if (nesqp->destroyed)
43613 return;
43614- atomic_inc(&cm_connecteds);
43615+ atomic_inc_unchecked(&cm_connecteds);
43616 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43617 " local port 0x%04X. jiffies = %lu.\n",
43618 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43619@@ -3972,7 +3972,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43620
43621 cm_id->add_ref(cm_id);
43622 ret = cm_id->event_handler(cm_id, &cm_event);
43623- atomic_inc(&cm_closes);
43624+ atomic_inc_unchecked(&cm_closes);
43625 cm_event.event = IW_CM_EVENT_CLOSE;
43626 cm_event.status = 0;
43627 cm_event.provider_data = cm_id->provider_data;
43628@@ -4012,7 +4012,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43629 return;
43630 cm_id = cm_node->cm_id;
43631
43632- atomic_inc(&cm_connect_reqs);
43633+ atomic_inc_unchecked(&cm_connect_reqs);
43634 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43635 cm_node, cm_id, jiffies);
43636
43637@@ -4061,7 +4061,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43638 return;
43639 cm_id = cm_node->cm_id;
43640
43641- atomic_inc(&cm_connect_reqs);
43642+ atomic_inc_unchecked(&cm_connect_reqs);
43643 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43644 cm_node, cm_id, jiffies);
43645
43646diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43647index 4166452..fc952c3 100644
43648--- a/drivers/infiniband/hw/nes/nes_mgt.c
43649+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43650@@ -40,8 +40,8 @@
43651 #include "nes.h"
43652 #include "nes_mgt.h"
43653
43654-atomic_t pau_qps_created;
43655-atomic_t pau_qps_destroyed;
43656+atomic_unchecked_t pau_qps_created;
43657+atomic_unchecked_t pau_qps_destroyed;
43658
43659 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43660 {
43661@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43662 {
43663 struct sk_buff *skb;
43664 unsigned long flags;
43665- atomic_inc(&pau_qps_destroyed);
43666+ atomic_inc_unchecked(&pau_qps_destroyed);
43667
43668 /* Free packets that have not yet been forwarded */
43669 /* Lock is acquired by skb_dequeue when removing the skb */
43670@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43671 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43672 skb_queue_head_init(&nesqp->pau_list);
43673 spin_lock_init(&nesqp->pau_lock);
43674- atomic_inc(&pau_qps_created);
43675+ atomic_inc_unchecked(&pau_qps_created);
43676 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43677 }
43678
43679diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43680index 70acda9..a96de9d 100644
43681--- a/drivers/infiniband/hw/nes/nes_nic.c
43682+++ b/drivers/infiniband/hw/nes/nes_nic.c
43683@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43684 target_stat_values[++index] = mh_detected;
43685 target_stat_values[++index] = mh_pauses_sent;
43686 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43687- target_stat_values[++index] = atomic_read(&cm_connects);
43688- target_stat_values[++index] = atomic_read(&cm_accepts);
43689- target_stat_values[++index] = atomic_read(&cm_disconnects);
43690- target_stat_values[++index] = atomic_read(&cm_connecteds);
43691- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43692- target_stat_values[++index] = atomic_read(&cm_rejects);
43693- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43694- target_stat_values[++index] = atomic_read(&qps_created);
43695- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43696- target_stat_values[++index] = atomic_read(&qps_destroyed);
43697- target_stat_values[++index] = atomic_read(&cm_closes);
43698+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43699+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43700+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43701+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43702+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43703+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43704+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43705+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43706+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43707+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43708+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43709 target_stat_values[++index] = cm_packets_sent;
43710 target_stat_values[++index] = cm_packets_bounced;
43711 target_stat_values[++index] = cm_packets_created;
43712 target_stat_values[++index] = cm_packets_received;
43713 target_stat_values[++index] = cm_packets_dropped;
43714 target_stat_values[++index] = cm_packets_retrans;
43715- target_stat_values[++index] = atomic_read(&cm_listens_created);
43716- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43717+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43718+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43719 target_stat_values[++index] = cm_backlog_drops;
43720- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43721- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43722- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43723- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43724- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43725+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43726+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43727+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43728+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43729+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43730 target_stat_values[++index] = nesadapter->free_4kpbl;
43731 target_stat_values[++index] = nesadapter->free_256pbl;
43732 target_stat_values[++index] = int_mod_timer_init;
43733 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43734 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43735 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43736- target_stat_values[++index] = atomic_read(&pau_qps_created);
43737- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43738+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43739+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43740 }
43741
43742 /**
43743diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43744index c0d0296..3185f57 100644
43745--- a/drivers/infiniband/hw/nes/nes_verbs.c
43746+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43747@@ -46,9 +46,9 @@
43748
43749 #include <rdma/ib_umem.h>
43750
43751-atomic_t mod_qp_timouts;
43752-atomic_t qps_created;
43753-atomic_t sw_qps_destroyed;
43754+atomic_unchecked_t mod_qp_timouts;
43755+atomic_unchecked_t qps_created;
43756+atomic_unchecked_t sw_qps_destroyed;
43757
43758 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43759
43760@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43761 if (init_attr->create_flags)
43762 return ERR_PTR(-EINVAL);
43763
43764- atomic_inc(&qps_created);
43765+ atomic_inc_unchecked(&qps_created);
43766 switch (init_attr->qp_type) {
43767 case IB_QPT_RC:
43768 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43769@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43770 struct iw_cm_event cm_event;
43771 int ret = 0;
43772
43773- atomic_inc(&sw_qps_destroyed);
43774+ atomic_inc_unchecked(&sw_qps_destroyed);
43775 nesqp->destroyed = 1;
43776
43777 /* Blow away the connection if it exists. */
43778diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43779index 7df16f7..7e1b21e 100644
43780--- a/drivers/infiniband/hw/qib/qib.h
43781+++ b/drivers/infiniband/hw/qib/qib.h
43782@@ -52,6 +52,7 @@
43783 #include <linux/kref.h>
43784 #include <linux/sched.h>
43785 #include <linux/kthread.h>
43786+#include <linux/slab.h>
43787
43788 #include "qib_common.h"
43789 #include "qib_verbs.h"
43790diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43791index cdc7df4..a2fdfdb 100644
43792--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43793+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43794@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43795 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43796 }
43797
43798-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43799+static struct rtnl_link_ops ipoib_link_ops = {
43800 .kind = "ipoib",
43801 .maxtype = IFLA_IPOIB_MAX,
43802 .policy = ipoib_policy,
43803diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43804index e853a21..56fc5a8 100644
43805--- a/drivers/input/gameport/gameport.c
43806+++ b/drivers/input/gameport/gameport.c
43807@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43808 */
43809 static void gameport_init_port(struct gameport *gameport)
43810 {
43811- static atomic_t gameport_no = ATOMIC_INIT(-1);
43812+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
43813
43814 __module_get(THIS_MODULE);
43815
43816 mutex_init(&gameport->drv_mutex);
43817 device_initialize(&gameport->dev);
43818 dev_set_name(&gameport->dev, "gameport%lu",
43819- (unsigned long)atomic_inc_return(&gameport_no));
43820+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
43821 gameport->dev.bus = &gameport_bus;
43822 gameport->dev.release = gameport_release_port;
43823 if (gameport->parent)
43824diff --git a/drivers/input/input.c b/drivers/input/input.c
43825index cc357f1..ee42fbc 100644
43826--- a/drivers/input/input.c
43827+++ b/drivers/input/input.c
43828@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
43829 */
43830 struct input_dev *input_allocate_device(void)
43831 {
43832- static atomic_t input_no = ATOMIC_INIT(-1);
43833+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
43834 struct input_dev *dev;
43835
43836 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43837@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
43838 INIT_LIST_HEAD(&dev->node);
43839
43840 dev_set_name(&dev->dev, "input%lu",
43841- (unsigned long)atomic_inc_return(&input_no));
43842+ (unsigned long)atomic_inc_return_unchecked(&input_no));
43843
43844 __module_get(THIS_MODULE);
43845 }
43846diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43847index 4a95b22..874c182 100644
43848--- a/drivers/input/joystick/sidewinder.c
43849+++ b/drivers/input/joystick/sidewinder.c
43850@@ -30,6 +30,7 @@
43851 #include <linux/kernel.h>
43852 #include <linux/module.h>
43853 #include <linux/slab.h>
43854+#include <linux/sched.h>
43855 #include <linux/input.h>
43856 #include <linux/gameport.h>
43857 #include <linux/jiffies.h>
43858diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43859index 61c7611..e1bfa38 100644
43860--- a/drivers/input/joystick/xpad.c
43861+++ b/drivers/input/joystick/xpad.c
43862@@ -905,7 +905,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43863
43864 static int xpad_led_probe(struct usb_xpad *xpad)
43865 {
43866- static atomic_t led_seq = ATOMIC_INIT(-1);
43867+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
43868 unsigned long led_no;
43869 struct xpad_led *led;
43870 struct led_classdev *led_cdev;
43871@@ -918,7 +918,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43872 if (!led)
43873 return -ENOMEM;
43874
43875- led_no = atomic_inc_return(&led_seq);
43876+ led_no = atomic_inc_return_unchecked(&led_seq);
43877
43878 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
43879 led->xpad = xpad;
43880diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43881index ac1fa5f..5f7502c 100644
43882--- a/drivers/input/misc/ims-pcu.c
43883+++ b/drivers/input/misc/ims-pcu.c
43884@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43885
43886 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43887 {
43888- static atomic_t device_no = ATOMIC_INIT(-1);
43889+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
43890
43891 const struct ims_pcu_device_info *info;
43892 int error;
43893@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43894 }
43895
43896 /* Device appears to be operable, complete initialization */
43897- pcu->device_no = atomic_inc_return(&device_no);
43898+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
43899
43900 /*
43901 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43902diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43903index ad5a5a1..5eac214 100644
43904--- a/drivers/input/mouse/psmouse.h
43905+++ b/drivers/input/mouse/psmouse.h
43906@@ -125,7 +125,7 @@ struct psmouse_attribute {
43907 ssize_t (*set)(struct psmouse *psmouse, void *data,
43908 const char *buf, size_t count);
43909 bool protect;
43910-};
43911+} __do_const;
43912 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43913
43914 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43915diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43916index b604564..3f14ae4 100644
43917--- a/drivers/input/mousedev.c
43918+++ b/drivers/input/mousedev.c
43919@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43920
43921 spin_unlock_irq(&client->packet_lock);
43922
43923- if (copy_to_user(buffer, data, count))
43924+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
43925 return -EFAULT;
43926
43927 return count;
43928diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43929index a05a517..323a2fd 100644
43930--- a/drivers/input/serio/serio.c
43931+++ b/drivers/input/serio/serio.c
43932@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43933 */
43934 static void serio_init_port(struct serio *serio)
43935 {
43936- static atomic_t serio_no = ATOMIC_INIT(-1);
43937+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
43938
43939 __module_get(THIS_MODULE);
43940
43941@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43942 mutex_init(&serio->drv_mutex);
43943 device_initialize(&serio->dev);
43944 dev_set_name(&serio->dev, "serio%lu",
43945- (unsigned long)atomic_inc_return(&serio_no));
43946+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
43947 serio->dev.bus = &serio_bus;
43948 serio->dev.release = serio_release_port;
43949 serio->dev.groups = serio_device_attr_groups;
43950diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43951index 71ef5d6..93380a9 100644
43952--- a/drivers/input/serio/serio_raw.c
43953+++ b/drivers/input/serio/serio_raw.c
43954@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43955
43956 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43957 {
43958- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
43959+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
43960 struct serio_raw *serio_raw;
43961 int err;
43962
43963@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43964 }
43965
43966 snprintf(serio_raw->name, sizeof(serio_raw->name),
43967- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
43968+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
43969 kref_init(&serio_raw->kref);
43970 INIT_LIST_HEAD(&serio_raw->client_list);
43971 init_waitqueue_head(&serio_raw->wait);
43972diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
43973index 92e2243..8fd9092 100644
43974--- a/drivers/input/touchscreen/htcpen.c
43975+++ b/drivers/input/touchscreen/htcpen.c
43976@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
43977 }
43978 };
43979
43980-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
43981+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
43982 {
43983 .ident = "Shift",
43984 .matches = {
43985diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43986index ca9f4ed..b860ff1 100644
43987--- a/drivers/iommu/amd_iommu.c
43988+++ b/drivers/iommu/amd_iommu.c
43989@@ -829,11 +829,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43990
43991 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43992 {
43993+ phys_addr_t physaddr;
43994 WARN_ON(address & 0x7ULL);
43995
43996 memset(cmd, 0, sizeof(*cmd));
43997- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43998- cmd->data[1] = upper_32_bits(__pa(address));
43999+
44000+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
44001+ if (object_starts_on_stack((void *)address)) {
44002+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
44003+ physaddr = __pa((u64)adjbuf);
44004+ } else
44005+#endif
44006+ physaddr = __pa(address);
44007+
44008+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
44009+ cmd->data[1] = upper_32_bits(physaddr);
44010 cmd->data[2] = 1;
44011 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
44012 }
44013diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
44014index 65075ef..53823f9 100644
44015--- a/drivers/iommu/arm-smmu.c
44016+++ b/drivers/iommu/arm-smmu.c
44017@@ -331,7 +331,7 @@ enum arm_smmu_domain_stage {
44018
44019 struct arm_smmu_domain {
44020 struct arm_smmu_device *smmu;
44021- struct io_pgtable_ops *pgtbl_ops;
44022+ struct io_pgtable *pgtbl;
44023 spinlock_t pgtbl_lock;
44024 struct arm_smmu_cfg cfg;
44025 enum arm_smmu_domain_stage stage;
44026@@ -817,7 +817,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44027 {
44028 int irq, start, ret = 0;
44029 unsigned long ias, oas;
44030- struct io_pgtable_ops *pgtbl_ops;
44031+ struct io_pgtable *pgtbl;
44032 struct io_pgtable_cfg pgtbl_cfg;
44033 enum io_pgtable_fmt fmt;
44034 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44035@@ -902,14 +902,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44036 };
44037
44038 smmu_domain->smmu = smmu;
44039- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
44040- if (!pgtbl_ops) {
44041+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
44042+ if (!pgtbl) {
44043 ret = -ENOMEM;
44044 goto out_clear_smmu;
44045 }
44046
44047 /* Update our support page sizes to reflect the page table format */
44048- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44049+ pax_open_kernel();
44050+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
44051+ pax_close_kernel();
44052
44053 /* Initialise the context bank with our page table cfg */
44054 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
44055@@ -930,7 +932,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
44056 mutex_unlock(&smmu_domain->init_mutex);
44057
44058 /* Publish page table ops for map/unmap */
44059- smmu_domain->pgtbl_ops = pgtbl_ops;
44060+ smmu_domain->pgtbl = pgtbl;
44061 return 0;
44062
44063 out_clear_smmu:
44064@@ -963,8 +965,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
44065 free_irq(irq, domain);
44066 }
44067
44068- if (smmu_domain->pgtbl_ops)
44069- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
44070+ free_io_pgtable(smmu_domain->pgtbl);
44071
44072 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
44073 }
44074@@ -1190,13 +1191,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
44075 int ret;
44076 unsigned long flags;
44077 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44078- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44079+ struct io_pgtable *iop = smmu_domain->pgtbl;
44080
44081- if (!ops)
44082+ if (!iop)
44083 return -ENODEV;
44084
44085 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44086- ret = ops->map(ops, iova, paddr, size, prot);
44087+ ret = iop->ops->map(iop, iova, paddr, size, prot);
44088 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44089 return ret;
44090 }
44091@@ -1207,13 +1208,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
44092 size_t ret;
44093 unsigned long flags;
44094 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44095- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44096+ struct io_pgtable *iop = smmu_domain->pgtbl;
44097
44098- if (!ops)
44099+ if (!iop)
44100 return 0;
44101
44102 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44103- ret = ops->unmap(ops, iova, size);
44104+ ret = iop->ops->unmap(iop, iova, size);
44105 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44106 return ret;
44107 }
44108@@ -1224,7 +1225,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44109 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44110 struct arm_smmu_device *smmu = smmu_domain->smmu;
44111 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
44112- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44113+ struct io_pgtable *iop = smmu_domain->pgtbl;
44114 struct device *dev = smmu->dev;
44115 void __iomem *cb_base;
44116 u32 tmp;
44117@@ -1247,7 +1248,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
44118 dev_err(dev,
44119 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
44120 &iova);
44121- return ops->iova_to_phys(ops, iova);
44122+ return iop->ops->iova_to_phys(iop, iova);
44123 }
44124
44125 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
44126@@ -1268,9 +1269,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44127 phys_addr_t ret;
44128 unsigned long flags;
44129 struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
44130- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
44131+ struct io_pgtable *iop = smmu_domain->pgtbl;
44132
44133- if (!ops)
44134+ if (!iop)
44135 return 0;
44136
44137 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
44138@@ -1278,7 +1279,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
44139 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
44140 ret = arm_smmu_iova_to_phys_hard(domain, iova);
44141 } else {
44142- ret = ops->iova_to_phys(ops, iova);
44143+ ret = iop->ops->iova_to_phys(iop, iova);
44144 }
44145
44146 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
44147@@ -1668,7 +1669,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
44148 size |= SZ_64K | SZ_512M;
44149 }
44150
44151- arm_smmu_ops.pgsize_bitmap &= size;
44152+ pax_open_kernel();
44153+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
44154+ pax_close_kernel();
44155 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
44156
44157 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
44158diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
44159index 4e46021..f0a24fef 100644
44160--- a/drivers/iommu/io-pgtable-arm.c
44161+++ b/drivers/iommu/io-pgtable-arm.c
44162@@ -36,12 +36,6 @@
44163 #define io_pgtable_to_data(x) \
44164 container_of((x), struct arm_lpae_io_pgtable, iop)
44165
44166-#define io_pgtable_ops_to_pgtable(x) \
44167- container_of((x), struct io_pgtable, ops)
44168-
44169-#define io_pgtable_ops_to_data(x) \
44170- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
44171-
44172 /*
44173 * For consistency with the architecture, we always consider
44174 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
44175@@ -304,10 +298,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
44176 return pte;
44177 }
44178
44179-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
44180+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
44181 phys_addr_t paddr, size_t size, int iommu_prot)
44182 {
44183- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44184+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44185 arm_lpae_iopte *ptep = data->pgd;
44186 int lvl = ARM_LPAE_START_LVL(data);
44187 arm_lpae_iopte prot;
44188@@ -447,12 +441,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
44189 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
44190 }
44191
44192-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44193+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
44194 size_t size)
44195 {
44196 size_t unmapped;
44197- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44198- struct io_pgtable *iop = &data->iop;
44199+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44200 arm_lpae_iopte *ptep = data->pgd;
44201 int lvl = ARM_LPAE_START_LVL(data);
44202
44203@@ -463,10 +456,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
44204 return unmapped;
44205 }
44206
44207-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
44208+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
44209 unsigned long iova)
44210 {
44211- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44212+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44213 arm_lpae_iopte pte, *ptep = data->pgd;
44214 int lvl = ARM_LPAE_START_LVL(data);
44215
44216@@ -533,6 +526,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
44217 }
44218 }
44219
44220+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
44221+ .map = arm_lpae_map,
44222+ .unmap = arm_lpae_unmap,
44223+ .iova_to_phys = arm_lpae_iova_to_phys,
44224+};
44225+
44226 static struct arm_lpae_io_pgtable *
44227 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44228 {
44229@@ -564,11 +563,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
44230 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
44231 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
44232
44233- data->iop.ops = (struct io_pgtable_ops) {
44234- .map = arm_lpae_map,
44235- .unmap = arm_lpae_unmap,
44236- .iova_to_phys = arm_lpae_iova_to_phys,
44237- };
44238+ data->iop.ops = &arm_lpae_io_pgtable_ops;
44239
44240 return data;
44241 }
44242@@ -830,9 +825,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
44243 .flush_pgtable = dummy_flush_pgtable,
44244 };
44245
44246-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44247+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
44248 {
44249- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
44250+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
44251 struct io_pgtable_cfg *cfg = &data->iop.cfg;
44252
44253 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
44254@@ -842,9 +837,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
44255 data->bits_per_level, data->pgd);
44256 }
44257
44258-#define __FAIL(ops, i) ({ \
44259+#define __FAIL(iop, i) ({ \
44260 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
44261- arm_lpae_dump_ops(ops); \
44262+ arm_lpae_dump_ops(iop); \
44263 selftest_running = false; \
44264 -EFAULT; \
44265 })
44266@@ -859,30 +854,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44267 int i, j;
44268 unsigned long iova;
44269 size_t size;
44270- struct io_pgtable_ops *ops;
44271+ struct io_pgtable *iop;
44272+ const struct io_pgtable_ops *ops;
44273
44274 selftest_running = true;
44275
44276 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
44277 cfg_cookie = cfg;
44278- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44279- if (!ops) {
44280+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44281+ if (!iop) {
44282 pr_err("selftest: failed to allocate io pgtable ops\n");
44283 return -ENOMEM;
44284 }
44285+ ops = iop->ops;
44286
44287 /*
44288 * Initial sanity checks.
44289 * Empty page tables shouldn't provide any translations.
44290 */
44291- if (ops->iova_to_phys(ops, 42))
44292- return __FAIL(ops, i);
44293+ if (ops->iova_to_phys(iop, 42))
44294+ return __FAIL(iop, i);
44295
44296- if (ops->iova_to_phys(ops, SZ_1G + 42))
44297- return __FAIL(ops, i);
44298+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44299+ return __FAIL(iop, i);
44300
44301- if (ops->iova_to_phys(ops, SZ_2G + 42))
44302- return __FAIL(ops, i);
44303+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44304+ return __FAIL(iop, i);
44305
44306 /*
44307 * Distinct mappings of different granule sizes.
44308@@ -892,19 +889,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44309 while (j != BITS_PER_LONG) {
44310 size = 1UL << j;
44311
44312- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44313+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44314 IOMMU_WRITE |
44315 IOMMU_NOEXEC |
44316 IOMMU_CACHE))
44317- return __FAIL(ops, i);
44318+ return __FAIL(iop, i);
44319
44320 /* Overlapping mappings */
44321- if (!ops->map(ops, iova, iova + size, size,
44322+ if (!ops->map(iop, iova, iova + size, size,
44323 IOMMU_READ | IOMMU_NOEXEC))
44324- return __FAIL(ops, i);
44325+ return __FAIL(iop, i);
44326
44327- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44328- return __FAIL(ops, i);
44329+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44330+ return __FAIL(iop, i);
44331
44332 iova += SZ_1G;
44333 j++;
44334@@ -913,15 +910,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44335
44336 /* Partial unmap */
44337 size = 1UL << __ffs(cfg->pgsize_bitmap);
44338- if (ops->unmap(ops, SZ_1G + size, size) != size)
44339- return __FAIL(ops, i);
44340+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44341+ return __FAIL(iop, i);
44342
44343 /* Remap of partial unmap */
44344- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44345- return __FAIL(ops, i);
44346+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44347+ return __FAIL(iop, i);
44348
44349- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44350- return __FAIL(ops, i);
44351+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44352+ return __FAIL(iop, i);
44353
44354 /* Full unmap */
44355 iova = 0;
44356@@ -929,25 +926,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44357 while (j != BITS_PER_LONG) {
44358 size = 1UL << j;
44359
44360- if (ops->unmap(ops, iova, size) != size)
44361- return __FAIL(ops, i);
44362+ if (ops->unmap(iop, iova, size) != size)
44363+ return __FAIL(iop, i);
44364
44365- if (ops->iova_to_phys(ops, iova + 42))
44366- return __FAIL(ops, i);
44367+ if (ops->iova_to_phys(iop, iova + 42))
44368+ return __FAIL(iop, i);
44369
44370 /* Remap full block */
44371- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44372- return __FAIL(ops, i);
44373+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44374+ return __FAIL(iop, i);
44375
44376- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44377- return __FAIL(ops, i);
44378+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44379+ return __FAIL(iop, i);
44380
44381 iova += SZ_1G;
44382 j++;
44383 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44384 }
44385
44386- free_io_pgtable_ops(ops);
44387+ free_io_pgtable(iop);
44388 }
44389
44390 selftest_running = false;
44391diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44392index 6436fe2..088c965 100644
44393--- a/drivers/iommu/io-pgtable.c
44394+++ b/drivers/iommu/io-pgtable.c
44395@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44396 #endif
44397 };
44398
44399-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44400+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44401 struct io_pgtable_cfg *cfg,
44402 void *cookie)
44403 {
44404@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44405 iop->cookie = cookie;
44406 iop->cfg = *cfg;
44407
44408- return &iop->ops;
44409+ return iop;
44410 }
44411
44412 /*
44413 * It is the IOMMU driver's responsibility to ensure that the page table
44414 * is no longer accessible to the walker by this point.
44415 */
44416-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44417+void free_io_pgtable(struct io_pgtable *iop)
44418 {
44419- struct io_pgtable *iop;
44420-
44421- if (!ops)
44422+ if (!iop)
44423 return;
44424
44425- iop = container_of(ops, struct io_pgtable, ops);
44426 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44427 io_pgtable_init_table[iop->fmt]->free(iop);
44428 }
44429diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44430index 10e32f6..0b276c8 100644
44431--- a/drivers/iommu/io-pgtable.h
44432+++ b/drivers/iommu/io-pgtable.h
44433@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44434 * These functions map directly onto the iommu_ops member functions with
44435 * the same names.
44436 */
44437+struct io_pgtable;
44438 struct io_pgtable_ops {
44439- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44440+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44441 phys_addr_t paddr, size_t size, int prot);
44442- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44443+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44444 size_t size);
44445- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44446+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44447 unsigned long iova);
44448 };
44449
44450 /**
44451- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44452+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44453 *
44454 * @fmt: The page table format.
44455 * @cfg: The page table configuration. This will be modified to represent
44456@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44457 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44458 * the callback routines in cfg->tlb.
44459 */
44460-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44461- struct io_pgtable_cfg *cfg,
44462- void *cookie);
44463+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44464+ struct io_pgtable_cfg *cfg,
44465+ void *cookie);
44466
44467 /**
44468 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44469@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44470 *
44471 * @ops: The ops returned from alloc_io_pgtable_ops.
44472 */
44473-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44474+void free_io_pgtable(struct io_pgtable *iop);
44475
44476
44477 /*
44478@@ -125,7 +126,7 @@ struct io_pgtable {
44479 enum io_pgtable_fmt fmt;
44480 void *cookie;
44481 struct io_pgtable_cfg cfg;
44482- struct io_pgtable_ops ops;
44483+ const struct io_pgtable_ops *ops;
44484 };
44485
44486 /**
44487diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44488index d4f527e..8e4a4fd 100644
44489--- a/drivers/iommu/iommu.c
44490+++ b/drivers/iommu/iommu.c
44491@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44492 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44493 {
44494 int err;
44495- struct notifier_block *nb;
44496+ notifier_block_no_const *nb;
44497 struct iommu_callback_data cb = {
44498 .ops = ops,
44499 };
44500diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44501index 1a67c53..23181d8 100644
44502--- a/drivers/iommu/ipmmu-vmsa.c
44503+++ b/drivers/iommu/ipmmu-vmsa.c
44504@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44505 struct iommu_domain io_domain;
44506
44507 struct io_pgtable_cfg cfg;
44508- struct io_pgtable_ops *iop;
44509+ struct io_pgtable *iop;
44510
44511 unsigned int context_id;
44512 spinlock_t lock; /* Protects mappings */
44513@@ -328,8 +328,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44514 domain->cfg.oas = 40;
44515 domain->cfg.tlb = &ipmmu_gather_ops;
44516
44517- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44518- domain);
44519+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44520 if (!domain->iop)
44521 return -EINVAL;
44522
44523@@ -487,7 +486,7 @@ static void ipmmu_domain_free(struct iommu_domain *io_domain)
44524 * been detached.
44525 */
44526 ipmmu_domain_destroy_context(domain);
44527- free_io_pgtable_ops(domain->iop);
44528+ free_io_pgtable(domain->iop);
44529 kfree(domain);
44530 }
44531
44532@@ -556,7 +555,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44533 if (!domain)
44534 return -ENODEV;
44535
44536- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44537+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44538 }
44539
44540 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44541@@ -564,7 +563,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44542 {
44543 struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
44544
44545- return domain->iop->unmap(domain->iop, iova, size);
44546+ return domain->iop->ops->unmap(domain->iop, iova, size);
44547 }
44548
44549 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44550@@ -574,7 +573,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44551
44552 /* TODO: Is locking needed ? */
44553
44554- return domain->iop->iova_to_phys(domain->iop, iova);
44555+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44556 }
44557
44558 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44559diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44560index 390079e..1da9d6c 100644
44561--- a/drivers/iommu/irq_remapping.c
44562+++ b/drivers/iommu/irq_remapping.c
44563@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44564 void panic_if_irq_remap(const char *msg)
44565 {
44566 if (irq_remapping_enabled)
44567- panic(msg);
44568+ panic("%s", msg);
44569 }
44570
44571 static void ir_ack_apic_edge(struct irq_data *data)
44572@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44573
44574 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44575 {
44576- chip->irq_print_chip = ir_print_prefix;
44577- chip->irq_ack = ir_ack_apic_edge;
44578- chip->irq_eoi = ir_ack_apic_level;
44579- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44580+ pax_open_kernel();
44581+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44582+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44583+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44584+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44585+ pax_close_kernel();
44586 }
44587
44588 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44589diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44590index 01999d7..4f14bb7 100644
44591--- a/drivers/irqchip/irq-gic.c
44592+++ b/drivers/irqchip/irq-gic.c
44593@@ -313,7 +313,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44594 chained_irq_exit(chip, desc);
44595 }
44596
44597-static struct irq_chip gic_chip = {
44598+static irq_chip_no_const gic_chip __read_only = {
44599 .name = "GIC",
44600 .irq_mask = gic_mask_irq,
44601 .irq_unmask = gic_unmask_irq,
44602diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44603index 9a0767b..5e5f86f 100644
44604--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44605+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44606@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44607 struct intc_irqpin_iomem *i;
44608 struct resource *io[INTC_IRQPIN_REG_NR];
44609 struct resource *irq;
44610- struct irq_chip *irq_chip;
44611+ irq_chip_no_const *irq_chip;
44612 void (*enable_fn)(struct irq_data *d);
44613 void (*disable_fn)(struct irq_data *d);
44614 const char *name = dev_name(dev);
44615diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44616index cdf80b7..e5c3ade 100644
44617--- a/drivers/irqchip/irq-renesas-irqc.c
44618+++ b/drivers/irqchip/irq-renesas-irqc.c
44619@@ -179,7 +179,7 @@ static int irqc_probe(struct platform_device *pdev)
44620 struct irqc_priv *p;
44621 struct resource *io;
44622 struct resource *irq;
44623- struct irq_chip *irq_chip;
44624+ irq_chip_no_const *irq_chip;
44625 const char *name = dev_name(&pdev->dev);
44626 int ret;
44627 int k;
44628diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44629index 6a2df32..dc962f1 100644
44630--- a/drivers/isdn/capi/capi.c
44631+++ b/drivers/isdn/capi/capi.c
44632@@ -81,8 +81,8 @@ struct capiminor {
44633
44634 struct capi20_appl *ap;
44635 u32 ncci;
44636- atomic_t datahandle;
44637- atomic_t msgid;
44638+ atomic_unchecked_t datahandle;
44639+ atomic_unchecked_t msgid;
44640
44641 struct tty_port port;
44642 int ttyinstop;
44643@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44644 capimsg_setu16(s, 2, mp->ap->applid);
44645 capimsg_setu8 (s, 4, CAPI_DATA_B3);
44646 capimsg_setu8 (s, 5, CAPI_RESP);
44647- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
44648+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
44649 capimsg_setu32(s, 8, mp->ncci);
44650 capimsg_setu16(s, 12, datahandle);
44651 }
44652@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
44653 mp->outbytes -= len;
44654 spin_unlock_bh(&mp->outlock);
44655
44656- datahandle = atomic_inc_return(&mp->datahandle);
44657+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
44658 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
44659 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44660 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44661 capimsg_setu16(skb->data, 2, mp->ap->applid);
44662 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
44663 capimsg_setu8 (skb->data, 5, CAPI_REQ);
44664- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
44665+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
44666 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
44667 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
44668 capimsg_setu16(skb->data, 16, len); /* Data length */
44669diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
44670index aecec6d..11e13c5 100644
44671--- a/drivers/isdn/gigaset/bas-gigaset.c
44672+++ b/drivers/isdn/gigaset/bas-gigaset.c
44673@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
44674
44675
44676 static const struct gigaset_ops gigops = {
44677- gigaset_write_cmd,
44678- gigaset_write_room,
44679- gigaset_chars_in_buffer,
44680- gigaset_brkchars,
44681- gigaset_init_bchannel,
44682- gigaset_close_bchannel,
44683- gigaset_initbcshw,
44684- gigaset_freebcshw,
44685- gigaset_reinitbcshw,
44686- gigaset_initcshw,
44687- gigaset_freecshw,
44688- gigaset_set_modem_ctrl,
44689- gigaset_baud_rate,
44690- gigaset_set_line_ctrl,
44691- gigaset_isoc_send_skb,
44692- gigaset_isoc_input,
44693+ .write_cmd = gigaset_write_cmd,
44694+ .write_room = gigaset_write_room,
44695+ .chars_in_buffer = gigaset_chars_in_buffer,
44696+ .brkchars = gigaset_brkchars,
44697+ .init_bchannel = gigaset_init_bchannel,
44698+ .close_bchannel = gigaset_close_bchannel,
44699+ .initbcshw = gigaset_initbcshw,
44700+ .freebcshw = gigaset_freebcshw,
44701+ .reinitbcshw = gigaset_reinitbcshw,
44702+ .initcshw = gigaset_initcshw,
44703+ .freecshw = gigaset_freecshw,
44704+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44705+ .baud_rate = gigaset_baud_rate,
44706+ .set_line_ctrl = gigaset_set_line_ctrl,
44707+ .send_skb = gigaset_isoc_send_skb,
44708+ .handle_input = gigaset_isoc_input,
44709 };
44710
44711 /* bas_gigaset_init
44712diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
44713index 600c79b..3752bab 100644
44714--- a/drivers/isdn/gigaset/interface.c
44715+++ b/drivers/isdn/gigaset/interface.c
44716@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
44717 }
44718 tty->driver_data = cs;
44719
44720- ++cs->port.count;
44721+ atomic_inc(&cs->port.count);
44722
44723- if (cs->port.count == 1) {
44724+ if (atomic_read(&cs->port.count) == 1) {
44725 tty_port_tty_set(&cs->port, tty);
44726 cs->port.low_latency = 1;
44727 }
44728@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
44729
44730 if (!cs->connected)
44731 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
44732- else if (!cs->port.count)
44733+ else if (!atomic_read(&cs->port.count))
44734 dev_warn(cs->dev, "%s: device not opened\n", __func__);
44735- else if (!--cs->port.count)
44736+ else if (!atomic_dec_return(&cs->port.count))
44737 tty_port_tty_set(&cs->port, NULL);
44738
44739 mutex_unlock(&cs->mutex);
44740diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
44741index 8c91fd5..14f13ce 100644
44742--- a/drivers/isdn/gigaset/ser-gigaset.c
44743+++ b/drivers/isdn/gigaset/ser-gigaset.c
44744@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
44745 }
44746
44747 static const struct gigaset_ops ops = {
44748- gigaset_write_cmd,
44749- gigaset_write_room,
44750- gigaset_chars_in_buffer,
44751- gigaset_brkchars,
44752- gigaset_init_bchannel,
44753- gigaset_close_bchannel,
44754- gigaset_initbcshw,
44755- gigaset_freebcshw,
44756- gigaset_reinitbcshw,
44757- gigaset_initcshw,
44758- gigaset_freecshw,
44759- gigaset_set_modem_ctrl,
44760- gigaset_baud_rate,
44761- gigaset_set_line_ctrl,
44762- gigaset_m10x_send_skb, /* asyncdata.c */
44763- gigaset_m10x_input, /* asyncdata.c */
44764+ .write_cmd = gigaset_write_cmd,
44765+ .write_room = gigaset_write_room,
44766+ .chars_in_buffer = gigaset_chars_in_buffer,
44767+ .brkchars = gigaset_brkchars,
44768+ .init_bchannel = gigaset_init_bchannel,
44769+ .close_bchannel = gigaset_close_bchannel,
44770+ .initbcshw = gigaset_initbcshw,
44771+ .freebcshw = gigaset_freebcshw,
44772+ .reinitbcshw = gigaset_reinitbcshw,
44773+ .initcshw = gigaset_initcshw,
44774+ .freecshw = gigaset_freecshw,
44775+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44776+ .baud_rate = gigaset_baud_rate,
44777+ .set_line_ctrl = gigaset_set_line_ctrl,
44778+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
44779+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
44780 };
44781
44782
44783diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
44784index 5f306e2..5342f88 100644
44785--- a/drivers/isdn/gigaset/usb-gigaset.c
44786+++ b/drivers/isdn/gigaset/usb-gigaset.c
44787@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
44788 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
44789 memcpy(cs->hw.usb->bchars, buf, 6);
44790 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
44791- 0, 0, &buf, 6, 2000);
44792+ 0, 0, buf, 6, 2000);
44793 }
44794
44795 static void gigaset_freebcshw(struct bc_state *bcs)
44796@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
44797 }
44798
44799 static const struct gigaset_ops ops = {
44800- gigaset_write_cmd,
44801- gigaset_write_room,
44802- gigaset_chars_in_buffer,
44803- gigaset_brkchars,
44804- gigaset_init_bchannel,
44805- gigaset_close_bchannel,
44806- gigaset_initbcshw,
44807- gigaset_freebcshw,
44808- gigaset_reinitbcshw,
44809- gigaset_initcshw,
44810- gigaset_freecshw,
44811- gigaset_set_modem_ctrl,
44812- gigaset_baud_rate,
44813- gigaset_set_line_ctrl,
44814- gigaset_m10x_send_skb,
44815- gigaset_m10x_input,
44816+ .write_cmd = gigaset_write_cmd,
44817+ .write_room = gigaset_write_room,
44818+ .chars_in_buffer = gigaset_chars_in_buffer,
44819+ .brkchars = gigaset_brkchars,
44820+ .init_bchannel = gigaset_init_bchannel,
44821+ .close_bchannel = gigaset_close_bchannel,
44822+ .initbcshw = gigaset_initbcshw,
44823+ .freebcshw = gigaset_freebcshw,
44824+ .reinitbcshw = gigaset_reinitbcshw,
44825+ .initcshw = gigaset_initcshw,
44826+ .freecshw = gigaset_freecshw,
44827+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44828+ .baud_rate = gigaset_baud_rate,
44829+ .set_line_ctrl = gigaset_set_line_ctrl,
44830+ .send_skb = gigaset_m10x_send_skb,
44831+ .handle_input = gigaset_m10x_input,
44832 };
44833
44834 /*
44835diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
44836index 4d9b195..455075c 100644
44837--- a/drivers/isdn/hardware/avm/b1.c
44838+++ b/drivers/isdn/hardware/avm/b1.c
44839@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
44840 }
44841 if (left) {
44842 if (t4file->user) {
44843- if (copy_from_user(buf, dp, left))
44844+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44845 return -EFAULT;
44846 } else {
44847 memcpy(buf, dp, left);
44848@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
44849 }
44850 if (left) {
44851 if (config->user) {
44852- if (copy_from_user(buf, dp, left))
44853+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44854 return -EFAULT;
44855 } else {
44856 memcpy(buf, dp, left);
44857diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
44858index 9b856e1..fa03c92 100644
44859--- a/drivers/isdn/i4l/isdn_common.c
44860+++ b/drivers/isdn/i4l/isdn_common.c
44861@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
44862 } else
44863 return -EINVAL;
44864 case IIOCDBGVAR:
44865+ if (!capable(CAP_SYS_RAWIO))
44866+ return -EPERM;
44867 if (arg) {
44868 if (copy_to_user(argp, &dev, sizeof(ulong)))
44869 return -EFAULT;
44870diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
44871index 91d5730..336523e 100644
44872--- a/drivers/isdn/i4l/isdn_concap.c
44873+++ b/drivers/isdn/i4l/isdn_concap.c
44874@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
44875 }
44876
44877 struct concap_device_ops isdn_concap_reliable_dl_dops = {
44878- &isdn_concap_dl_data_req,
44879- &isdn_concap_dl_connect_req,
44880- &isdn_concap_dl_disconn_req
44881+ .data_req = &isdn_concap_dl_data_req,
44882+ .connect_req = &isdn_concap_dl_connect_req,
44883+ .disconn_req = &isdn_concap_dl_disconn_req
44884 };
44885
44886 /* The following should better go into a dedicated source file such that
44887diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
44888index bc91261..2ef7e36 100644
44889--- a/drivers/isdn/i4l/isdn_tty.c
44890+++ b/drivers/isdn/i4l/isdn_tty.c
44891@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
44892
44893 #ifdef ISDN_DEBUG_MODEM_OPEN
44894 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44895- port->count);
44896+ atomic_read(&port->count));
44897 #endif
44898- port->count++;
44899+ atomic_inc(&port->count);
44900 port->tty = tty;
44901 /*
44902 * Start up serial port
44903@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44904 #endif
44905 return;
44906 }
44907- if ((tty->count == 1) && (port->count != 1)) {
44908+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44909 /*
44910 * Uh, oh. tty->count is 1, which means that the tty
44911 * structure will be freed. Info->count should always
44912@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44913 * serial port won't be shutdown.
44914 */
44915 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44916- "info->count is %d\n", port->count);
44917- port->count = 1;
44918+ "info->count is %d\n", atomic_read(&port->count));
44919+ atomic_set(&port->count, 1);
44920 }
44921- if (--port->count < 0) {
44922+ if (atomic_dec_return(&port->count) < 0) {
44923 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44924- info->line, port->count);
44925- port->count = 0;
44926+ info->line, atomic_read(&port->count));
44927+ atomic_set(&port->count, 0);
44928 }
44929- if (port->count) {
44930+ if (atomic_read(&port->count)) {
44931 #ifdef ISDN_DEBUG_MODEM_OPEN
44932 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44933 #endif
44934@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44935 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44936 return;
44937 isdn_tty_shutdown(info);
44938- port->count = 0;
44939+ atomic_set(&port->count, 0);
44940 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44941 port->tty = NULL;
44942 wake_up_interruptible(&port->open_wait);
44943@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44944 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44945 modem_info *info = &dev->mdm.info[i];
44946
44947- if (info->port.count == 0)
44948+ if (atomic_read(&info->port.count) == 0)
44949 continue;
44950 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44951 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44952diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44953index e2d4e58..40cd045 100644
44954--- a/drivers/isdn/i4l/isdn_x25iface.c
44955+++ b/drivers/isdn/i4l/isdn_x25iface.c
44956@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44957
44958
44959 static struct concap_proto_ops ix25_pops = {
44960- &isdn_x25iface_proto_new,
44961- &isdn_x25iface_proto_del,
44962- &isdn_x25iface_proto_restart,
44963- &isdn_x25iface_proto_close,
44964- &isdn_x25iface_xmit,
44965- &isdn_x25iface_receive,
44966- &isdn_x25iface_connect_ind,
44967- &isdn_x25iface_disconn_ind
44968+ .proto_new = &isdn_x25iface_proto_new,
44969+ .proto_del = &isdn_x25iface_proto_del,
44970+ .restart = &isdn_x25iface_proto_restart,
44971+ .close = &isdn_x25iface_proto_close,
44972+ .encap_and_xmit = &isdn_x25iface_xmit,
44973+ .data_ind = &isdn_x25iface_receive,
44974+ .connect_ind = &isdn_x25iface_connect_ind,
44975+ .disconn_ind = &isdn_x25iface_disconn_ind
44976 };
44977
44978 /* error message helper function */
44979diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44980index 358a574..b4987ea 100644
44981--- a/drivers/isdn/icn/icn.c
44982+++ b/drivers/isdn/icn/icn.c
44983@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44984 if (count > len)
44985 count = len;
44986 if (user) {
44987- if (copy_from_user(msg, buf, count))
44988+ if (count > sizeof msg || copy_from_user(msg, buf, count))
44989 return -EFAULT;
44990 } else
44991 memcpy(msg, buf, count);
44992diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44993index 52c4382..09e0c7c 100644
44994--- a/drivers/isdn/mISDN/dsp_cmx.c
44995+++ b/drivers/isdn/mISDN/dsp_cmx.c
44996@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44997 static u16 dsp_count; /* last sample count */
44998 static int dsp_count_valid; /* if we have last sample count */
44999
45000-void
45001+void __intentional_overflow(-1)
45002 dsp_cmx_send(void *arg)
45003 {
45004 struct dsp_conf *conf;
45005diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
45006index 312ffd3..9263d05 100644
45007--- a/drivers/lguest/core.c
45008+++ b/drivers/lguest/core.c
45009@@ -96,9 +96,17 @@ static __init int map_switcher(void)
45010 * The end address needs +1 because __get_vm_area allocates an
45011 * extra guard page, so we need space for that.
45012 */
45013+
45014+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
45015+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45016+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
45017+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45018+#else
45019 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
45020 VM_ALLOC, switcher_addr, switcher_addr
45021 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
45022+#endif
45023+
45024 if (!switcher_vma) {
45025 err = -ENOMEM;
45026 printk("lguest: could not map switcher pages high\n");
45027@@ -121,7 +129,7 @@ static __init int map_switcher(void)
45028 * Now the Switcher is mapped at the right address, we can't fail!
45029 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
45030 */
45031- memcpy(switcher_vma->addr, start_switcher_text,
45032+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
45033 end_switcher_text - start_switcher_text);
45034
45035 printk(KERN_INFO "lguest: mapped switcher at %p\n",
45036diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
45037index e3abebc9..6a35328 100644
45038--- a/drivers/lguest/page_tables.c
45039+++ b/drivers/lguest/page_tables.c
45040@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
45041 /*:*/
45042
45043 #ifdef CONFIG_X86_PAE
45044-static void release_pmd(pmd_t *spmd)
45045+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
45046 {
45047 /* If the entry's not present, there's nothing to release. */
45048 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
45049diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
45050index 30f2aef..391c748 100644
45051--- a/drivers/lguest/x86/core.c
45052+++ b/drivers/lguest/x86/core.c
45053@@ -60,7 +60,7 @@ static struct {
45054 /* Offset from where switcher.S was compiled to where we've copied it */
45055 static unsigned long switcher_offset(void)
45056 {
45057- return switcher_addr - (unsigned long)start_switcher_text;
45058+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
45059 }
45060
45061 /* This cpu's struct lguest_pages (after the Switcher text page) */
45062@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
45063 * These copies are pretty cheap, so we do them unconditionally: */
45064 /* Save the current Host top-level page directory.
45065 */
45066+
45067+#ifdef CONFIG_PAX_PER_CPU_PGD
45068+ pages->state.host_cr3 = read_cr3();
45069+#else
45070 pages->state.host_cr3 = __pa(current->mm->pgd);
45071+#endif
45072+
45073 /*
45074 * Set up the Guest's page tables to see this CPU's pages (and no
45075 * other CPU's pages).
45076@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
45077 * compiled-in switcher code and the high-mapped copy we just made.
45078 */
45079 for (i = 0; i < IDT_ENTRIES; i++)
45080- default_idt_entries[i] += switcher_offset();
45081+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
45082
45083 /*
45084 * Set up the Switcher's per-cpu areas.
45085@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
45086 * it will be undisturbed when we switch. To change %cs and jump we
45087 * need this structure to feed to Intel's "lcall" instruction.
45088 */
45089- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
45090+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
45091 lguest_entry.segment = LGUEST_CS;
45092
45093 /*
45094diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
45095index 40634b0..4f5855e 100644
45096--- a/drivers/lguest/x86/switcher_32.S
45097+++ b/drivers/lguest/x86/switcher_32.S
45098@@ -87,6 +87,7 @@
45099 #include <asm/page.h>
45100 #include <asm/segment.h>
45101 #include <asm/lguest.h>
45102+#include <asm/processor-flags.h>
45103
45104 // We mark the start of the code to copy
45105 // It's placed in .text tho it's never run here
45106@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
45107 // Changes type when we load it: damn Intel!
45108 // For after we switch over our page tables
45109 // That entry will be read-only: we'd crash.
45110+
45111+#ifdef CONFIG_PAX_KERNEXEC
45112+ mov %cr0, %edx
45113+ xor $X86_CR0_WP, %edx
45114+ mov %edx, %cr0
45115+#endif
45116+
45117 movl $(GDT_ENTRY_TSS*8), %edx
45118 ltr %dx
45119
45120@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
45121 // Let's clear it again for our return.
45122 // The GDT descriptor of the Host
45123 // Points to the table after two "size" bytes
45124- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
45125+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
45126 // Clear "used" from type field (byte 5, bit 2)
45127- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
45128+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
45129+
45130+#ifdef CONFIG_PAX_KERNEXEC
45131+ mov %cr0, %eax
45132+ xor $X86_CR0_WP, %eax
45133+ mov %eax, %cr0
45134+#endif
45135
45136 // Once our page table's switched, the Guest is live!
45137 // The Host fades as we run this final step.
45138@@ -295,13 +309,12 @@ deliver_to_host:
45139 // I consulted gcc, and it gave
45140 // These instructions, which I gladly credit:
45141 leal (%edx,%ebx,8), %eax
45142- movzwl (%eax),%edx
45143- movl 4(%eax), %eax
45144- xorw %ax, %ax
45145- orl %eax, %edx
45146+ movl 4(%eax), %edx
45147+ movw (%eax), %dx
45148 // Now the address of the handler's in %edx
45149 // We call it now: its "iret" drops us home.
45150- jmp *%edx
45151+ ljmp $__KERNEL_CS, $1f
45152+1: jmp *%edx
45153
45154 // Every interrupt can come to us here
45155 // But we must truly tell each apart.
45156diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
45157index a08e3ee..df8ade2 100644
45158--- a/drivers/md/bcache/closure.h
45159+++ b/drivers/md/bcache/closure.h
45160@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
45161 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
45162 struct workqueue_struct *wq)
45163 {
45164- BUG_ON(object_is_on_stack(cl));
45165+ BUG_ON(object_starts_on_stack(cl));
45166 closure_set_ip(cl);
45167 cl->fn = fn;
45168 cl->wq = wq;
45169diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
45170index c90118e..226d9e5 100644
45171--- a/drivers/md/bitmap.c
45172+++ b/drivers/md/bitmap.c
45173@@ -1936,7 +1936,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
45174 chunk_kb ? "KB" : "B");
45175 if (bitmap->storage.file) {
45176 seq_printf(seq, ", file: ");
45177- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
45178+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
45179 }
45180
45181 seq_printf(seq, "\n");
45182diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
45183index 720ceeb..030f1d4 100644
45184--- a/drivers/md/dm-ioctl.c
45185+++ b/drivers/md/dm-ioctl.c
45186@@ -1773,7 +1773,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
45187 cmd == DM_LIST_VERSIONS_CMD)
45188 return 0;
45189
45190- if ((cmd == DM_DEV_CREATE_CMD)) {
45191+ if (cmd == DM_DEV_CREATE_CMD) {
45192 if (!*param->name) {
45193 DMWARN("name not supplied when creating device");
45194 return -EINVAL;
45195diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
45196index 089d627..ef7352e 100644
45197--- a/drivers/md/dm-raid1.c
45198+++ b/drivers/md/dm-raid1.c
45199@@ -40,7 +40,7 @@ enum dm_raid1_error {
45200
45201 struct mirror {
45202 struct mirror_set *ms;
45203- atomic_t error_count;
45204+ atomic_unchecked_t error_count;
45205 unsigned long error_type;
45206 struct dm_dev *dev;
45207 sector_t offset;
45208@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
45209 struct mirror *m;
45210
45211 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
45212- if (!atomic_read(&m->error_count))
45213+ if (!atomic_read_unchecked(&m->error_count))
45214 return m;
45215
45216 return NULL;
45217@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
45218 * simple way to tell if a device has encountered
45219 * errors.
45220 */
45221- atomic_inc(&m->error_count);
45222+ atomic_inc_unchecked(&m->error_count);
45223
45224 if (test_and_set_bit(error_type, &m->error_type))
45225 return;
45226@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
45227 struct mirror *m = get_default_mirror(ms);
45228
45229 do {
45230- if (likely(!atomic_read(&m->error_count)))
45231+ if (likely(!atomic_read_unchecked(&m->error_count)))
45232 return m;
45233
45234 if (m-- == ms->mirror)
45235@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
45236 {
45237 struct mirror *default_mirror = get_default_mirror(m->ms);
45238
45239- return !atomic_read(&default_mirror->error_count);
45240+ return !atomic_read_unchecked(&default_mirror->error_count);
45241 }
45242
45243 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45244@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45245 */
45246 if (likely(region_in_sync(ms, region, 1)))
45247 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45248- else if (m && atomic_read(&m->error_count))
45249+ else if (m && atomic_read_unchecked(&m->error_count))
45250 m = NULL;
45251
45252 if (likely(m))
45253@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45254 }
45255
45256 ms->mirror[mirror].ms = ms;
45257- atomic_set(&(ms->mirror[mirror].error_count), 0);
45258+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45259 ms->mirror[mirror].error_type = 0;
45260 ms->mirror[mirror].offset = offset;
45261
45262@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45263 */
45264 static char device_status_char(struct mirror *m)
45265 {
45266- if (!atomic_read(&(m->error_count)))
45267+ if (!atomic_read_unchecked(&(m->error_count)))
45268 return 'A';
45269
45270 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45271diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45272index 419bdd4..e5eb76d 100644
45273--- a/drivers/md/dm-stats.c
45274+++ b/drivers/md/dm-stats.c
45275@@ -382,7 +382,7 @@ do_sync_free:
45276 synchronize_rcu_expedited();
45277 dm_stat_free(&s->rcu_head);
45278 } else {
45279- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45280+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45281 call_rcu(&s->rcu_head, dm_stat_free);
45282 }
45283 return 0;
45284@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45285 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45286 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45287 ));
45288- ACCESS_ONCE(last->last_sector) = end_sector;
45289- ACCESS_ONCE(last->last_rw) = bi_rw;
45290+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45291+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45292 }
45293
45294 rcu_read_lock();
45295diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45296index f8b37d4..5c5cafd 100644
45297--- a/drivers/md/dm-stripe.c
45298+++ b/drivers/md/dm-stripe.c
45299@@ -21,7 +21,7 @@ struct stripe {
45300 struct dm_dev *dev;
45301 sector_t physical_start;
45302
45303- atomic_t error_count;
45304+ atomic_unchecked_t error_count;
45305 };
45306
45307 struct stripe_c {
45308@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45309 kfree(sc);
45310 return r;
45311 }
45312- atomic_set(&(sc->stripe[i].error_count), 0);
45313+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45314 }
45315
45316 ti->private = sc;
45317@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45318 DMEMIT("%d ", sc->stripes);
45319 for (i = 0; i < sc->stripes; i++) {
45320 DMEMIT("%s ", sc->stripe[i].dev->name);
45321- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45322+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45323 'D' : 'A';
45324 }
45325 buffer[i] = '\0';
45326@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45327 */
45328 for (i = 0; i < sc->stripes; i++)
45329 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45330- atomic_inc(&(sc->stripe[i].error_count));
45331- if (atomic_read(&(sc->stripe[i].error_count)) <
45332+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45333+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45334 DM_IO_ERROR_THRESHOLD)
45335 schedule_work(&sc->trigger_event);
45336 }
45337diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45338index 16ba55a..31af906 100644
45339--- a/drivers/md/dm-table.c
45340+++ b/drivers/md/dm-table.c
45341@@ -305,7 +305,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45342 if (!dev_size)
45343 return 0;
45344
45345- if ((start >= dev_size) || (start + len > dev_size)) {
45346+ if ((start >= dev_size) || (len > dev_size - start)) {
45347 DMWARN("%s: %s too small for target: "
45348 "start=%llu, len=%llu, dev_size=%llu",
45349 dm_device_name(ti->table->md), bdevname(bdev, b),
45350diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45351index 79f6941..b33b4e0 100644
45352--- a/drivers/md/dm-thin-metadata.c
45353+++ b/drivers/md/dm-thin-metadata.c
45354@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45355 {
45356 pmd->info.tm = pmd->tm;
45357 pmd->info.levels = 2;
45358- pmd->info.value_type.context = pmd->data_sm;
45359+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45360 pmd->info.value_type.size = sizeof(__le64);
45361 pmd->info.value_type.inc = data_block_inc;
45362 pmd->info.value_type.dec = data_block_dec;
45363@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45364
45365 pmd->bl_info.tm = pmd->tm;
45366 pmd->bl_info.levels = 1;
45367- pmd->bl_info.value_type.context = pmd->data_sm;
45368+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45369 pmd->bl_info.value_type.size = sizeof(__le64);
45370 pmd->bl_info.value_type.inc = data_block_inc;
45371 pmd->bl_info.value_type.dec = data_block_dec;
45372diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45373index 697f34f..8301900 100644
45374--- a/drivers/md/dm.c
45375+++ b/drivers/md/dm.c
45376@@ -191,9 +191,9 @@ struct mapped_device {
45377 /*
45378 * Event handling.
45379 */
45380- atomic_t event_nr;
45381+ atomic_unchecked_t event_nr;
45382 wait_queue_head_t eventq;
45383- atomic_t uevent_seq;
45384+ atomic_unchecked_t uevent_seq;
45385 struct list_head uevent_list;
45386 spinlock_t uevent_lock; /* Protect access to uevent_list */
45387
45388@@ -2287,8 +2287,8 @@ static struct mapped_device *alloc_dev(int minor)
45389 spin_lock_init(&md->deferred_lock);
45390 atomic_set(&md->holders, 1);
45391 atomic_set(&md->open_count, 0);
45392- atomic_set(&md->event_nr, 0);
45393- atomic_set(&md->uevent_seq, 0);
45394+ atomic_set_unchecked(&md->event_nr, 0);
45395+ atomic_set_unchecked(&md->uevent_seq, 0);
45396 INIT_LIST_HEAD(&md->uevent_list);
45397 INIT_LIST_HEAD(&md->table_devices);
45398 spin_lock_init(&md->uevent_lock);
45399@@ -2455,7 +2455,7 @@ static void event_callback(void *context)
45400
45401 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45402
45403- atomic_inc(&md->event_nr);
45404+ atomic_inc_unchecked(&md->event_nr);
45405 wake_up(&md->eventq);
45406 }
45407
45408@@ -3454,18 +3454,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45409
45410 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45411 {
45412- return atomic_add_return(1, &md->uevent_seq);
45413+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45414 }
45415
45416 uint32_t dm_get_event_nr(struct mapped_device *md)
45417 {
45418- return atomic_read(&md->event_nr);
45419+ return atomic_read_unchecked(&md->event_nr);
45420 }
45421
45422 int dm_wait_event(struct mapped_device *md, int event_nr)
45423 {
45424 return wait_event_interruptible(md->eventq,
45425- (event_nr != atomic_read(&md->event_nr)));
45426+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45427 }
45428
45429 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45430diff --git a/drivers/md/md.c b/drivers/md/md.c
45431index e462151..8ac9655 100644
45432--- a/drivers/md/md.c
45433+++ b/drivers/md/md.c
45434@@ -197,10 +197,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45435 * start build, activate spare
45436 */
45437 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45438-static atomic_t md_event_count;
45439+static atomic_unchecked_t md_event_count;
45440 void md_new_event(struct mddev *mddev)
45441 {
45442- atomic_inc(&md_event_count);
45443+ atomic_inc_unchecked(&md_event_count);
45444 wake_up(&md_event_waiters);
45445 }
45446 EXPORT_SYMBOL_GPL(md_new_event);
45447@@ -210,7 +210,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45448 */
45449 static void md_new_event_inintr(struct mddev *mddev)
45450 {
45451- atomic_inc(&md_event_count);
45452+ atomic_inc_unchecked(&md_event_count);
45453 wake_up(&md_event_waiters);
45454 }
45455
45456@@ -1449,7 +1449,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45457 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45458 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45459 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45460- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45461+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45462
45463 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45464 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45465@@ -1700,7 +1700,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45466 else
45467 sb->resync_offset = cpu_to_le64(0);
45468
45469- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45470+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45471
45472 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45473 sb->size = cpu_to_le64(mddev->dev_sectors);
45474@@ -2624,7 +2624,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45475 static ssize_t
45476 errors_show(struct md_rdev *rdev, char *page)
45477 {
45478- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45479+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45480 }
45481
45482 static ssize_t
45483@@ -2633,7 +2633,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45484 char *e;
45485 unsigned long n = simple_strtoul(buf, &e, 10);
45486 if (*buf && (*e == 0 || *e == '\n')) {
45487- atomic_set(&rdev->corrected_errors, n);
45488+ atomic_set_unchecked(&rdev->corrected_errors, n);
45489 return len;
45490 }
45491 return -EINVAL;
45492@@ -3069,8 +3069,8 @@ int md_rdev_init(struct md_rdev *rdev)
45493 rdev->sb_loaded = 0;
45494 rdev->bb_page = NULL;
45495 atomic_set(&rdev->nr_pending, 0);
45496- atomic_set(&rdev->read_errors, 0);
45497- atomic_set(&rdev->corrected_errors, 0);
45498+ atomic_set_unchecked(&rdev->read_errors, 0);
45499+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45500
45501 INIT_LIST_HEAD(&rdev->same_set);
45502 init_waitqueue_head(&rdev->blocked_wait);
45503@@ -5746,16 +5746,16 @@ static int get_bitmap_file(struct mddev *mddev, void __user * arg)
45504
45505 err = 0;
45506 spin_lock(&mddev->lock);
45507- /* bitmap disabled, zero the first byte and copy out */
45508- if (!mddev->bitmap_info.file)
45509- file->pathname[0] = '\0';
45510- else if ((ptr = d_path(&mddev->bitmap_info.file->f_path,
45511- file->pathname, sizeof(file->pathname))),
45512- IS_ERR(ptr))
45513- err = PTR_ERR(ptr);
45514- else
45515- memmove(file->pathname, ptr,
45516- sizeof(file->pathname)-(ptr-file->pathname));
45517+ /* bitmap enabled */
45518+ if (mddev->bitmap_info.file) {
45519+ ptr = d_path(&mddev->bitmap_info.file->f_path,
45520+ file->pathname, sizeof(file->pathname));
45521+ if (IS_ERR(ptr))
45522+ err = PTR_ERR(ptr);
45523+ else
45524+ memmove(file->pathname, ptr,
45525+ sizeof(file->pathname)-(ptr-file->pathname));
45526+ }
45527 spin_unlock(&mddev->lock);
45528
45529 if (err == 0 &&
45530@@ -7237,7 +7237,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45531
45532 spin_unlock(&pers_lock);
45533 seq_printf(seq, "\n");
45534- seq->poll_event = atomic_read(&md_event_count);
45535+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45536 return 0;
45537 }
45538 if (v == (void*)2) {
45539@@ -7340,7 +7340,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45540 return error;
45541
45542 seq = file->private_data;
45543- seq->poll_event = atomic_read(&md_event_count);
45544+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45545 return error;
45546 }
45547
45548@@ -7357,7 +7357,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45549 /* always allow read */
45550 mask = POLLIN | POLLRDNORM;
45551
45552- if (seq->poll_event != atomic_read(&md_event_count))
45553+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45554 mask |= POLLERR | POLLPRI;
45555 return mask;
45556 }
45557@@ -7453,7 +7453,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45558 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45559 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45560 (int)part_stat_read(&disk->part0, sectors[1]) -
45561- atomic_read(&disk->sync_io);
45562+ atomic_read_unchecked(&disk->sync_io);
45563 /* sync IO will cause sync_io to increase before the disk_stats
45564 * as sync_io is counted when a request starts, and
45565 * disk_stats is counted when it completes.
45566diff --git a/drivers/md/md.h b/drivers/md/md.h
45567index 4046a6c..e2f2997 100644
45568--- a/drivers/md/md.h
45569+++ b/drivers/md/md.h
45570@@ -95,13 +95,13 @@ struct md_rdev {
45571 * only maintained for arrays that
45572 * support hot removal
45573 */
45574- atomic_t read_errors; /* number of consecutive read errors that
45575+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45576 * we have tried to ignore.
45577 */
45578 struct timespec last_read_error; /* monotonic time since our
45579 * last read error
45580 */
45581- atomic_t corrected_errors; /* number of corrected read errors,
45582+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45583 * for reporting to userspace and storing
45584 * in superblock.
45585 */
45586@@ -486,7 +486,7 @@ extern void mddev_unlock(struct mddev *mddev);
45587
45588 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45589 {
45590- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45591+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45592 }
45593
45594 struct md_personality
45595diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45596index 5309129..7fb096e 100644
45597--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45598+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45599@@ -691,7 +691,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45600 * Flick into a mode where all blocks get allocated in the new area.
45601 */
45602 smm->begin = old_len;
45603- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45604+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45605
45606 /*
45607 * Extend.
45608@@ -728,7 +728,7 @@ out:
45609 /*
45610 * Switch back to normal behaviour.
45611 */
45612- memcpy(sm, &ops, sizeof(*sm));
45613+ memcpy((void *)sm, &ops, sizeof(*sm));
45614 return r;
45615 }
45616
45617diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45618index 3e6d115..ffecdeb 100644
45619--- a/drivers/md/persistent-data/dm-space-map.h
45620+++ b/drivers/md/persistent-data/dm-space-map.h
45621@@ -71,6 +71,7 @@ struct dm_space_map {
45622 dm_sm_threshold_fn fn,
45623 void *context);
45624 };
45625+typedef struct dm_space_map __no_const dm_space_map_no_const;
45626
45627 /*----------------------------------------------------------------*/
45628
45629diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45630index 5ce3cd5c..f147017 100644
45631--- a/drivers/md/raid1.c
45632+++ b/drivers/md/raid1.c
45633@@ -1936,7 +1936,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45634 if (r1_sync_page_io(rdev, sect, s,
45635 bio->bi_io_vec[idx].bv_page,
45636 READ) != 0)
45637- atomic_add(s, &rdev->corrected_errors);
45638+ atomic_add_unchecked(s, &rdev->corrected_errors);
45639 }
45640 sectors -= s;
45641 sect += s;
45642@@ -2169,7 +2169,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45643 !test_bit(Faulty, &rdev->flags)) {
45644 if (r1_sync_page_io(rdev, sect, s,
45645 conf->tmppage, READ)) {
45646- atomic_add(s, &rdev->corrected_errors);
45647+ atomic_add_unchecked(s, &rdev->corrected_errors);
45648 printk(KERN_INFO
45649 "md/raid1:%s: read error corrected "
45650 "(%d sectors at %llu on %s)\n",
45651diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45652index f55c3f3..4cca8c8 100644
45653--- a/drivers/md/raid10.c
45654+++ b/drivers/md/raid10.c
45655@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45656 /* The write handler will notice the lack of
45657 * R10BIO_Uptodate and record any errors etc
45658 */
45659- atomic_add(r10_bio->sectors,
45660+ atomic_add_unchecked(r10_bio->sectors,
45661 &conf->mirrors[d].rdev->corrected_errors);
45662
45663 /* for reconstruct, we always reschedule after a read.
45664@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45665 {
45666 struct timespec cur_time_mon;
45667 unsigned long hours_since_last;
45668- unsigned int read_errors = atomic_read(&rdev->read_errors);
45669+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45670
45671 ktime_get_ts(&cur_time_mon);
45672
45673@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45674 * overflowing the shift of read_errors by hours_since_last.
45675 */
45676 if (hours_since_last >= 8 * sizeof(read_errors))
45677- atomic_set(&rdev->read_errors, 0);
45678+ atomic_set_unchecked(&rdev->read_errors, 0);
45679 else
45680- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
45681+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
45682 }
45683
45684 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
45685@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45686 return;
45687
45688 check_decay_read_errors(mddev, rdev);
45689- atomic_inc(&rdev->read_errors);
45690- if (atomic_read(&rdev->read_errors) > max_read_errors) {
45691+ atomic_inc_unchecked(&rdev->read_errors);
45692+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
45693 char b[BDEVNAME_SIZE];
45694 bdevname(rdev->bdev, b);
45695
45696@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45697 "md/raid10:%s: %s: Raid device exceeded "
45698 "read_error threshold [cur %d:max %d]\n",
45699 mdname(mddev), b,
45700- atomic_read(&rdev->read_errors), max_read_errors);
45701+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
45702 printk(KERN_NOTICE
45703 "md/raid10:%s: %s: Failing raid device\n",
45704 mdname(mddev), b);
45705@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45706 sect +
45707 choose_data_offset(r10_bio, rdev)),
45708 bdevname(rdev->bdev, b));
45709- atomic_add(s, &rdev->corrected_errors);
45710+ atomic_add_unchecked(s, &rdev->corrected_errors);
45711 }
45712
45713 rdev_dec_pending(rdev, mddev);
45714diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
45715index b6793d2..92be2bc 100644
45716--- a/drivers/md/raid5.c
45717+++ b/drivers/md/raid5.c
45718@@ -1108,23 +1108,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
45719 struct bio_vec bvl;
45720 struct bvec_iter iter;
45721 struct page *bio_page;
45722- int page_offset;
45723+ s64 page_offset;
45724 struct async_submit_ctl submit;
45725 enum async_tx_flags flags = 0;
45726
45727 if (bio->bi_iter.bi_sector >= sector)
45728- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
45729+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
45730 else
45731- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
45732+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
45733
45734 if (frombio)
45735 flags |= ASYNC_TX_FENCE;
45736 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
45737
45738 bio_for_each_segment(bvl, bio, iter) {
45739- int len = bvl.bv_len;
45740- int clen;
45741- int b_offset = 0;
45742+ s64 len = bvl.bv_len;
45743+ s64 clen;
45744+ s64 b_offset = 0;
45745
45746 if (page_offset < 0) {
45747 b_offset = -page_offset;
45748@@ -2017,6 +2017,10 @@ static int grow_one_stripe(struct r5conf *conf, gfp_t gfp)
45749 return 1;
45750 }
45751
45752+#ifdef CONFIG_GRKERNSEC_HIDESYM
45753+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
45754+#endif
45755+
45756 static int grow_stripes(struct r5conf *conf, int num)
45757 {
45758 struct kmem_cache *sc;
45759@@ -2027,7 +2031,11 @@ static int grow_stripes(struct r5conf *conf, int num)
45760 "raid%d-%s", conf->level, mdname(conf->mddev));
45761 else
45762 sprintf(conf->cache_name[0],
45763+#ifdef CONFIG_GRKERNSEC_HIDESYM
45764+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
45765+#else
45766 "raid%d-%p", conf->level, conf->mddev);
45767+#endif
45768 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
45769
45770 conf->active_name = 0;
45771@@ -2315,21 +2323,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
45772 mdname(conf->mddev), STRIPE_SECTORS,
45773 (unsigned long long)s,
45774 bdevname(rdev->bdev, b));
45775- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
45776+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
45777 clear_bit(R5_ReadError, &sh->dev[i].flags);
45778 clear_bit(R5_ReWrite, &sh->dev[i].flags);
45779 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
45780 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
45781
45782- if (atomic_read(&rdev->read_errors))
45783- atomic_set(&rdev->read_errors, 0);
45784+ if (atomic_read_unchecked(&rdev->read_errors))
45785+ atomic_set_unchecked(&rdev->read_errors, 0);
45786 } else {
45787 const char *bdn = bdevname(rdev->bdev, b);
45788 int retry = 0;
45789 int set_bad = 0;
45790
45791 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
45792- atomic_inc(&rdev->read_errors);
45793+ atomic_inc_unchecked(&rdev->read_errors);
45794 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
45795 printk_ratelimited(
45796 KERN_WARNING
45797@@ -2357,7 +2365,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
45798 mdname(conf->mddev),
45799 (unsigned long long)s,
45800 bdn);
45801- } else if (atomic_read(&rdev->read_errors)
45802+ } else if (atomic_read_unchecked(&rdev->read_errors)
45803 > conf->max_nr_stripes)
45804 printk(KERN_WARNING
45805 "md/raid:%s: Too many read errors, failing device %s.\n",
45806diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
45807index 13bb57f..0ca21b2 100644
45808--- a/drivers/media/dvb-core/dvbdev.c
45809+++ b/drivers/media/dvb-core/dvbdev.c
45810@@ -272,7 +272,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
45811 const struct dvb_device *template, void *priv, int type)
45812 {
45813 struct dvb_device *dvbdev;
45814- struct file_operations *dvbdevfops;
45815+ file_operations_no_const *dvbdevfops;
45816 struct device *clsdev;
45817 int minor;
45818 int id;
45819diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
45820index 6ad22b6..6e90e2a 100644
45821--- a/drivers/media/dvb-frontends/af9033.h
45822+++ b/drivers/media/dvb-frontends/af9033.h
45823@@ -96,6 +96,6 @@ struct af9033_ops {
45824 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
45825 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
45826 int onoff);
45827-};
45828+} __no_const;
45829
45830 #endif /* AF9033_H */
45831diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
45832index 6ae9899..07d8543 100644
45833--- a/drivers/media/dvb-frontends/dib3000.h
45834+++ b/drivers/media/dvb-frontends/dib3000.h
45835@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
45836 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
45837 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
45838 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
45839-};
45840+} __no_const;
45841
45842 #if IS_REACHABLE(CONFIG_DVB_DIB3000MB)
45843 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
45844diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
45845index baa2789..c8de7fe 100644
45846--- a/drivers/media/dvb-frontends/dib7000p.h
45847+++ b/drivers/media/dvb-frontends/dib7000p.h
45848@@ -64,7 +64,7 @@ struct dib7000p_ops {
45849 int (*get_adc_power)(struct dvb_frontend *fe);
45850 int (*slave_reset)(struct dvb_frontend *fe);
45851 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
45852-};
45853+} __no_const;
45854
45855 #if IS_REACHABLE(CONFIG_DVB_DIB7000P)
45856 void *dib7000p_attach(struct dib7000p_ops *ops);
45857diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
45858index 780c37b..50e2620 100644
45859--- a/drivers/media/dvb-frontends/dib8000.h
45860+++ b/drivers/media/dvb-frontends/dib8000.h
45861@@ -61,7 +61,7 @@ struct dib8000_ops {
45862 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
45863 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
45864 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
45865-};
45866+} __no_const;
45867
45868 #if IS_REACHABLE(CONFIG_DVB_DIB8000)
45869 void *dib8000_attach(struct dib8000_ops *ops);
45870diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
45871index c9decd8..7849cec 100644
45872--- a/drivers/media/pci/cx88/cx88-video.c
45873+++ b/drivers/media/pci/cx88/cx88-video.c
45874@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
45875
45876 /* ------------------------------------------------------------------ */
45877
45878-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45879-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45880-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45881+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45882+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45883+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45884
45885 module_param_array(video_nr, int, NULL, 0444);
45886 module_param_array(vbi_nr, int, NULL, 0444);
45887diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
45888index c2e60b4..5eeccc0 100644
45889--- a/drivers/media/pci/ivtv/ivtv-driver.c
45890+++ b/drivers/media/pci/ivtv/ivtv-driver.c
45891@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
45892 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
45893
45894 /* ivtv instance counter */
45895-static atomic_t ivtv_instance = ATOMIC_INIT(0);
45896+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
45897
45898 /* Parameter declarations */
45899 static int cardtype[IVTV_MAX_CARDS];
45900diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
45901index 570d119..ed25830 100644
45902--- a/drivers/media/pci/solo6x10/solo6x10-core.c
45903+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
45904@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
45905
45906 static int solo_sysfs_init(struct solo_dev *solo_dev)
45907 {
45908- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
45909+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
45910 struct device *dev = &solo_dev->dev;
45911 const char *driver;
45912 int i;
45913diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
45914index 7ddc767..1c24361 100644
45915--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
45916+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
45917@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
45918
45919 int solo_g723_init(struct solo_dev *solo_dev)
45920 {
45921- static struct snd_device_ops ops = { NULL };
45922+ static struct snd_device_ops ops = { };
45923 struct snd_card *card;
45924 struct snd_kcontrol_new kctl;
45925 char name[32];
45926diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45927index 8c84846..27b4f83 100644
45928--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45929+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45930@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45931
45932 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45933 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45934- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45935+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45936 if (p2m_id < 0)
45937 p2m_id = -p2m_id;
45938 }
45939diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45940index 1ca54b0..7d7cb9a 100644
45941--- a/drivers/media/pci/solo6x10/solo6x10.h
45942+++ b/drivers/media/pci/solo6x10/solo6x10.h
45943@@ -218,7 +218,7 @@ struct solo_dev {
45944
45945 /* P2M DMA Engine */
45946 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45947- atomic_t p2m_count;
45948+ atomic_unchecked_t p2m_count;
45949 int p2m_jiffies;
45950 unsigned int p2m_timeouts;
45951
45952diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45953index c135165..dc69499 100644
45954--- a/drivers/media/pci/tw68/tw68-core.c
45955+++ b/drivers/media/pci/tw68/tw68-core.c
45956@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45957 module_param_array(card, int, NULL, 0444);
45958 MODULE_PARM_DESC(card, "card type");
45959
45960-static atomic_t tw68_instance = ATOMIC_INIT(0);
45961+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45962
45963 /* ------------------------------------------------------------------ */
45964
45965diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45966index 17b189a..b78aa6b 100644
45967--- a/drivers/media/platform/omap/omap_vout.c
45968+++ b/drivers/media/platform/omap/omap_vout.c
45969@@ -63,7 +63,6 @@ enum omap_vout_channels {
45970 OMAP_VIDEO2,
45971 };
45972
45973-static struct videobuf_queue_ops video_vbq_ops;
45974 /* Variables configurable through module params*/
45975 static u32 video1_numbuffers = 3;
45976 static u32 video2_numbuffers = 3;
45977@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45978 {
45979 struct videobuf_queue *q;
45980 struct omap_vout_device *vout = NULL;
45981+ static struct videobuf_queue_ops video_vbq_ops = {
45982+ .buf_setup = omap_vout_buffer_setup,
45983+ .buf_prepare = omap_vout_buffer_prepare,
45984+ .buf_release = omap_vout_buffer_release,
45985+ .buf_queue = omap_vout_buffer_queue,
45986+ };
45987
45988 vout = video_drvdata(file);
45989 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45990@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45991 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45992
45993 q = &vout->vbq;
45994- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45995- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45996- video_vbq_ops.buf_release = omap_vout_buffer_release;
45997- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45998 spin_lock_init(&vout->vbq_lock);
45999
46000 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
46001diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
46002index fb2acc5..a2fcbdc4 100644
46003--- a/drivers/media/platform/s5p-tv/mixer.h
46004+++ b/drivers/media/platform/s5p-tv/mixer.h
46005@@ -156,7 +156,7 @@ struct mxr_layer {
46006 /** layer index (unique identifier) */
46007 int idx;
46008 /** callbacks for layer methods */
46009- struct mxr_layer_ops ops;
46010+ struct mxr_layer_ops *ops;
46011 /** format array */
46012 const struct mxr_format **fmt_array;
46013 /** size of format array */
46014diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46015index 74344c7..a39e70e 100644
46016--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46017+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
46018@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
46019 {
46020 struct mxr_layer *layer;
46021 int ret;
46022- struct mxr_layer_ops ops = {
46023+ static struct mxr_layer_ops ops = {
46024 .release = mxr_graph_layer_release,
46025 .buffer_set = mxr_graph_buffer_set,
46026 .stream_set = mxr_graph_stream_set,
46027diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
46028index b713403..53cb5ad 100644
46029--- a/drivers/media/platform/s5p-tv/mixer_reg.c
46030+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
46031@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
46032 layer->update_buf = next;
46033 }
46034
46035- layer->ops.buffer_set(layer, layer->update_buf);
46036+ layer->ops->buffer_set(layer, layer->update_buf);
46037
46038 if (done && done != layer->shadow_buf)
46039 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
46040diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
46041index 751f3b6..d829203 100644
46042--- a/drivers/media/platform/s5p-tv/mixer_video.c
46043+++ b/drivers/media/platform/s5p-tv/mixer_video.c
46044@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
46045 layer->geo.src.height = layer->geo.src.full_height;
46046
46047 mxr_geometry_dump(mdev, &layer->geo);
46048- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46049+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46050 mxr_geometry_dump(mdev, &layer->geo);
46051 }
46052
46053@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
46054 layer->geo.dst.full_width = mbus_fmt.width;
46055 layer->geo.dst.full_height = mbus_fmt.height;
46056 layer->geo.dst.field = mbus_fmt.field;
46057- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46058+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
46059
46060 mxr_geometry_dump(mdev, &layer->geo);
46061 }
46062@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
46063 /* set source size to highest accepted value */
46064 geo->src.full_width = max(geo->dst.full_width, pix->width);
46065 geo->src.full_height = max(geo->dst.full_height, pix->height);
46066- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46067+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46068 mxr_geometry_dump(mdev, &layer->geo);
46069 /* set cropping to total visible screen */
46070 geo->src.width = pix->width;
46071@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
46072 geo->src.x_offset = 0;
46073 geo->src.y_offset = 0;
46074 /* assure consistency of geometry */
46075- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46076+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
46077 mxr_geometry_dump(mdev, &layer->geo);
46078 /* set full size to lowest possible value */
46079 geo->src.full_width = 0;
46080 geo->src.full_height = 0;
46081- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46082+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
46083 mxr_geometry_dump(mdev, &layer->geo);
46084
46085 /* returning results */
46086@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
46087 target->width = s->r.width;
46088 target->height = s->r.height;
46089
46090- layer->ops.fix_geometry(layer, stage, s->flags);
46091+ layer->ops->fix_geometry(layer, stage, s->flags);
46092
46093 /* retrieve update selection rectangle */
46094 res.left = target->x_offset;
46095@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
46096 mxr_output_get(mdev);
46097
46098 mxr_layer_update_output(layer);
46099- layer->ops.format_set(layer);
46100+ layer->ops->format_set(layer);
46101 /* enabling layer in hardware */
46102 spin_lock_irqsave(&layer->enq_slock, flags);
46103 layer->state = MXR_LAYER_STREAMING;
46104 spin_unlock_irqrestore(&layer->enq_slock, flags);
46105
46106- layer->ops.stream_set(layer, MXR_ENABLE);
46107+ layer->ops->stream_set(layer, MXR_ENABLE);
46108 mxr_streamer_get(mdev);
46109
46110 return 0;
46111@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
46112 spin_unlock_irqrestore(&layer->enq_slock, flags);
46113
46114 /* disabling layer in hardware */
46115- layer->ops.stream_set(layer, MXR_DISABLE);
46116+ layer->ops->stream_set(layer, MXR_DISABLE);
46117 /* remove one streamer */
46118 mxr_streamer_put(mdev);
46119 /* allow changes in output configuration */
46120@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
46121
46122 void mxr_layer_release(struct mxr_layer *layer)
46123 {
46124- if (layer->ops.release)
46125- layer->ops.release(layer);
46126+ if (layer->ops->release)
46127+ layer->ops->release(layer);
46128 }
46129
46130 void mxr_base_layer_release(struct mxr_layer *layer)
46131@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
46132
46133 layer->mdev = mdev;
46134 layer->idx = idx;
46135- layer->ops = *ops;
46136+ layer->ops = ops;
46137
46138 spin_lock_init(&layer->enq_slock);
46139 INIT_LIST_HEAD(&layer->enq_list);
46140diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46141index c9388c4..ce71ece 100644
46142--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46143+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
46144@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
46145 {
46146 struct mxr_layer *layer;
46147 int ret;
46148- struct mxr_layer_ops ops = {
46149+ static struct mxr_layer_ops ops = {
46150 .release = mxr_vp_layer_release,
46151 .buffer_set = mxr_vp_buffer_set,
46152 .stream_set = mxr_vp_stream_set,
46153diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
46154index 82affae..42833ec 100644
46155--- a/drivers/media/radio/radio-cadet.c
46156+++ b/drivers/media/radio/radio-cadet.c
46157@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46158 unsigned char readbuf[RDS_BUFFER];
46159 int i = 0;
46160
46161+ if (count > RDS_BUFFER)
46162+ return -EFAULT;
46163 mutex_lock(&dev->lock);
46164 if (dev->rdsstat == 0)
46165 cadet_start_rds(dev);
46166@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
46167 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
46168 mutex_unlock(&dev->lock);
46169
46170- if (i && copy_to_user(data, readbuf, i))
46171- return -EFAULT;
46172+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
46173+ i = -EFAULT;
46174+
46175 return i;
46176 }
46177
46178diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
46179index 5236035..c622c74 100644
46180--- a/drivers/media/radio/radio-maxiradio.c
46181+++ b/drivers/media/radio/radio-maxiradio.c
46182@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
46183 /* TEA5757 pin mappings */
46184 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
46185
46186-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
46187+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
46188
46189 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
46190 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
46191diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
46192index 050b3bb..79f62b9 100644
46193--- a/drivers/media/radio/radio-shark.c
46194+++ b/drivers/media/radio/radio-shark.c
46195@@ -79,7 +79,7 @@ struct shark_device {
46196 u32 last_val;
46197 };
46198
46199-static atomic_t shark_instance = ATOMIC_INIT(0);
46200+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46201
46202 static void shark_write_val(struct snd_tea575x *tea, u32 val)
46203 {
46204diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
46205index 8654e0d..0608a64 100644
46206--- a/drivers/media/radio/radio-shark2.c
46207+++ b/drivers/media/radio/radio-shark2.c
46208@@ -74,7 +74,7 @@ struct shark_device {
46209 u8 *transfer_buffer;
46210 };
46211
46212-static atomic_t shark_instance = ATOMIC_INIT(0);
46213+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
46214
46215 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
46216 {
46217diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
46218index dccf586..d5db411 100644
46219--- a/drivers/media/radio/radio-si476x.c
46220+++ b/drivers/media/radio/radio-si476x.c
46221@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
46222 struct si476x_radio *radio;
46223 struct v4l2_ctrl *ctrl;
46224
46225- static atomic_t instance = ATOMIC_INIT(0);
46226+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
46227
46228 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
46229 if (!radio)
46230diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
46231index 704397f..4d05977 100644
46232--- a/drivers/media/radio/wl128x/fmdrv_common.c
46233+++ b/drivers/media/radio/wl128x/fmdrv_common.c
46234@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
46235 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
46236
46237 /* Radio Nr */
46238-static u32 radio_nr = -1;
46239+static int radio_nr = -1;
46240 module_param(radio_nr, int, 0444);
46241 MODULE_PARM_DESC(radio_nr, "Radio Nr");
46242
46243diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46244index 9fd1527..8927230 100644
46245--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
46246+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
46247@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
46248
46249 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
46250 {
46251- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
46252- char result[64];
46253- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
46254- sizeof(result), 0);
46255+ char *buf;
46256+ char *result;
46257+ int retval;
46258+
46259+ buf = kmalloc(2, GFP_KERNEL);
46260+ if (buf == NULL)
46261+ return -ENOMEM;
46262+ result = kmalloc(64, GFP_KERNEL);
46263+ if (result == NULL) {
46264+ kfree(buf);
46265+ return -ENOMEM;
46266+ }
46267+
46268+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
46269+ buf[1] = enable ? 1 : 0;
46270+
46271+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46272+
46273+ kfree(buf);
46274+ kfree(result);
46275+ return retval;
46276 }
46277
46278 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46279 {
46280- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46281- char state[3];
46282- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46283+ char *buf;
46284+ char *state;
46285+ int retval;
46286+
46287+ buf = kmalloc(2, GFP_KERNEL);
46288+ if (buf == NULL)
46289+ return -ENOMEM;
46290+ state = kmalloc(3, GFP_KERNEL);
46291+ if (state == NULL) {
46292+ kfree(buf);
46293+ return -ENOMEM;
46294+ }
46295+
46296+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46297+ buf[1] = enable ? 1 : 0;
46298+
46299+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46300+
46301+ kfree(buf);
46302+ kfree(state);
46303+ return retval;
46304 }
46305
46306 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46307 {
46308- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46309- char state[3];
46310+ char *query;
46311+ char *state;
46312 int ret;
46313+ query = kmalloc(1, GFP_KERNEL);
46314+ if (query == NULL)
46315+ return -ENOMEM;
46316+ state = kmalloc(3, GFP_KERNEL);
46317+ if (state == NULL) {
46318+ kfree(query);
46319+ return -ENOMEM;
46320+ }
46321+
46322+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46323
46324 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46325
46326- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46327- sizeof(state), 0);
46328+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46329 if (ret < 0) {
46330 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46331 "state info\n");
46332@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46333
46334 /* Copy this pointer as we are gonna need it in the release phase */
46335 cinergyt2_usb_device = adap->dev;
46336-
46337+ kfree(query);
46338+ kfree(state);
46339 return 0;
46340 }
46341
46342@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46343 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46344 {
46345 struct cinergyt2_state *st = d->priv;
46346- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46347+ u8 *key, *cmd;
46348 int i;
46349
46350+ cmd = kmalloc(1, GFP_KERNEL);
46351+ if (cmd == NULL)
46352+ return -EINVAL;
46353+ key = kzalloc(5, GFP_KERNEL);
46354+ if (key == NULL) {
46355+ kfree(cmd);
46356+ return -EINVAL;
46357+ }
46358+
46359+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46360+
46361 *state = REMOTE_NO_KEY_PRESSED;
46362
46363- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46364+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46365 if (key[4] == 0xff) {
46366 /* key repeat */
46367 st->rc_counter++;
46368@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46369 *event = d->last_event;
46370 deb_rc("repeat key, event %x\n",
46371 *event);
46372- return 0;
46373+ goto out;
46374 }
46375 }
46376 deb_rc("repeated key (non repeatable)\n");
46377 }
46378- return 0;
46379+ goto out;
46380 }
46381
46382 /* hack to pass checksum on the custom field */
46383@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46384
46385 deb_rc("key: %*ph\n", 5, key);
46386 }
46387+out:
46388+ kfree(cmd);
46389+ kfree(key);
46390 return 0;
46391 }
46392
46393diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46394index c890fe4..f9b2ae6 100644
46395--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46396+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46397@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46398 fe_status_t *status)
46399 {
46400 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46401- struct dvbt_get_status_msg result;
46402- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46403+ struct dvbt_get_status_msg *result;
46404+ u8 *cmd;
46405 int ret;
46406
46407- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46408- sizeof(result), 0);
46409+ cmd = kmalloc(1, GFP_KERNEL);
46410+ if (cmd == NULL)
46411+ return -ENOMEM;
46412+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46413+ if (result == NULL) {
46414+ kfree(cmd);
46415+ return -ENOMEM;
46416+ }
46417+
46418+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46419+
46420+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46421+ sizeof(*result), 0);
46422 if (ret < 0)
46423- return ret;
46424+ goto out;
46425
46426 *status = 0;
46427
46428- if (0xffff - le16_to_cpu(result.gain) > 30)
46429+ if (0xffff - le16_to_cpu(result->gain) > 30)
46430 *status |= FE_HAS_SIGNAL;
46431- if (result.lock_bits & (1 << 6))
46432+ if (result->lock_bits & (1 << 6))
46433 *status |= FE_HAS_LOCK;
46434- if (result.lock_bits & (1 << 5))
46435+ if (result->lock_bits & (1 << 5))
46436 *status |= FE_HAS_SYNC;
46437- if (result.lock_bits & (1 << 4))
46438+ if (result->lock_bits & (1 << 4))
46439 *status |= FE_HAS_CARRIER;
46440- if (result.lock_bits & (1 << 1))
46441+ if (result->lock_bits & (1 << 1))
46442 *status |= FE_HAS_VITERBI;
46443
46444 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46445 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46446 *status &= ~FE_HAS_LOCK;
46447
46448- return 0;
46449+out:
46450+ kfree(cmd);
46451+ kfree(result);
46452+ return ret;
46453 }
46454
46455 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46456 {
46457 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46458- struct dvbt_get_status_msg status;
46459- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46460+ struct dvbt_get_status_msg *status;
46461+ char *cmd;
46462 int ret;
46463
46464- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46465- sizeof(status), 0);
46466+ cmd = kmalloc(1, GFP_KERNEL);
46467+ if (cmd == NULL)
46468+ return -ENOMEM;
46469+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46470+ if (status == NULL) {
46471+ kfree(cmd);
46472+ return -ENOMEM;
46473+ }
46474+
46475+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46476+
46477+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46478+ sizeof(*status), 0);
46479 if (ret < 0)
46480- return ret;
46481+ goto out;
46482
46483- *ber = le32_to_cpu(status.viterbi_error_rate);
46484+ *ber = le32_to_cpu(status->viterbi_error_rate);
46485+out:
46486+ kfree(cmd);
46487+ kfree(status);
46488 return 0;
46489 }
46490
46491 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46492 {
46493 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46494- struct dvbt_get_status_msg status;
46495- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46496+ struct dvbt_get_status_msg *status;
46497+ u8 *cmd;
46498 int ret;
46499
46500- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46501- sizeof(status), 0);
46502+ cmd = kmalloc(1, GFP_KERNEL);
46503+ if (cmd == NULL)
46504+ return -ENOMEM;
46505+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46506+ if (status == NULL) {
46507+ kfree(cmd);
46508+ return -ENOMEM;
46509+ }
46510+
46511+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46512+
46513+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46514+ sizeof(*status), 0);
46515 if (ret < 0) {
46516 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46517 ret);
46518- return ret;
46519+ goto out;
46520 }
46521- *unc = le32_to_cpu(status.uncorrected_block_count);
46522- return 0;
46523+ *unc = le32_to_cpu(status->uncorrected_block_count);
46524+
46525+out:
46526+ kfree(cmd);
46527+ kfree(status);
46528+ return ret;
46529 }
46530
46531 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46532 u16 *strength)
46533 {
46534 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46535- struct dvbt_get_status_msg status;
46536- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46537+ struct dvbt_get_status_msg *status;
46538+ char *cmd;
46539 int ret;
46540
46541- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46542- sizeof(status), 0);
46543+ cmd = kmalloc(1, GFP_KERNEL);
46544+ if (cmd == NULL)
46545+ return -ENOMEM;
46546+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46547+ if (status == NULL) {
46548+ kfree(cmd);
46549+ return -ENOMEM;
46550+ }
46551+
46552+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46553+
46554+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46555+ sizeof(*status), 0);
46556 if (ret < 0) {
46557 err("cinergyt2_fe_read_signal_strength() Failed!"
46558 " (Error=%d)\n", ret);
46559- return ret;
46560+ goto out;
46561 }
46562- *strength = (0xffff - le16_to_cpu(status.gain));
46563+ *strength = (0xffff - le16_to_cpu(status->gain));
46564+
46565+out:
46566+ kfree(cmd);
46567+ kfree(status);
46568 return 0;
46569 }
46570
46571 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46572 {
46573 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46574- struct dvbt_get_status_msg status;
46575- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46576+ struct dvbt_get_status_msg *status;
46577+ char *cmd;
46578 int ret;
46579
46580- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46581- sizeof(status), 0);
46582+ cmd = kmalloc(1, GFP_KERNEL);
46583+ if (cmd == NULL)
46584+ return -ENOMEM;
46585+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46586+ if (status == NULL) {
46587+ kfree(cmd);
46588+ return -ENOMEM;
46589+ }
46590+
46591+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46592+
46593+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46594+ sizeof(*status), 0);
46595 if (ret < 0) {
46596 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46597- return ret;
46598+ goto out;
46599 }
46600- *snr = (status.snr << 8) | status.snr;
46601- return 0;
46602+ *snr = (status->snr << 8) | status->snr;
46603+
46604+out:
46605+ kfree(cmd);
46606+ kfree(status);
46607+ return ret;
46608 }
46609
46610 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46611@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46612 {
46613 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46614 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46615- struct dvbt_set_parameters_msg param;
46616- char result[2];
46617+ struct dvbt_set_parameters_msg *param;
46618+ char *result;
46619 int err;
46620
46621- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46622- param.tps = cpu_to_le16(compute_tps(fep));
46623- param.freq = cpu_to_le32(fep->frequency / 1000);
46624- param.flags = 0;
46625+ result = kmalloc(2, GFP_KERNEL);
46626+ if (result == NULL)
46627+ return -ENOMEM;
46628+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46629+ if (param == NULL) {
46630+ kfree(result);
46631+ return -ENOMEM;
46632+ }
46633+
46634+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46635+ param->tps = cpu_to_le16(compute_tps(fep));
46636+ param->freq = cpu_to_le32(fep->frequency / 1000);
46637+ param->flags = 0;
46638
46639 switch (fep->bandwidth_hz) {
46640 default:
46641 case 8000000:
46642- param.bandwidth = 8;
46643+ param->bandwidth = 8;
46644 break;
46645 case 7000000:
46646- param.bandwidth = 7;
46647+ param->bandwidth = 7;
46648 break;
46649 case 6000000:
46650- param.bandwidth = 6;
46651+ param->bandwidth = 6;
46652 break;
46653 }
46654
46655 err = dvb_usb_generic_rw(state->d,
46656- (char *)&param, sizeof(param),
46657- result, sizeof(result), 0);
46658+ (char *)param, sizeof(*param),
46659+ result, 2, 0);
46660 if (err < 0)
46661 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46662
46663- return (err < 0) ? err : 0;
46664+ kfree(result);
46665+ kfree(param);
46666+ return err;
46667 }
46668
46669 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46670diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46671index 733a7ff..f8b52e3 100644
46672--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46673+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46674@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
46675
46676 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
46677 {
46678- struct hexline hx;
46679- u8 reset;
46680+ struct hexline *hx;
46681+ u8 *reset;
46682 int ret,pos=0;
46683
46684+ reset = kmalloc(1, GFP_KERNEL);
46685+ if (reset == NULL)
46686+ return -ENOMEM;
46687+
46688+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
46689+ if (hx == NULL) {
46690+ kfree(reset);
46691+ return -ENOMEM;
46692+ }
46693+
46694 /* stop the CPU */
46695- reset = 1;
46696- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
46697+ reset[0] = 1;
46698+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
46699 err("could not stop the USB controller CPU.");
46700
46701- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
46702- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
46703- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
46704+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
46705+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
46706+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
46707
46708- if (ret != hx.len) {
46709+ if (ret != hx->len) {
46710 err("error while transferring firmware "
46711 "(transferred size: %d, block size: %d)",
46712- ret,hx.len);
46713+ ret,hx->len);
46714 ret = -EINVAL;
46715 break;
46716 }
46717 }
46718 if (ret < 0) {
46719 err("firmware download failed at %d with %d",pos,ret);
46720+ kfree(reset);
46721+ kfree(hx);
46722 return ret;
46723 }
46724
46725 if (ret == 0) {
46726 /* restart the CPU */
46727- reset = 0;
46728- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
46729+ reset[0] = 0;
46730+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
46731 err("could not restart the USB controller CPU.");
46732 ret = -EINVAL;
46733 }
46734 } else
46735 ret = -EIO;
46736
46737+ kfree(reset);
46738+ kfree(hx);
46739+
46740 return ret;
46741 }
46742 EXPORT_SYMBOL(usb_cypress_load_firmware);
46743diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
46744index 5801ae7..83f71fa 100644
46745--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
46746+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
46747@@ -87,8 +87,11 @@ struct technisat_usb2_state {
46748 static int technisat_usb2_i2c_access(struct usb_device *udev,
46749 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
46750 {
46751- u8 b[64];
46752- int ret, actual_length;
46753+ u8 *b = kmalloc(64, GFP_KERNEL);
46754+ int ret, actual_length, error = 0;
46755+
46756+ if (b == NULL)
46757+ return -ENOMEM;
46758
46759 deb_i2c("i2c-access: %02x, tx: ", device_addr);
46760 debug_dump(tx, txlen, deb_i2c);
46761@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46762
46763 if (ret < 0) {
46764 err("i2c-error: out failed %02x = %d", device_addr, ret);
46765- return -ENODEV;
46766+ error = -ENODEV;
46767+ goto out;
46768 }
46769
46770 ret = usb_bulk_msg(udev,
46771@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46772 b, 64, &actual_length, 1000);
46773 if (ret < 0) {
46774 err("i2c-error: in failed %02x = %d", device_addr, ret);
46775- return -ENODEV;
46776+ error = -ENODEV;
46777+ goto out;
46778 }
46779
46780 if (b[0] != I2C_STATUS_OK) {
46781@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46782 /* handle tuner-i2c-nak */
46783 if (!(b[0] == I2C_STATUS_NAK &&
46784 device_addr == 0x60
46785- /* && device_is_technisat_usb2 */))
46786- return -ENODEV;
46787+ /* && device_is_technisat_usb2 */)) {
46788+ error = -ENODEV;
46789+ goto out;
46790+ }
46791 }
46792
46793 deb_i2c("status: %d, ", b[0]);
46794@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46795
46796 deb_i2c("\n");
46797
46798- return 0;
46799+out:
46800+ kfree(b);
46801+ return error;
46802 }
46803
46804 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
46805@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46806 {
46807 int ret;
46808
46809- u8 led[8] = {
46810- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46811- 0
46812- };
46813+ u8 *led = kzalloc(8, GFP_KERNEL);
46814+
46815+ if (led == NULL)
46816+ return -ENOMEM;
46817
46818 if (disable_led_control && state != TECH_LED_OFF)
46819 return 0;
46820
46821+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
46822+
46823 switch (state) {
46824 case TECH_LED_ON:
46825 led[1] = 0x82;
46826@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46827 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46828 USB_TYPE_VENDOR | USB_DIR_OUT,
46829 0, 0,
46830- led, sizeof(led), 500);
46831+ led, 8, 500);
46832
46833 mutex_unlock(&d->i2c_mutex);
46834+
46835+ kfree(led);
46836+
46837 return ret;
46838 }
46839
46840 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
46841 {
46842 int ret;
46843- u8 b = 0;
46844+ u8 *b = kzalloc(1, GFP_KERNEL);
46845+
46846+ if (b == NULL)
46847+ return -ENOMEM;
46848
46849 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
46850 return -EAGAIN;
46851@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
46852 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
46853 USB_TYPE_VENDOR | USB_DIR_OUT,
46854 (red << 8) | green, 0,
46855- &b, 1, 500);
46856+ b, 1, 500);
46857
46858 mutex_unlock(&d->i2c_mutex);
46859
46860+ kfree(b);
46861+
46862 return ret;
46863 }
46864
46865@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46866 struct dvb_usb_device_description **desc, int *cold)
46867 {
46868 int ret;
46869- u8 version[3];
46870+ u8 *version = kmalloc(3, GFP_KERNEL);
46871
46872 /* first select the interface */
46873 if (usb_set_interface(udev, 0, 1) != 0)
46874@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46875
46876 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
46877
46878+ if (version == NULL)
46879+ return 0;
46880+
46881 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
46882 GET_VERSION_INFO_VENDOR_REQUEST,
46883 USB_TYPE_VENDOR | USB_DIR_IN,
46884 0, 0,
46885- version, sizeof(version), 500);
46886+ version, 3, 500);
46887
46888 if (ret < 0)
46889 *cold = 1;
46890@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46891 *cold = 0;
46892 }
46893
46894+ kfree(version);
46895+
46896 return 0;
46897 }
46898
46899@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
46900
46901 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46902 {
46903- u8 buf[62], *b;
46904+ u8 *buf, *b;
46905 int ret;
46906 struct ir_raw_event ev;
46907
46908+ buf = kmalloc(62, GFP_KERNEL);
46909+
46910+ if (buf == NULL)
46911+ return -ENOMEM;
46912+
46913 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
46914 buf[1] = 0x08;
46915 buf[2] = 0x8f;
46916@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46917 GET_IR_DATA_VENDOR_REQUEST,
46918 USB_TYPE_VENDOR | USB_DIR_IN,
46919 0x8080, 0,
46920- buf, sizeof(buf), 500);
46921+ buf, 62, 500);
46922
46923 unlock:
46924 mutex_unlock(&d->i2c_mutex);
46925
46926- if (ret < 0)
46927+ if (ret < 0) {
46928+ kfree(buf);
46929 return ret;
46930+ }
46931
46932- if (ret == 1)
46933+ if (ret == 1) {
46934+ kfree(buf);
46935 return 0; /* no key pressed */
46936+ }
46937
46938 /* decoding */
46939 b = buf+1;
46940@@ -656,6 +689,8 @@ unlock:
46941
46942 ir_raw_event_handle(d->rc_dev);
46943
46944+ kfree(buf);
46945+
46946 return 1;
46947 }
46948
46949diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46950index af63543..0436f20 100644
46951--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46952+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46953@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46954 * by passing a very big num_planes value */
46955 uplane = compat_alloc_user_space(num_planes *
46956 sizeof(struct v4l2_plane));
46957- kp->m.planes = (__force struct v4l2_plane *)uplane;
46958+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46959
46960 while (--num_planes >= 0) {
46961 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46962@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46963 if (num_planes == 0)
46964 return 0;
46965
46966- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46967+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46968 if (get_user(p, &up->m.planes))
46969 return -EFAULT;
46970 uplane32 = compat_ptr(p);
46971@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46972 get_user(kp->flags, &up->flags) ||
46973 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46974 return -EFAULT;
46975- kp->base = (__force void *)compat_ptr(tmp);
46976+ kp->base = (__force_kernel void *)compat_ptr(tmp);
46977 return 0;
46978 }
46979
46980@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46981 n * sizeof(struct v4l2_ext_control32)))
46982 return -EFAULT;
46983 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46984- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46985+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46986 while (--n >= 0) {
46987 u32 id;
46988
46989@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46990 {
46991 struct v4l2_ext_control32 __user *ucontrols;
46992 struct v4l2_ext_control __user *kcontrols =
46993- (__force struct v4l2_ext_control __user *)kp->controls;
46994+ (struct v4l2_ext_control __force_user *)kp->controls;
46995 int n = kp->count;
46996 compat_caddr_t p;
46997
46998@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46999 get_user(tmp, &up->edid) ||
47000 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
47001 return -EFAULT;
47002- kp->edid = (__force u8 *)compat_ptr(tmp);
47003+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
47004 return 0;
47005 }
47006
47007diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
47008index 5b0a30b..1974b38 100644
47009--- a/drivers/media/v4l2-core/v4l2-device.c
47010+++ b/drivers/media/v4l2-core/v4l2-device.c
47011@@ -74,9 +74,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
47012 EXPORT_SYMBOL_GPL(v4l2_device_put);
47013
47014 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
47015- atomic_t *instance)
47016+ atomic_unchecked_t *instance)
47017 {
47018- int num = atomic_inc_return(instance) - 1;
47019+ int num = atomic_inc_return_unchecked(instance) - 1;
47020 int len = strlen(basename);
47021
47022 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
47023diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
47024index aa407cb..ee847d4 100644
47025--- a/drivers/media/v4l2-core/v4l2-ioctl.c
47026+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
47027@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
47028 struct file *file, void *fh, void *p);
47029 } u;
47030 void (*debug)(const void *arg, bool write_only);
47031-};
47032+} __do_const;
47033+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
47034
47035 /* This control needs a priority check */
47036 #define INFO_FL_PRIO (1 << 0)
47037@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
47038 struct video_device *vfd = video_devdata(file);
47039 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
47040 bool write_only = false;
47041- struct v4l2_ioctl_info default_info;
47042+ v4l2_ioctl_info_no_const default_info;
47043 const struct v4l2_ioctl_info *info;
47044 void *fh = file->private_data;
47045 struct v4l2_fh *vfh = NULL;
47046@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47047 ret = -EINVAL;
47048 break;
47049 }
47050- *user_ptr = (void __user *)buf->m.planes;
47051+ *user_ptr = (void __force_user *)buf->m.planes;
47052 *kernel_ptr = (void **)&buf->m.planes;
47053 *array_size = sizeof(struct v4l2_plane) * buf->length;
47054 ret = 1;
47055@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47056 ret = -EINVAL;
47057 break;
47058 }
47059- *user_ptr = (void __user *)edid->edid;
47060+ *user_ptr = (void __force_user *)edid->edid;
47061 *kernel_ptr = (void **)&edid->edid;
47062 *array_size = edid->blocks * 128;
47063 ret = 1;
47064@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
47065 ret = -EINVAL;
47066 break;
47067 }
47068- *user_ptr = (void __user *)ctrls->controls;
47069+ *user_ptr = (void __force_user *)ctrls->controls;
47070 *kernel_ptr = (void **)&ctrls->controls;
47071 *array_size = sizeof(struct v4l2_ext_control)
47072 * ctrls->count;
47073@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
47074 }
47075
47076 if (has_array_args) {
47077- *kernel_ptr = (void __force *)user_ptr;
47078+ *kernel_ptr = (void __force_kernel *)user_ptr;
47079 if (copy_to_user(user_ptr, mbuf, array_size))
47080 err = -EFAULT;
47081 goto out_array_args;
47082diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
47083index c94ea0d..b8a9f88 100644
47084--- a/drivers/memory/omap-gpmc.c
47085+++ b/drivers/memory/omap-gpmc.c
47086@@ -232,7 +232,6 @@ struct omap3_gpmc_regs {
47087 };
47088
47089 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
47090-static struct irq_chip gpmc_irq_chip;
47091 static int gpmc_irq_start;
47092
47093 static struct resource gpmc_mem_root;
47094@@ -1146,6 +1145,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
47095
47096 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
47097
47098+static struct irq_chip gpmc_irq_chip = {
47099+ .name = "gpmc",
47100+ .irq_startup = gpmc_irq_noop_ret,
47101+ .irq_enable = gpmc_irq_enable,
47102+ .irq_disable = gpmc_irq_disable,
47103+ .irq_shutdown = gpmc_irq_noop,
47104+ .irq_ack = gpmc_irq_noop,
47105+ .irq_mask = gpmc_irq_noop,
47106+ .irq_unmask = gpmc_irq_noop,
47107+};
47108+
47109 static int gpmc_setup_irq(void)
47110 {
47111 int i;
47112@@ -1160,15 +1170,6 @@ static int gpmc_setup_irq(void)
47113 return gpmc_irq_start;
47114 }
47115
47116- gpmc_irq_chip.name = "gpmc";
47117- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
47118- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
47119- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
47120- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
47121- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
47122- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
47123- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
47124-
47125 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
47126 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
47127
47128diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
47129index 187f836..679544b 100644
47130--- a/drivers/message/fusion/mptbase.c
47131+++ b/drivers/message/fusion/mptbase.c
47132@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47133 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
47134 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
47135
47136+#ifdef CONFIG_GRKERNSEC_HIDESYM
47137+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
47138+#else
47139 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
47140 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
47141+#endif
47142+
47143 /*
47144 * Rounding UP to nearest 4-kB boundary here...
47145 */
47146@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
47147 ioc->facts.GlobalCredits);
47148
47149 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
47150+#ifdef CONFIG_GRKERNSEC_HIDESYM
47151+ NULL, NULL);
47152+#else
47153 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
47154+#endif
47155 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
47156 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
47157 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
47158diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
47159index 5bdaae1..eced16f 100644
47160--- a/drivers/message/fusion/mptsas.c
47161+++ b/drivers/message/fusion/mptsas.c
47162@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
47163 return 0;
47164 }
47165
47166+static inline void
47167+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47168+{
47169+ if (phy_info->port_details) {
47170+ phy_info->port_details->rphy = rphy;
47171+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47172+ ioc->name, rphy));
47173+ }
47174+
47175+ if (rphy) {
47176+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47177+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47178+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47179+ ioc->name, rphy, rphy->dev.release));
47180+ }
47181+}
47182+
47183 /* no mutex */
47184 static void
47185 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
47186@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
47187 return NULL;
47188 }
47189
47190-static inline void
47191-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
47192-{
47193- if (phy_info->port_details) {
47194- phy_info->port_details->rphy = rphy;
47195- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
47196- ioc->name, rphy));
47197- }
47198-
47199- if (rphy) {
47200- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
47201- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
47202- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
47203- ioc->name, rphy, rphy->dev.release));
47204- }
47205-}
47206-
47207 static inline struct sas_port *
47208 mptsas_get_port(struct mptsas_phyinfo *phy_info)
47209 {
47210diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
47211index cdd6f3d..1907a98 100644
47212--- a/drivers/mfd/ab8500-debugfs.c
47213+++ b/drivers/mfd/ab8500-debugfs.c
47214@@ -100,7 +100,7 @@ static int irq_last;
47215 static u32 *irq_count;
47216 static int num_irqs;
47217
47218-static struct device_attribute **dev_attr;
47219+static device_attribute_no_const **dev_attr;
47220 static char **event_name;
47221
47222 static u8 avg_sample = SAMPLE_16;
47223diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
47224index 8057849..0550fdf 100644
47225--- a/drivers/mfd/kempld-core.c
47226+++ b/drivers/mfd/kempld-core.c
47227@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
47228 .remove = kempld_remove,
47229 };
47230
47231-static struct dmi_system_id kempld_dmi_table[] __initdata = {
47232+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
47233 {
47234 .ident = "BHL6",
47235 .matches = {
47236diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
47237index c880c89..45a7c68 100644
47238--- a/drivers/mfd/max8925-i2c.c
47239+++ b/drivers/mfd/max8925-i2c.c
47240@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
47241 const struct i2c_device_id *id)
47242 {
47243 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
47244- static struct max8925_chip *chip;
47245+ struct max8925_chip *chip;
47246 struct device_node *node = client->dev.of_node;
47247
47248 if (node && !pdata) {
47249diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
47250index 7612d89..70549c2 100644
47251--- a/drivers/mfd/tps65910.c
47252+++ b/drivers/mfd/tps65910.c
47253@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
47254 struct tps65910_platform_data *pdata)
47255 {
47256 int ret = 0;
47257- static struct regmap_irq_chip *tps6591x_irqs_chip;
47258+ struct regmap_irq_chip *tps6591x_irqs_chip;
47259
47260 if (!irq) {
47261 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47262diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47263index 1b772ef..01e77d33 100644
47264--- a/drivers/mfd/twl4030-irq.c
47265+++ b/drivers/mfd/twl4030-irq.c
47266@@ -34,6 +34,7 @@
47267 #include <linux/of.h>
47268 #include <linux/irqdomain.h>
47269 #include <linux/i2c/twl.h>
47270+#include <asm/pgtable.h>
47271
47272 #include "twl-core.h"
47273
47274@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47275 * Install an irq handler for each of the SIH modules;
47276 * clone dummy irq_chip since PIH can't *do* anything
47277 */
47278- twl4030_irq_chip = dummy_irq_chip;
47279- twl4030_irq_chip.name = "twl4030";
47280+ pax_open_kernel();
47281+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47282+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47283
47284- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47285+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47286+ pax_close_kernel();
47287
47288 for (i = irq_base; i < irq_end; i++) {
47289 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47290diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47291index 464419b..64bae8d 100644
47292--- a/drivers/misc/c2port/core.c
47293+++ b/drivers/misc/c2port/core.c
47294@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47295 goto error_idr_alloc;
47296 c2dev->id = ret;
47297
47298- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47299+ pax_open_kernel();
47300+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47301+ pax_close_kernel();
47302
47303 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47304 "c2port%d", c2dev->id);
47305diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47306index 8385177..2f54635 100644
47307--- a/drivers/misc/eeprom/sunxi_sid.c
47308+++ b/drivers/misc/eeprom/sunxi_sid.c
47309@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47310
47311 platform_set_drvdata(pdev, sid_data);
47312
47313- sid_bin_attr.size = sid_data->keysize;
47314+ pax_open_kernel();
47315+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47316+ pax_close_kernel();
47317 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47318 return -ENODEV;
47319
47320diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47321index 36f5d52..32311c3 100644
47322--- a/drivers/misc/kgdbts.c
47323+++ b/drivers/misc/kgdbts.c
47324@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47325 char before[BREAK_INSTR_SIZE];
47326 char after[BREAK_INSTR_SIZE];
47327
47328- probe_kernel_read(before, (char *)kgdbts_break_test,
47329+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47330 BREAK_INSTR_SIZE);
47331 init_simple_test();
47332 ts.tst = plant_and_detach_test;
47333@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47334 /* Activate test with initial breakpoint */
47335 if (!is_early)
47336 kgdb_breakpoint();
47337- probe_kernel_read(after, (char *)kgdbts_break_test,
47338+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47339 BREAK_INSTR_SIZE);
47340 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47341 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47342diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47343index 4739689..8a52950 100644
47344--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47345+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47346@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47347 * the lid is closed. This leads to interrupts as soon as a little move
47348 * is done.
47349 */
47350- atomic_inc(&lis3->count);
47351+ atomic_inc_unchecked(&lis3->count);
47352
47353 wake_up_interruptible(&lis3->misc_wait);
47354 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47355@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47356 if (lis3->pm_dev)
47357 pm_runtime_get_sync(lis3->pm_dev);
47358
47359- atomic_set(&lis3->count, 0);
47360+ atomic_set_unchecked(&lis3->count, 0);
47361 return 0;
47362 }
47363
47364@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47365 add_wait_queue(&lis3->misc_wait, &wait);
47366 while (true) {
47367 set_current_state(TASK_INTERRUPTIBLE);
47368- data = atomic_xchg(&lis3->count, 0);
47369+ data = atomic_xchg_unchecked(&lis3->count, 0);
47370 if (data)
47371 break;
47372
47373@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47374 struct lis3lv02d, miscdev);
47375
47376 poll_wait(file, &lis3->misc_wait, wait);
47377- if (atomic_read(&lis3->count))
47378+ if (atomic_read_unchecked(&lis3->count))
47379 return POLLIN | POLLRDNORM;
47380 return 0;
47381 }
47382diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47383index c439c82..1f20f57 100644
47384--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47385+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47386@@ -297,7 +297,7 @@ struct lis3lv02d {
47387 struct input_polled_dev *idev; /* input device */
47388 struct platform_device *pdev; /* platform device */
47389 struct regulator_bulk_data regulators[2];
47390- atomic_t count; /* interrupt count after last read */
47391+ atomic_unchecked_t count; /* interrupt count after last read */
47392 union axis_conversion ac; /* hw -> logical axis */
47393 int mapped_btns[3];
47394
47395diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47396index 2f30bad..c4c13d0 100644
47397--- a/drivers/misc/sgi-gru/gruhandles.c
47398+++ b/drivers/misc/sgi-gru/gruhandles.c
47399@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47400 unsigned long nsec;
47401
47402 nsec = CLKS2NSEC(clks);
47403- atomic_long_inc(&mcs_op_statistics[op].count);
47404- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47405+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47406+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47407 if (mcs_op_statistics[op].max < nsec)
47408 mcs_op_statistics[op].max = nsec;
47409 }
47410diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47411index 4f76359..cdfcb2e 100644
47412--- a/drivers/misc/sgi-gru/gruprocfs.c
47413+++ b/drivers/misc/sgi-gru/gruprocfs.c
47414@@ -32,9 +32,9 @@
47415
47416 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47417
47418-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47419+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47420 {
47421- unsigned long val = atomic_long_read(v);
47422+ unsigned long val = atomic_long_read_unchecked(v);
47423
47424 seq_printf(s, "%16lu %s\n", val, id);
47425 }
47426@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47427
47428 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47429 for (op = 0; op < mcsop_last; op++) {
47430- count = atomic_long_read(&mcs_op_statistics[op].count);
47431- total = atomic_long_read(&mcs_op_statistics[op].total);
47432+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47433+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47434 max = mcs_op_statistics[op].max;
47435 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47436 count ? total / count : 0, max);
47437diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47438index 5c3ce24..4915ccb 100644
47439--- a/drivers/misc/sgi-gru/grutables.h
47440+++ b/drivers/misc/sgi-gru/grutables.h
47441@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47442 * GRU statistics.
47443 */
47444 struct gru_stats_s {
47445- atomic_long_t vdata_alloc;
47446- atomic_long_t vdata_free;
47447- atomic_long_t gts_alloc;
47448- atomic_long_t gts_free;
47449- atomic_long_t gms_alloc;
47450- atomic_long_t gms_free;
47451- atomic_long_t gts_double_allocate;
47452- atomic_long_t assign_context;
47453- atomic_long_t assign_context_failed;
47454- atomic_long_t free_context;
47455- atomic_long_t load_user_context;
47456- atomic_long_t load_kernel_context;
47457- atomic_long_t lock_kernel_context;
47458- atomic_long_t unlock_kernel_context;
47459- atomic_long_t steal_user_context;
47460- atomic_long_t steal_kernel_context;
47461- atomic_long_t steal_context_failed;
47462- atomic_long_t nopfn;
47463- atomic_long_t asid_new;
47464- atomic_long_t asid_next;
47465- atomic_long_t asid_wrap;
47466- atomic_long_t asid_reuse;
47467- atomic_long_t intr;
47468- atomic_long_t intr_cbr;
47469- atomic_long_t intr_tfh;
47470- atomic_long_t intr_spurious;
47471- atomic_long_t intr_mm_lock_failed;
47472- atomic_long_t call_os;
47473- atomic_long_t call_os_wait_queue;
47474- atomic_long_t user_flush_tlb;
47475- atomic_long_t user_unload_context;
47476- atomic_long_t user_exception;
47477- atomic_long_t set_context_option;
47478- atomic_long_t check_context_retarget_intr;
47479- atomic_long_t check_context_unload;
47480- atomic_long_t tlb_dropin;
47481- atomic_long_t tlb_preload_page;
47482- atomic_long_t tlb_dropin_fail_no_asid;
47483- atomic_long_t tlb_dropin_fail_upm;
47484- atomic_long_t tlb_dropin_fail_invalid;
47485- atomic_long_t tlb_dropin_fail_range_active;
47486- atomic_long_t tlb_dropin_fail_idle;
47487- atomic_long_t tlb_dropin_fail_fmm;
47488- atomic_long_t tlb_dropin_fail_no_exception;
47489- atomic_long_t tfh_stale_on_fault;
47490- atomic_long_t mmu_invalidate_range;
47491- atomic_long_t mmu_invalidate_page;
47492- atomic_long_t flush_tlb;
47493- atomic_long_t flush_tlb_gru;
47494- atomic_long_t flush_tlb_gru_tgh;
47495- atomic_long_t flush_tlb_gru_zero_asid;
47496+ atomic_long_unchecked_t vdata_alloc;
47497+ atomic_long_unchecked_t vdata_free;
47498+ atomic_long_unchecked_t gts_alloc;
47499+ atomic_long_unchecked_t gts_free;
47500+ atomic_long_unchecked_t gms_alloc;
47501+ atomic_long_unchecked_t gms_free;
47502+ atomic_long_unchecked_t gts_double_allocate;
47503+ atomic_long_unchecked_t assign_context;
47504+ atomic_long_unchecked_t assign_context_failed;
47505+ atomic_long_unchecked_t free_context;
47506+ atomic_long_unchecked_t load_user_context;
47507+ atomic_long_unchecked_t load_kernel_context;
47508+ atomic_long_unchecked_t lock_kernel_context;
47509+ atomic_long_unchecked_t unlock_kernel_context;
47510+ atomic_long_unchecked_t steal_user_context;
47511+ atomic_long_unchecked_t steal_kernel_context;
47512+ atomic_long_unchecked_t steal_context_failed;
47513+ atomic_long_unchecked_t nopfn;
47514+ atomic_long_unchecked_t asid_new;
47515+ atomic_long_unchecked_t asid_next;
47516+ atomic_long_unchecked_t asid_wrap;
47517+ atomic_long_unchecked_t asid_reuse;
47518+ atomic_long_unchecked_t intr;
47519+ atomic_long_unchecked_t intr_cbr;
47520+ atomic_long_unchecked_t intr_tfh;
47521+ atomic_long_unchecked_t intr_spurious;
47522+ atomic_long_unchecked_t intr_mm_lock_failed;
47523+ atomic_long_unchecked_t call_os;
47524+ atomic_long_unchecked_t call_os_wait_queue;
47525+ atomic_long_unchecked_t user_flush_tlb;
47526+ atomic_long_unchecked_t user_unload_context;
47527+ atomic_long_unchecked_t user_exception;
47528+ atomic_long_unchecked_t set_context_option;
47529+ atomic_long_unchecked_t check_context_retarget_intr;
47530+ atomic_long_unchecked_t check_context_unload;
47531+ atomic_long_unchecked_t tlb_dropin;
47532+ atomic_long_unchecked_t tlb_preload_page;
47533+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47534+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47535+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47536+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47537+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47538+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47539+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47540+ atomic_long_unchecked_t tfh_stale_on_fault;
47541+ atomic_long_unchecked_t mmu_invalidate_range;
47542+ atomic_long_unchecked_t mmu_invalidate_page;
47543+ atomic_long_unchecked_t flush_tlb;
47544+ atomic_long_unchecked_t flush_tlb_gru;
47545+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47546+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47547
47548- atomic_long_t copy_gpa;
47549- atomic_long_t read_gpa;
47550+ atomic_long_unchecked_t copy_gpa;
47551+ atomic_long_unchecked_t read_gpa;
47552
47553- atomic_long_t mesq_receive;
47554- atomic_long_t mesq_receive_none;
47555- atomic_long_t mesq_send;
47556- atomic_long_t mesq_send_failed;
47557- atomic_long_t mesq_noop;
47558- atomic_long_t mesq_send_unexpected_error;
47559- atomic_long_t mesq_send_lb_overflow;
47560- atomic_long_t mesq_send_qlimit_reached;
47561- atomic_long_t mesq_send_amo_nacked;
47562- atomic_long_t mesq_send_put_nacked;
47563- atomic_long_t mesq_page_overflow;
47564- atomic_long_t mesq_qf_locked;
47565- atomic_long_t mesq_qf_noop_not_full;
47566- atomic_long_t mesq_qf_switch_head_failed;
47567- atomic_long_t mesq_qf_unexpected_error;
47568- atomic_long_t mesq_noop_unexpected_error;
47569- atomic_long_t mesq_noop_lb_overflow;
47570- atomic_long_t mesq_noop_qlimit_reached;
47571- atomic_long_t mesq_noop_amo_nacked;
47572- atomic_long_t mesq_noop_put_nacked;
47573- atomic_long_t mesq_noop_page_overflow;
47574+ atomic_long_unchecked_t mesq_receive;
47575+ atomic_long_unchecked_t mesq_receive_none;
47576+ atomic_long_unchecked_t mesq_send;
47577+ atomic_long_unchecked_t mesq_send_failed;
47578+ atomic_long_unchecked_t mesq_noop;
47579+ atomic_long_unchecked_t mesq_send_unexpected_error;
47580+ atomic_long_unchecked_t mesq_send_lb_overflow;
47581+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47582+ atomic_long_unchecked_t mesq_send_amo_nacked;
47583+ atomic_long_unchecked_t mesq_send_put_nacked;
47584+ atomic_long_unchecked_t mesq_page_overflow;
47585+ atomic_long_unchecked_t mesq_qf_locked;
47586+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47587+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47588+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47589+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47590+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47591+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47592+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47593+ atomic_long_unchecked_t mesq_noop_put_nacked;
47594+ atomic_long_unchecked_t mesq_noop_page_overflow;
47595
47596 };
47597
47598@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47599 tghop_invalidate, mcsop_last};
47600
47601 struct mcs_op_statistic {
47602- atomic_long_t count;
47603- atomic_long_t total;
47604+ atomic_long_unchecked_t count;
47605+ atomic_long_unchecked_t total;
47606 unsigned long max;
47607 };
47608
47609@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47610
47611 #define STAT(id) do { \
47612 if (gru_options & OPT_STATS) \
47613- atomic_long_inc(&gru_stats.id); \
47614+ atomic_long_inc_unchecked(&gru_stats.id); \
47615 } while (0)
47616
47617 #ifdef CONFIG_SGI_GRU_DEBUG
47618diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47619index c862cd4..0d176fe 100644
47620--- a/drivers/misc/sgi-xp/xp.h
47621+++ b/drivers/misc/sgi-xp/xp.h
47622@@ -288,7 +288,7 @@ struct xpc_interface {
47623 xpc_notify_func, void *);
47624 void (*received) (short, int, void *);
47625 enum xp_retval (*partid_to_nasids) (short, void *);
47626-};
47627+} __no_const;
47628
47629 extern struct xpc_interface xpc_interface;
47630
47631diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47632index 01be66d..e3a0c7e 100644
47633--- a/drivers/misc/sgi-xp/xp_main.c
47634+++ b/drivers/misc/sgi-xp/xp_main.c
47635@@ -78,13 +78,13 @@ xpc_notloaded(void)
47636 }
47637
47638 struct xpc_interface xpc_interface = {
47639- (void (*)(int))xpc_notloaded,
47640- (void (*)(int))xpc_notloaded,
47641- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47642- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47643+ .connect = (void (*)(int))xpc_notloaded,
47644+ .disconnect = (void (*)(int))xpc_notloaded,
47645+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47646+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47647 void *))xpc_notloaded,
47648- (void (*)(short, int, void *))xpc_notloaded,
47649- (enum xp_retval(*)(short, void *))xpc_notloaded
47650+ .received = (void (*)(short, int, void *))xpc_notloaded,
47651+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47652 };
47653 EXPORT_SYMBOL_GPL(xpc_interface);
47654
47655diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47656index b94d5f7..7f494c5 100644
47657--- a/drivers/misc/sgi-xp/xpc.h
47658+++ b/drivers/misc/sgi-xp/xpc.h
47659@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47660 void (*received_payload) (struct xpc_channel *, void *);
47661 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47662 };
47663+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47664
47665 /* struct xpc_partition act_state values (for XPC HB) */
47666
47667@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47668 /* found in xpc_main.c */
47669 extern struct device *xpc_part;
47670 extern struct device *xpc_chan;
47671-extern struct xpc_arch_operations xpc_arch_ops;
47672+extern xpc_arch_operations_no_const xpc_arch_ops;
47673 extern int xpc_disengage_timelimit;
47674 extern int xpc_disengage_timedout;
47675 extern int xpc_activate_IRQ_rcvd;
47676diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47677index 7f32712..8539ab2 100644
47678--- a/drivers/misc/sgi-xp/xpc_main.c
47679+++ b/drivers/misc/sgi-xp/xpc_main.c
47680@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47681 .notifier_call = xpc_system_die,
47682 };
47683
47684-struct xpc_arch_operations xpc_arch_ops;
47685+xpc_arch_operations_no_const xpc_arch_ops;
47686
47687 /*
47688 * Timer function to enforce the timelimit on the partition disengage.
47689diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47690index 31d2627..d1b80a5 100644
47691--- a/drivers/mmc/card/block.c
47692+++ b/drivers/mmc/card/block.c
47693@@ -579,7 +579,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47694 if (idata->ic.postsleep_min_us)
47695 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47696
47697- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47698+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47699 err = -EFAULT;
47700 goto cmd_rel_host;
47701 }
47702diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47703index f45ab91..9f50d8f 100644
47704--- a/drivers/mmc/host/dw_mmc.h
47705+++ b/drivers/mmc/host/dw_mmc.h
47706@@ -287,5 +287,5 @@ struct dw_mci_drv_data {
47707 int (*execute_tuning)(struct dw_mci_slot *slot);
47708 int (*prepare_hs400_tuning)(struct dw_mci *host,
47709 struct mmc_ios *ios);
47710-};
47711+} __do_const;
47712 #endif /* _DW_MMC_H_ */
47713diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
47714index fb26674..3172c2b 100644
47715--- a/drivers/mmc/host/mmci.c
47716+++ b/drivers/mmc/host/mmci.c
47717@@ -1633,7 +1633,9 @@ static int mmci_probe(struct amba_device *dev,
47718 mmc->caps |= MMC_CAP_CMD23;
47719
47720 if (variant->busy_detect) {
47721- mmci_ops.card_busy = mmci_card_busy;
47722+ pax_open_kernel();
47723+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47724+ pax_close_kernel();
47725 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47726 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47727 mmc->max_busy_timeout = 0;
47728diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47729index d0abdffb..bb1f8d7 100644
47730--- a/drivers/mmc/host/omap_hsmmc.c
47731+++ b/drivers/mmc/host/omap_hsmmc.c
47732@@ -2004,7 +2004,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47733
47734 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47735 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47736- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47737+ pax_open_kernel();
47738+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47739+ pax_close_kernel();
47740 }
47741
47742 pm_runtime_enable(host->dev);
47743diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47744index 82f512d..5a228bb 100644
47745--- a/drivers/mmc/host/sdhci-esdhc-imx.c
47746+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47747@@ -993,9 +993,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47748 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47749 }
47750
47751- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47752- sdhci_esdhc_ops.platform_execute_tuning =
47753+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47754+ pax_open_kernel();
47755+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47756 esdhc_executing_tuning;
47757+ pax_close_kernel();
47758+ }
47759
47760 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47761 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47762diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47763index c6d2dd7..81b1ca3 100644
47764--- a/drivers/mmc/host/sdhci-s3c.c
47765+++ b/drivers/mmc/host/sdhci-s3c.c
47766@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47767 * we can use overriding functions instead of default.
47768 */
47769 if (sc->no_divider) {
47770- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47771- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47772- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47773+ pax_open_kernel();
47774+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47775+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47776+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47777+ pax_close_kernel();
47778 }
47779
47780 /* It supports additional host capabilities if needed */
47781diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47782index 9a1a6ff..b8f1a57 100644
47783--- a/drivers/mtd/chips/cfi_cmdset_0020.c
47784+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47785@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47786 size_t totlen = 0, thislen;
47787 int ret = 0;
47788 size_t buflen = 0;
47789- static char *buffer;
47790+ char *buffer;
47791
47792 if (!ECCBUF_SIZE) {
47793 /* We should fall back to a general writev implementation.
47794diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47795index 870c7fc..c7d6440 100644
47796--- a/drivers/mtd/nand/denali.c
47797+++ b/drivers/mtd/nand/denali.c
47798@@ -24,6 +24,7 @@
47799 #include <linux/slab.h>
47800 #include <linux/mtd/mtd.h>
47801 #include <linux/module.h>
47802+#include <linux/slab.h>
47803
47804 #include "denali.h"
47805
47806diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47807index 1b8f350..990f2e9 100644
47808--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47809+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47810@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47811
47812 /* first try to map the upper buffer directly */
47813 if (virt_addr_valid(this->upper_buf) &&
47814- !object_is_on_stack(this->upper_buf)) {
47815+ !object_starts_on_stack(this->upper_buf)) {
47816 sg_init_one(sgl, this->upper_buf, this->upper_len);
47817 ret = dma_map_sg(this->dev, sgl, 1, dr);
47818 if (ret == 0)
47819diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47820index a5dfbfb..8042ab4 100644
47821--- a/drivers/mtd/nftlmount.c
47822+++ b/drivers/mtd/nftlmount.c
47823@@ -24,6 +24,7 @@
47824 #include <asm/errno.h>
47825 #include <linux/delay.h>
47826 #include <linux/slab.h>
47827+#include <linux/sched.h>
47828 #include <linux/mtd/mtd.h>
47829 #include <linux/mtd/nand.h>
47830 #include <linux/mtd/nftl.h>
47831diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47832index c23184a..4115c41 100644
47833--- a/drivers/mtd/sm_ftl.c
47834+++ b/drivers/mtd/sm_ftl.c
47835@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47836 #define SM_CIS_VENDOR_OFFSET 0x59
47837 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47838 {
47839- struct attribute_group *attr_group;
47840+ attribute_group_no_const *attr_group;
47841 struct attribute **attributes;
47842 struct sm_sysfs_attribute *vendor_attribute;
47843 char *vendor;
47844diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47845index 7b11243..b3278a3 100644
47846--- a/drivers/net/bonding/bond_netlink.c
47847+++ b/drivers/net/bonding/bond_netlink.c
47848@@ -585,7 +585,7 @@ nla_put_failure:
47849 return -EMSGSIZE;
47850 }
47851
47852-struct rtnl_link_ops bond_link_ops __read_mostly = {
47853+struct rtnl_link_ops bond_link_ops = {
47854 .kind = "bond",
47855 .priv_size = sizeof(struct bonding),
47856 .setup = bond_setup,
47857diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47858index b3b922a..80bba38 100644
47859--- a/drivers/net/caif/caif_hsi.c
47860+++ b/drivers/net/caif/caif_hsi.c
47861@@ -1444,7 +1444,7 @@ err:
47862 return -ENODEV;
47863 }
47864
47865-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47866+static struct rtnl_link_ops caif_hsi_link_ops = {
47867 .kind = "cfhsi",
47868 .priv_size = sizeof(struct cfhsi),
47869 .setup = cfhsi_setup,
47870diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47871index e8c96b8..516a96c 100644
47872--- a/drivers/net/can/Kconfig
47873+++ b/drivers/net/can/Kconfig
47874@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47875
47876 config CAN_FLEXCAN
47877 tristate "Support for Freescale FLEXCAN based chips"
47878- depends on ARM || PPC
47879+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47880 ---help---
47881 Say Y here if you want to support for Freescale FlexCAN.
47882
47883diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47884index aede704..b516b4d 100644
47885--- a/drivers/net/can/dev.c
47886+++ b/drivers/net/can/dev.c
47887@@ -961,7 +961,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47888 return -EOPNOTSUPP;
47889 }
47890
47891-static struct rtnl_link_ops can_link_ops __read_mostly = {
47892+static struct rtnl_link_ops can_link_ops = {
47893 .kind = "can",
47894 .maxtype = IFLA_CAN_MAX,
47895 .policy = can_policy,
47896diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47897index 674f367..ec3a31f 100644
47898--- a/drivers/net/can/vcan.c
47899+++ b/drivers/net/can/vcan.c
47900@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
47901 dev->destructor = free_netdev;
47902 }
47903
47904-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47905+static struct rtnl_link_ops vcan_link_ops = {
47906 .kind = "vcan",
47907 .setup = vcan_setup,
47908 };
47909diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47910index 49adbf1..fff7ff8 100644
47911--- a/drivers/net/dummy.c
47912+++ b/drivers/net/dummy.c
47913@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47914 return 0;
47915 }
47916
47917-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47918+static struct rtnl_link_ops dummy_link_ops = {
47919 .kind = DRV_NAME,
47920 .setup = dummy_setup,
47921 .validate = dummy_validate,
47922diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47923index 0443654..4f0aa18 100644
47924--- a/drivers/net/ethernet/8390/ax88796.c
47925+++ b/drivers/net/ethernet/8390/ax88796.c
47926@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47927 if (ax->plat->reg_offsets)
47928 ei_local->reg_offset = ax->plat->reg_offsets;
47929 else {
47930+ resource_size_t _mem_size = mem_size;
47931+ do_div(_mem_size, 0x18);
47932 ei_local->reg_offset = ax->reg_offsets;
47933 for (ret = 0; ret < 0x18; ret++)
47934- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47935+ ax->reg_offsets[ret] = _mem_size * ret;
47936 }
47937
47938 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47939diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47940index da48e66..2dbec80 100644
47941--- a/drivers/net/ethernet/altera/altera_tse_main.c
47942+++ b/drivers/net/ethernet/altera/altera_tse_main.c
47943@@ -1256,7 +1256,7 @@ static int tse_shutdown(struct net_device *dev)
47944 return 0;
47945 }
47946
47947-static struct net_device_ops altera_tse_netdev_ops = {
47948+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47949 .ndo_open = tse_open,
47950 .ndo_stop = tse_shutdown,
47951 .ndo_start_xmit = tse_start_xmit,
47952@@ -1493,11 +1493,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47953 ndev->netdev_ops = &altera_tse_netdev_ops;
47954 altera_tse_set_ethtool_ops(ndev);
47955
47956+ pax_open_kernel();
47957 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47958
47959 if (priv->hash_filter)
47960 altera_tse_netdev_ops.ndo_set_rx_mode =
47961 tse_set_rx_mode_hashfilter;
47962+ pax_close_kernel();
47963
47964 /* Scatter/gather IO is not supported,
47965 * so it is turned off
47966diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47967index 34c28aa..5e06567 100644
47968--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47969+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47970@@ -1124,14 +1124,14 @@ do { \
47971 * operations, everything works on mask values.
47972 */
47973 #define XMDIO_READ(_pdata, _mmd, _reg) \
47974- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47975+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47976 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47977
47978 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47979 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47980
47981 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47982- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47983+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47984 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47985
47986 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47987diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47988index 8a50b01..39c1ad0 100644
47989--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47990+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47991@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47992
47993 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47994
47995- pdata->hw_if.config_dcb_tc(pdata);
47996+ pdata->hw_if->config_dcb_tc(pdata);
47997
47998 return 0;
47999 }
48000@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
48001
48002 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
48003
48004- pdata->hw_if.config_dcb_pfc(pdata);
48005+ pdata->hw_if->config_dcb_pfc(pdata);
48006
48007 return 0;
48008 }
48009diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48010index 5c92fb7..08be735 100644
48011--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48012+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
48013@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
48014
48015 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48016 {
48017- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48018+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48019 struct xgbe_channel *channel;
48020 struct xgbe_ring *ring;
48021 struct xgbe_ring_data *rdata;
48022@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
48023
48024 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
48025 {
48026- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48027+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48028 struct xgbe_channel *channel;
48029 struct xgbe_ring *ring;
48030 struct xgbe_ring_desc *rdesc;
48031@@ -620,17 +620,12 @@ err_out:
48032 return 0;
48033 }
48034
48035-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
48036-{
48037- DBGPR("-->xgbe_init_function_ptrs_desc\n");
48038-
48039- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
48040- desc_if->free_ring_resources = xgbe_free_ring_resources;
48041- desc_if->map_tx_skb = xgbe_map_tx_skb;
48042- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
48043- desc_if->unmap_rdata = xgbe_unmap_rdata;
48044- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
48045- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
48046-
48047- DBGPR("<--xgbe_init_function_ptrs_desc\n");
48048-}
48049+struct xgbe_desc_if default_xgbe_desc_if = {
48050+ .alloc_ring_resources = xgbe_alloc_ring_resources,
48051+ .free_ring_resources = xgbe_free_ring_resources,
48052+ .map_tx_skb = xgbe_map_tx_skb,
48053+ .map_rx_buffer = xgbe_map_rx_buffer,
48054+ .unmap_rdata = xgbe_unmap_rdata,
48055+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
48056+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
48057+};
48058diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48059index 21d9497..c74b40f 100644
48060--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48061+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
48062@@ -2772,7 +2772,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
48063
48064 static int xgbe_init(struct xgbe_prv_data *pdata)
48065 {
48066- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48067+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48068 int ret;
48069
48070 DBGPR("-->xgbe_init\n");
48071@@ -2838,106 +2838,101 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
48072 return 0;
48073 }
48074
48075-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
48076-{
48077- DBGPR("-->xgbe_init_function_ptrs\n");
48078-
48079- hw_if->tx_complete = xgbe_tx_complete;
48080-
48081- hw_if->set_mac_address = xgbe_set_mac_address;
48082- hw_if->config_rx_mode = xgbe_config_rx_mode;
48083-
48084- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
48085- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
48086-
48087- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
48088- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
48089- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
48090- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
48091- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
48092-
48093- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
48094- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
48095-
48096- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
48097- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
48098- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
48099-
48100- hw_if->enable_tx = xgbe_enable_tx;
48101- hw_if->disable_tx = xgbe_disable_tx;
48102- hw_if->enable_rx = xgbe_enable_rx;
48103- hw_if->disable_rx = xgbe_disable_rx;
48104-
48105- hw_if->powerup_tx = xgbe_powerup_tx;
48106- hw_if->powerdown_tx = xgbe_powerdown_tx;
48107- hw_if->powerup_rx = xgbe_powerup_rx;
48108- hw_if->powerdown_rx = xgbe_powerdown_rx;
48109-
48110- hw_if->dev_xmit = xgbe_dev_xmit;
48111- hw_if->dev_read = xgbe_dev_read;
48112- hw_if->enable_int = xgbe_enable_int;
48113- hw_if->disable_int = xgbe_disable_int;
48114- hw_if->init = xgbe_init;
48115- hw_if->exit = xgbe_exit;
48116+struct xgbe_hw_if default_xgbe_hw_if = {
48117+ .tx_complete = xgbe_tx_complete,
48118+
48119+ .set_mac_address = xgbe_set_mac_address,
48120+ .config_rx_mode = xgbe_config_rx_mode,
48121+
48122+ .enable_rx_csum = xgbe_enable_rx_csum,
48123+ .disable_rx_csum = xgbe_disable_rx_csum,
48124+
48125+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
48126+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
48127+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
48128+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
48129+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
48130+
48131+ .read_mmd_regs = xgbe_read_mmd_regs,
48132+ .write_mmd_regs = xgbe_write_mmd_regs,
48133+
48134+ .set_gmii_speed = xgbe_set_gmii_speed,
48135+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
48136+ .set_xgmii_speed = xgbe_set_xgmii_speed,
48137+
48138+ .enable_tx = xgbe_enable_tx,
48139+ .disable_tx = xgbe_disable_tx,
48140+ .enable_rx = xgbe_enable_rx,
48141+ .disable_rx = xgbe_disable_rx,
48142+
48143+ .powerup_tx = xgbe_powerup_tx,
48144+ .powerdown_tx = xgbe_powerdown_tx,
48145+ .powerup_rx = xgbe_powerup_rx,
48146+ .powerdown_rx = xgbe_powerdown_rx,
48147+
48148+ .dev_xmit = xgbe_dev_xmit,
48149+ .dev_read = xgbe_dev_read,
48150+ .enable_int = xgbe_enable_int,
48151+ .disable_int = xgbe_disable_int,
48152+ .init = xgbe_init,
48153+ .exit = xgbe_exit,
48154
48155 /* Descriptor related Sequences have to be initialized here */
48156- hw_if->tx_desc_init = xgbe_tx_desc_init;
48157- hw_if->rx_desc_init = xgbe_rx_desc_init;
48158- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
48159- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
48160- hw_if->is_last_desc = xgbe_is_last_desc;
48161- hw_if->is_context_desc = xgbe_is_context_desc;
48162- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
48163+ .tx_desc_init = xgbe_tx_desc_init,
48164+ .rx_desc_init = xgbe_rx_desc_init,
48165+ .tx_desc_reset = xgbe_tx_desc_reset,
48166+ .rx_desc_reset = xgbe_rx_desc_reset,
48167+ .is_last_desc = xgbe_is_last_desc,
48168+ .is_context_desc = xgbe_is_context_desc,
48169+ .tx_start_xmit = xgbe_tx_start_xmit,
48170
48171 /* For FLOW ctrl */
48172- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
48173- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
48174+ .config_tx_flow_control = xgbe_config_tx_flow_control,
48175+ .config_rx_flow_control = xgbe_config_rx_flow_control,
48176
48177 /* For RX coalescing */
48178- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
48179- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
48180- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
48181- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
48182+ .config_rx_coalesce = xgbe_config_rx_coalesce,
48183+ .config_tx_coalesce = xgbe_config_tx_coalesce,
48184+ .usec_to_riwt = xgbe_usec_to_riwt,
48185+ .riwt_to_usec = xgbe_riwt_to_usec,
48186
48187 /* For RX and TX threshold config */
48188- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
48189- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
48190+ .config_rx_threshold = xgbe_config_rx_threshold,
48191+ .config_tx_threshold = xgbe_config_tx_threshold,
48192
48193 /* For RX and TX Store and Forward Mode config */
48194- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
48195- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
48196+ .config_rsf_mode = xgbe_config_rsf_mode,
48197+ .config_tsf_mode = xgbe_config_tsf_mode,
48198
48199 /* For TX DMA Operating on Second Frame config */
48200- hw_if->config_osp_mode = xgbe_config_osp_mode;
48201+ .config_osp_mode = xgbe_config_osp_mode,
48202
48203 /* For RX and TX PBL config */
48204- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
48205- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
48206- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
48207- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
48208- hw_if->config_pblx8 = xgbe_config_pblx8;
48209+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
48210+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
48211+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
48212+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
48213+ .config_pblx8 = xgbe_config_pblx8,
48214
48215 /* For MMC statistics support */
48216- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
48217- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
48218- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
48219+ .tx_mmc_int = xgbe_tx_mmc_int,
48220+ .rx_mmc_int = xgbe_rx_mmc_int,
48221+ .read_mmc_stats = xgbe_read_mmc_stats,
48222
48223 /* For PTP config */
48224- hw_if->config_tstamp = xgbe_config_tstamp;
48225- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
48226- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
48227- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
48228- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
48229+ .config_tstamp = xgbe_config_tstamp,
48230+ .update_tstamp_addend = xgbe_update_tstamp_addend,
48231+ .set_tstamp_time = xgbe_set_tstamp_time,
48232+ .get_tstamp_time = xgbe_get_tstamp_time,
48233+ .get_tx_tstamp = xgbe_get_tx_tstamp,
48234
48235 /* For Data Center Bridging config */
48236- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
48237- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
48238+ .config_dcb_tc = xgbe_config_dcb_tc,
48239+ .config_dcb_pfc = xgbe_config_dcb_pfc,
48240
48241 /* For Receive Side Scaling */
48242- hw_if->enable_rss = xgbe_enable_rss;
48243- hw_if->disable_rss = xgbe_disable_rss;
48244- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48245- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48246-
48247- DBGPR("<--xgbe_init_function_ptrs\n");
48248-}
48249+ .enable_rss = xgbe_enable_rss,
48250+ .disable_rss = xgbe_disable_rss,
48251+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48252+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48253+};
48254diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48255index 9fd6c69..588ff02 100644
48256--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48257+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48258@@ -243,7 +243,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48259 * support, tell it now
48260 */
48261 if (ring->tx.xmit_more)
48262- pdata->hw_if.tx_start_xmit(channel, ring);
48263+ pdata->hw_if->tx_start_xmit(channel, ring);
48264
48265 return NETDEV_TX_BUSY;
48266 }
48267@@ -271,7 +271,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48268
48269 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48270 {
48271- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48272+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48273 struct xgbe_channel *channel;
48274 enum xgbe_int int_id;
48275 unsigned int i;
48276@@ -293,7 +293,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48277
48278 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48279 {
48280- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48281+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48282 struct xgbe_channel *channel;
48283 enum xgbe_int int_id;
48284 unsigned int i;
48285@@ -316,7 +316,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48286 static irqreturn_t xgbe_isr(int irq, void *data)
48287 {
48288 struct xgbe_prv_data *pdata = data;
48289- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48290+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48291 struct xgbe_channel *channel;
48292 unsigned int dma_isr, dma_ch_isr;
48293 unsigned int mac_isr, mac_tssr;
48294@@ -682,7 +682,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48295
48296 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48297 {
48298- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48299+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48300
48301 DBGPR("-->xgbe_init_tx_coalesce\n");
48302
48303@@ -696,7 +696,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48304
48305 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48306 {
48307- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48308+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48309
48310 DBGPR("-->xgbe_init_rx_coalesce\n");
48311
48312@@ -711,7 +711,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48313
48314 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48315 {
48316- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48317+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48318 struct xgbe_channel *channel;
48319 struct xgbe_ring *ring;
48320 struct xgbe_ring_data *rdata;
48321@@ -736,7 +736,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48322
48323 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48324 {
48325- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48326+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48327 struct xgbe_channel *channel;
48328 struct xgbe_ring *ring;
48329 struct xgbe_ring_data *rdata;
48330@@ -762,7 +762,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48331 static void xgbe_adjust_link(struct net_device *netdev)
48332 {
48333 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48334- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48335+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48336 struct phy_device *phydev = pdata->phydev;
48337 int new_state = 0;
48338
48339@@ -870,7 +870,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48340 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48341 {
48342 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48343- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48344+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48345 unsigned long flags;
48346
48347 DBGPR("-->xgbe_powerdown\n");
48348@@ -908,7 +908,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48349 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48350 {
48351 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48352- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48353+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48354 unsigned long flags;
48355
48356 DBGPR("-->xgbe_powerup\n");
48357@@ -945,7 +945,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48358
48359 static int xgbe_start(struct xgbe_prv_data *pdata)
48360 {
48361- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48362+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48363 struct net_device *netdev = pdata->netdev;
48364 int ret;
48365
48366@@ -984,7 +984,7 @@ err_napi:
48367
48368 static void xgbe_stop(struct xgbe_prv_data *pdata)
48369 {
48370- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48371+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48372 struct xgbe_channel *channel;
48373 struct net_device *netdev = pdata->netdev;
48374 struct netdev_queue *txq;
48375@@ -1211,7 +1211,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48376 return -ERANGE;
48377 }
48378
48379- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48380+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48381
48382 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48383
48384@@ -1360,7 +1360,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48385 static int xgbe_open(struct net_device *netdev)
48386 {
48387 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48388- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48389+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48390 int ret;
48391
48392 DBGPR("-->xgbe_open\n");
48393@@ -1432,7 +1432,7 @@ err_phy_init:
48394 static int xgbe_close(struct net_device *netdev)
48395 {
48396 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48397- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48398+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48399
48400 DBGPR("-->xgbe_close\n");
48401
48402@@ -1460,8 +1460,8 @@ static int xgbe_close(struct net_device *netdev)
48403 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48404 {
48405 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48406- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48407- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48408+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48409+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48410 struct xgbe_channel *channel;
48411 struct xgbe_ring *ring;
48412 struct xgbe_packet_data *packet;
48413@@ -1529,7 +1529,7 @@ tx_netdev_return:
48414 static void xgbe_set_rx_mode(struct net_device *netdev)
48415 {
48416 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48417- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48418+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48419
48420 DBGPR("-->xgbe_set_rx_mode\n");
48421
48422@@ -1541,7 +1541,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48423 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48424 {
48425 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48426- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48427+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48428 struct sockaddr *saddr = addr;
48429
48430 DBGPR("-->xgbe_set_mac_address\n");
48431@@ -1616,7 +1616,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48432
48433 DBGPR("-->%s\n", __func__);
48434
48435- pdata->hw_if.read_mmc_stats(pdata);
48436+ pdata->hw_if->read_mmc_stats(pdata);
48437
48438 s->rx_packets = pstats->rxframecount_gb;
48439 s->rx_bytes = pstats->rxoctetcount_gb;
48440@@ -1643,7 +1643,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48441 u16 vid)
48442 {
48443 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48444- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48445+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48446
48447 DBGPR("-->%s\n", __func__);
48448
48449@@ -1659,7 +1659,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48450 u16 vid)
48451 {
48452 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48453- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48454+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48455
48456 DBGPR("-->%s\n", __func__);
48457
48458@@ -1725,7 +1725,7 @@ static int xgbe_set_features(struct net_device *netdev,
48459 netdev_features_t features)
48460 {
48461 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48462- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48463+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48464 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48465 int ret = 0;
48466
48467@@ -1791,8 +1791,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48468 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48469 {
48470 struct xgbe_prv_data *pdata = channel->pdata;
48471- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48472- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48473+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48474+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48475 struct xgbe_ring *ring = channel->rx_ring;
48476 struct xgbe_ring_data *rdata;
48477
48478@@ -1847,8 +1847,8 @@ static struct sk_buff *xgbe_create_skb(struct napi_struct *napi,
48479 static int xgbe_tx_poll(struct xgbe_channel *channel)
48480 {
48481 struct xgbe_prv_data *pdata = channel->pdata;
48482- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48483- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48484+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48485+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48486 struct xgbe_ring *ring = channel->tx_ring;
48487 struct xgbe_ring_data *rdata;
48488 struct xgbe_ring_desc *rdesc;
48489@@ -1913,7 +1913,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48490 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48491 {
48492 struct xgbe_prv_data *pdata = channel->pdata;
48493- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48494+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48495 struct xgbe_ring *ring = channel->rx_ring;
48496 struct xgbe_ring_data *rdata;
48497 struct xgbe_packet_data *packet;
48498diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48499index 5f149e8..6736bf4 100644
48500--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48501+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48502@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48503
48504 DBGPR("-->%s\n", __func__);
48505
48506- pdata->hw_if.read_mmc_stats(pdata);
48507+ pdata->hw_if->read_mmc_stats(pdata);
48508 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48509 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48510 *data++ = *(u64 *)stat;
48511@@ -396,7 +396,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48512 struct ethtool_coalesce *ec)
48513 {
48514 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48515- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48516+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48517 unsigned int rx_frames, rx_riwt, rx_usecs;
48518 unsigned int tx_frames;
48519
48520@@ -521,7 +521,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48521 const u8 *key, const u8 hfunc)
48522 {
48523 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48524- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48525+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48526 unsigned int ret;
48527
48528 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48529diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48530index 7149053..889c5492 100644
48531--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48532+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48533@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48534 DBGPR("<--xgbe_default_config\n");
48535 }
48536
48537-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48538-{
48539- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48540- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48541-}
48542-
48543 #ifdef CONFIG_ACPI
48544 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48545 {
48546@@ -387,9 +381,8 @@ static int xgbe_probe(struct platform_device *pdev)
48547 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48548
48549 /* Set all the function pointers */
48550- xgbe_init_all_fptrs(pdata);
48551- hw_if = &pdata->hw_if;
48552- desc_if = &pdata->desc_if;
48553+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48554+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48555
48556 /* Issue software reset to device */
48557 hw_if->exit(pdata);
48558diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48559index 59e267f..0842a88 100644
48560--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48561+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48562@@ -126,7 +126,7 @@
48563 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48564 {
48565 struct xgbe_prv_data *pdata = mii->priv;
48566- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48567+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48568 int mmd_data;
48569
48570 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48571@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48572 u16 mmd_val)
48573 {
48574 struct xgbe_prv_data *pdata = mii->priv;
48575- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48576+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48577 int mmd_data = mmd_val;
48578
48579 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48580diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48581index b03e4f5..78e4cc4 100644
48582--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48583+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48584@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48585 tstamp_cc);
48586 u64 nsec;
48587
48588- nsec = pdata->hw_if.get_tstamp_time(pdata);
48589+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48590
48591 return nsec;
48592 }
48593@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48594
48595 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48596
48597- pdata->hw_if.update_tstamp_addend(pdata, addend);
48598+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48599
48600 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48601
48602diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48603index e62dfa2..7df28d5 100644
48604--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48605+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48606@@ -673,8 +673,8 @@ struct xgbe_prv_data {
48607 int dev_irq;
48608 unsigned int per_channel_irq;
48609
48610- struct xgbe_hw_if hw_if;
48611- struct xgbe_desc_if desc_if;
48612+ struct xgbe_hw_if *hw_if;
48613+ struct xgbe_desc_if *desc_if;
48614
48615 /* AXI DMA settings */
48616 unsigned int coherent;
48617@@ -797,6 +797,9 @@ struct xgbe_prv_data {
48618 #endif
48619 };
48620
48621+extern struct xgbe_hw_if default_xgbe_hw_if;
48622+extern struct xgbe_desc_if default_xgbe_desc_if;
48623+
48624 /* Function prototypes*/
48625
48626 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48627diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c
48628index 783543a..a472348 100644
48629--- a/drivers/net/ethernet/broadcom/bcmsysport.c
48630+++ b/drivers/net/ethernet/broadcom/bcmsysport.c
48631@@ -1721,7 +1721,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
48632 macaddr = of_get_mac_address(dn);
48633 if (!macaddr || !is_valid_ether_addr(macaddr)) {
48634 dev_warn(&pdev->dev, "using random Ethernet MAC\n");
48635- random_ether_addr(dev->dev_addr);
48636+ eth_hw_addr_random(dev);
48637 } else {
48638 ether_addr_copy(dev->dev_addr, macaddr);
48639 }
48640diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48641index d7a7175..7011194 100644
48642--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48643+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48644@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48645 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48646 {
48647 /* RX_MODE controlling object */
48648- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48649+ bnx2x_init_rx_mode_obj(bp);
48650
48651 /* multicast configuration controlling object */
48652 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48653diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48654index 07cdf9b..b08ecc7 100644
48655--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48656+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48657@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48658 return rc;
48659 }
48660
48661-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48662- struct bnx2x_rx_mode_obj *o)
48663+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48664 {
48665 if (CHIP_IS_E1x(bp)) {
48666- o->wait_comp = bnx2x_empty_rx_mode_wait;
48667- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48668+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48669+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48670 } else {
48671- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48672- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48673+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48674+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48675 }
48676 }
48677
48678diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48679index 86baecb..ff3bb46 100644
48680--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48681+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48682@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48683
48684 /********************* RX MODE ****************/
48685
48686-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48687- struct bnx2x_rx_mode_obj *o);
48688+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48689
48690 /**
48691 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48692diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48693index 31c9f82..e65e986 100644
48694--- a/drivers/net/ethernet/broadcom/tg3.h
48695+++ b/drivers/net/ethernet/broadcom/tg3.h
48696@@ -150,6 +150,7 @@
48697 #define CHIPREV_ID_5750_A0 0x4000
48698 #define CHIPREV_ID_5750_A1 0x4001
48699 #define CHIPREV_ID_5750_A3 0x4003
48700+#define CHIPREV_ID_5750_C1 0x4201
48701 #define CHIPREV_ID_5750_C2 0x4202
48702 #define CHIPREV_ID_5752_A0_HW 0x5000
48703 #define CHIPREV_ID_5752_A0 0x6000
48704diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48705index deb8da6..45d473b 100644
48706--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48707+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48708@@ -1694,10 +1694,10 @@ bna_cb_ioceth_reset(void *arg)
48709 }
48710
48711 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48712- bna_cb_ioceth_enable,
48713- bna_cb_ioceth_disable,
48714- bna_cb_ioceth_hbfail,
48715- bna_cb_ioceth_reset
48716+ .enable_cbfn = bna_cb_ioceth_enable,
48717+ .disable_cbfn = bna_cb_ioceth_disable,
48718+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48719+ .reset_cbfn = bna_cb_ioceth_reset
48720 };
48721
48722 static void bna_attr_init(struct bna_ioceth *ioceth)
48723diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48724index 8cffcdf..aadf043 100644
48725--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48726+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48727@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48728 */
48729 struct l2t_skb_cb {
48730 arp_failure_handler_func arp_failure_handler;
48731-};
48732+} __no_const;
48733
48734 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48735
48736diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48737index badff18..e15c4ec 100644
48738--- a/drivers/net/ethernet/dec/tulip/de4x5.c
48739+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48740@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48741 for (i=0; i<ETH_ALEN; i++) {
48742 tmp.addr[i] = dev->dev_addr[i];
48743 }
48744- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48745+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48746 break;
48747
48748 case DE4X5_SET_HWADDR: /* Set the hardware address */
48749@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48750 spin_lock_irqsave(&lp->lock, flags);
48751 memcpy(&statbuf, &lp->pktStats, ioc->len);
48752 spin_unlock_irqrestore(&lp->lock, flags);
48753- if (copy_to_user(ioc->data, &statbuf, ioc->len))
48754+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48755 return -EFAULT;
48756 break;
48757 }
48758diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48759index e43cc8a..f1cf67c 100644
48760--- a/drivers/net/ethernet/emulex/benet/be_main.c
48761+++ b/drivers/net/ethernet/emulex/benet/be_main.c
48762@@ -539,7 +539,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48763
48764 if (wrapped)
48765 newacc += 65536;
48766- ACCESS_ONCE(*acc) = newacc;
48767+ ACCESS_ONCE_RW(*acc) = newacc;
48768 }
48769
48770 static void populate_erx_stats(struct be_adapter *adapter,
48771diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48772index 6d0c5d5..55be363 100644
48773--- a/drivers/net/ethernet/faraday/ftgmac100.c
48774+++ b/drivers/net/ethernet/faraday/ftgmac100.c
48775@@ -30,6 +30,8 @@
48776 #include <linux/netdevice.h>
48777 #include <linux/phy.h>
48778 #include <linux/platform_device.h>
48779+#include <linux/interrupt.h>
48780+#include <linux/irqreturn.h>
48781 #include <net/ip.h>
48782
48783 #include "ftgmac100.h"
48784diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48785index dce5f7b..2433466 100644
48786--- a/drivers/net/ethernet/faraday/ftmac100.c
48787+++ b/drivers/net/ethernet/faraday/ftmac100.c
48788@@ -31,6 +31,8 @@
48789 #include <linux/module.h>
48790 #include <linux/netdevice.h>
48791 #include <linux/platform_device.h>
48792+#include <linux/interrupt.h>
48793+#include <linux/irqreturn.h>
48794
48795 #include "ftmac100.h"
48796
48797diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_main.c b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
48798index c754b20..c9da1b5 100644
48799--- a/drivers/net/ethernet/intel/fm10k/fm10k_main.c
48800+++ b/drivers/net/ethernet/intel/fm10k/fm10k_main.c
48801@@ -216,7 +216,7 @@ static void fm10k_reuse_rx_page(struct fm10k_ring *rx_ring,
48802
48803 static inline bool fm10k_page_is_reserved(struct page *page)
48804 {
48805- return (page_to_nid(page) != numa_mem_id()) || page->pfmemalloc;
48806+ return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
48807 }
48808
48809 static bool fm10k_can_reuse_rx_page(struct fm10k_rx_buffer *rx_buffer,
48810diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48811index a92b772..250fe69 100644
48812--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48813+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48814@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48815 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48816
48817 /* Update the base adjustement value. */
48818- ACCESS_ONCE(pf->ptp_base_adj) = incval;
48819+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48820 smp_mb(); /* Force the above update. */
48821 }
48822
48823diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
48824index a0a9b1f..3fe93e7 100644
48825--- a/drivers/net/ethernet/intel/igb/igb_main.c
48826+++ b/drivers/net/ethernet/intel/igb/igb_main.c
48827@@ -6584,7 +6584,7 @@ static void igb_reuse_rx_page(struct igb_ring *rx_ring,
48828
48829 static inline bool igb_page_is_reserved(struct page *page)
48830 {
48831- return (page_to_nid(page) != numa_mem_id()) || page->pfmemalloc;
48832+ return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
48833 }
48834
48835 static bool igb_can_reuse_rx_page(struct igb_rx_buffer *rx_buffer,
48836diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
48837index 5be12a0..463ff47 100644
48838--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
48839+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
48840@@ -1829,7 +1829,7 @@ static void ixgbe_reuse_rx_page(struct ixgbe_ring *rx_ring,
48841
48842 static inline bool ixgbe_page_is_reserved(struct page *page)
48843 {
48844- return (page_to_nid(page) != numa_mem_id()) || page->pfmemalloc;
48845+ return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
48846 }
48847
48848 /**
48849diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48850index e5ba040..d47531c 100644
48851--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48852+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48853@@ -782,7 +782,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48854 }
48855
48856 /* update the base incval used to calculate frequency adjustment */
48857- ACCESS_ONCE(adapter->base_incval) = incval;
48858+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
48859 smp_mb();
48860
48861 /* need lock to prevent incorrect read while modifying cyclecounter */
48862diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
48863index e71cdde..1d7b00b 100644
48864--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
48865+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
48866@@ -765,7 +765,7 @@ static void ixgbevf_reuse_rx_page(struct ixgbevf_ring *rx_ring,
48867
48868 static inline bool ixgbevf_page_is_reserved(struct page *page)
48869 {
48870- return (page_to_nid(page) != numa_mem_id()) || page->pfmemalloc;
48871+ return (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);
48872 }
48873
48874 /**
48875diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
48876index 74d0389..086ac03 100644
48877--- a/drivers/net/ethernet/marvell/mvneta.c
48878+++ b/drivers/net/ethernet/marvell/mvneta.c
48879@@ -1462,7 +1462,7 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48880 struct mvneta_rx_queue *rxq)
48881 {
48882 struct net_device *dev = pp->dev;
48883- int rx_done, rx_filled;
48884+ int rx_done;
48885 u32 rcvd_pkts = 0;
48886 u32 rcvd_bytes = 0;
48887
48888@@ -1473,7 +1473,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48889 rx_todo = rx_done;
48890
48891 rx_done = 0;
48892- rx_filled = 0;
48893
48894 /* Fairness NAPI loop */
48895 while (rx_done < rx_todo) {
48896@@ -1484,7 +1483,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48897 int rx_bytes, err;
48898
48899 rx_done++;
48900- rx_filled++;
48901 rx_status = rx_desc->status;
48902 rx_bytes = rx_desc->data_size - (ETH_FCS_LEN + MVNETA_MH_SIZE);
48903 data = (unsigned char *)rx_desc->buf_cookie;
48904@@ -1524,6 +1522,14 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48905 continue;
48906 }
48907
48908+ /* Refill processing */
48909+ err = mvneta_rx_refill(pp, rx_desc);
48910+ if (err) {
48911+ netdev_err(dev, "Linux processing - Can't refill\n");
48912+ rxq->missed++;
48913+ goto err_drop_frame;
48914+ }
48915+
48916 skb = build_skb(data, pp->frag_size > PAGE_SIZE ? 0 : pp->frag_size);
48917 if (!skb)
48918 goto err_drop_frame;
48919@@ -1543,14 +1549,6 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48920 mvneta_rx_csum(pp, rx_status, skb);
48921
48922 napi_gro_receive(&pp->napi, skb);
48923-
48924- /* Refill processing */
48925- err = mvneta_rx_refill(pp, rx_desc);
48926- if (err) {
48927- netdev_err(dev, "Linux processing - Can't refill\n");
48928- rxq->missed++;
48929- rx_filled--;
48930- }
48931 }
48932
48933 if (rcvd_pkts) {
48934@@ -1563,7 +1561,7 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo,
48935 }
48936
48937 /* Update rxq management counters */
48938- mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_filled);
48939+ mvneta_rxq_desc_num_update(pp, rxq, rx_done, rx_done);
48940
48941 return rx_done;
48942 }
48943diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48944index c10d98f..72914c6 100644
48945--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48946+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48947@@ -475,8 +475,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48948 wmb();
48949
48950 /* we want to dirty this cache line once */
48951- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48952- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48953+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48954+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48955
48956 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48957
48958diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48959index 6223930..975033d 100644
48960--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48961+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48962@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48963 struct __vxge_hw_fifo *fifo;
48964 struct vxge_hw_fifo_config *config;
48965 u32 txdl_size, txdl_per_memblock;
48966- struct vxge_hw_mempool_cbs fifo_mp_callback;
48967+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48968+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48969+ };
48970+
48971 struct __vxge_hw_virtualpath *vpath;
48972
48973 if ((vp == NULL) || (attr == NULL)) {
48974@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48975 goto exit;
48976 }
48977
48978- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48979-
48980 fifo->mempool =
48981 __vxge_hw_mempool_create(vpath->hldev,
48982 fifo->config->memblock_size,
48983diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48984index 33669c2..674c39a 100644
48985--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48986+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48987@@ -1415,7 +1415,7 @@ static int qlcnic_83xx_copy_fw_file(struct qlcnic_adapter *adapter)
48988 if (fw->size & 0xF) {
48989 addr = dest + size;
48990 for (i = 0; i < (fw->size & 0xF); i++)
48991- data[i] = temp[size + i];
48992+ data[i] = ((u8 *)temp)[size + i];
48993 for (; i < 16; i++)
48994 data[i] = 0;
48995 ret = qlcnic_ms_mem_write128(adapter, addr,
48996@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48997 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48998 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48999 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
49000- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49001+ pax_open_kernel();
49002+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
49003+ pax_close_kernel();
49004 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49005 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
49006 max_tx_rings = QLCNIC_MAX_TX_RINGS;
49007diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49008index be7d7a6..a8983f8 100644
49009--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49010+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
49011@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
49012 case QLCNIC_NON_PRIV_FUNC:
49013 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
49014 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49015- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49016+ pax_open_kernel();
49017+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
49018+ pax_close_kernel();
49019 break;
49020 case QLCNIC_PRIV_FUNC:
49021 ahw->op_mode = QLCNIC_PRIV_FUNC;
49022 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
49023- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49024+ pax_open_kernel();
49025+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
49026+ pax_close_kernel();
49027 break;
49028 case QLCNIC_MGMT_FUNC:
49029 ahw->op_mode = QLCNIC_MGMT_FUNC;
49030 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
49031- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49032+ pax_open_kernel();
49033+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
49034+ pax_close_kernel();
49035 break;
49036 default:
49037 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
49038diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49039index 332bb8a..e6adcd1 100644
49040--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49041+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
49042@@ -1285,7 +1285,7 @@ flash_temp:
49043 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
49044 {
49045 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
49046- static const struct qlcnic_dump_operations *fw_dump_ops;
49047+ const struct qlcnic_dump_operations *fw_dump_ops;
49048 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
49049 u32 entry_offset, dump, no_entries, buf_offset = 0;
49050 int i, k, ops_cnt, ops_index, dump_size = 0;
49051diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
49052index 3df51fa..e9b517f 100644
49053--- a/drivers/net/ethernet/realtek/r8169.c
49054+++ b/drivers/net/ethernet/realtek/r8169.c
49055@@ -788,22 +788,22 @@ struct rtl8169_private {
49056 struct mdio_ops {
49057 void (*write)(struct rtl8169_private *, int, int);
49058 int (*read)(struct rtl8169_private *, int);
49059- } mdio_ops;
49060+ } __no_const mdio_ops;
49061
49062 struct pll_power_ops {
49063 void (*down)(struct rtl8169_private *);
49064 void (*up)(struct rtl8169_private *);
49065- } pll_power_ops;
49066+ } __no_const pll_power_ops;
49067
49068 struct jumbo_ops {
49069 void (*enable)(struct rtl8169_private *);
49070 void (*disable)(struct rtl8169_private *);
49071- } jumbo_ops;
49072+ } __no_const jumbo_ops;
49073
49074 struct csi_ops {
49075 void (*write)(struct rtl8169_private *, int, int);
49076 u32 (*read)(struct rtl8169_private *, int);
49077- } csi_ops;
49078+ } __no_const csi_ops;
49079
49080 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
49081 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
49082diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
49083index a2e9aee..af41a0e 100644
49084--- a/drivers/net/ethernet/sfc/ptp.c
49085+++ b/drivers/net/ethernet/sfc/ptp.c
49086@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
49087 ptp->start.dma_addr);
49088
49089 /* Clear flag that signals MC ready */
49090- ACCESS_ONCE(*start) = 0;
49091+ ACCESS_ONCE_RW(*start) = 0;
49092 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
49093 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
49094 EFX_BUG_ON_PARANOID(rc);
49095diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49096index 08c483b..2c4a553 100644
49097--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49098+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
49099@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
49100
49101 writel(value, ioaddr + MMC_CNTRL);
49102
49103- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49104- MMC_CNTRL, value);
49105+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
49106+// MMC_CNTRL, value);
49107 }
49108
49109 /* To mask all all interrupts.*/
49110diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
49111index de28504..7f1c1cd 100644
49112--- a/drivers/net/ethernet/via/via-rhine.c
49113+++ b/drivers/net/ethernet/via/via-rhine.c
49114@@ -2525,7 +2525,7 @@ static struct platform_driver rhine_driver_platform = {
49115 }
49116 };
49117
49118-static struct dmi_system_id rhine_dmi_table[] __initdata = {
49119+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
49120 {
49121 .ident = "EPIA-M",
49122 .matches = {
49123diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
49124index 41071d3..6e362e1 100644
49125--- a/drivers/net/hyperv/hyperv_net.h
49126+++ b/drivers/net/hyperv/hyperv_net.h
49127@@ -176,7 +176,7 @@ struct rndis_device {
49128 enum rndis_device_state state;
49129 bool link_state;
49130 bool link_change;
49131- atomic_t new_req_id;
49132+ atomic_unchecked_t new_req_id;
49133
49134 spinlock_t request_lock;
49135 struct list_head req_list;
49136diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
49137index 9118cea..1a8e06a 100644
49138--- a/drivers/net/hyperv/rndis_filter.c
49139+++ b/drivers/net/hyperv/rndis_filter.c
49140@@ -100,7 +100,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
49141 * template
49142 */
49143 set = &rndis_msg->msg.set_req;
49144- set->req_id = atomic_inc_return(&dev->new_req_id);
49145+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49146
49147 /* Add to the request list */
49148 spin_lock_irqsave(&dev->request_lock, flags);
49149@@ -923,7 +923,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
49150
49151 /* Setup the rndis set */
49152 halt = &request->request_msg.msg.halt_req;
49153- halt->req_id = atomic_inc_return(&dev->new_req_id);
49154+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
49155
49156 /* Ignore return since this msg is optional. */
49157 rndis_filter_send_request(dev, request);
49158diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
49159index 94570aa..1a798e1 100644
49160--- a/drivers/net/ifb.c
49161+++ b/drivers/net/ifb.c
49162@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
49163 return 0;
49164 }
49165
49166-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
49167+static struct rtnl_link_ops ifb_link_ops = {
49168 .kind = "ifb",
49169 .priv_size = sizeof(struct ifb_private),
49170 .setup = ifb_setup,
49171diff --git a/drivers/net/ipvlan/ipvlan.h b/drivers/net/ipvlan/ipvlan.h
49172index 54549a6..0799442 100644
49173--- a/drivers/net/ipvlan/ipvlan.h
49174+++ b/drivers/net/ipvlan/ipvlan.h
49175@@ -102,6 +102,11 @@ static inline struct ipvl_port *ipvlan_port_get_rcu(const struct net_device *d)
49176 return rcu_dereference(d->rx_handler_data);
49177 }
49178
49179+static inline struct ipvl_port *ipvlan_port_get_rcu_bh(const struct net_device *d)
49180+{
49181+ return rcu_dereference_bh(d->rx_handler_data);
49182+}
49183+
49184 static inline struct ipvl_port *ipvlan_port_get_rtnl(const struct net_device *d)
49185 {
49186 return rtnl_dereference(d->rx_handler_data);
49187diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
49188index c30b5c3..b349dad 100644
49189--- a/drivers/net/ipvlan/ipvlan_core.c
49190+++ b/drivers/net/ipvlan/ipvlan_core.c
49191@@ -507,7 +507,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
49192 int ipvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
49193 {
49194 struct ipvl_dev *ipvlan = netdev_priv(dev);
49195- struct ipvl_port *port = ipvlan_port_get_rcu(ipvlan->phy_dev);
49196+ struct ipvl_port *port = ipvlan_port_get_rcu_bh(ipvlan->phy_dev);
49197
49198 if (!port)
49199 goto out;
49200diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
49201index 9f59f17..52cb38f 100644
49202--- a/drivers/net/macvlan.c
49203+++ b/drivers/net/macvlan.c
49204@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
49205 free_nskb:
49206 kfree_skb(nskb);
49207 err:
49208- atomic_long_inc(&skb->dev->rx_dropped);
49209+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
49210 }
49211
49212 static void macvlan_flush_sources(struct macvlan_port *port,
49213@@ -1480,13 +1480,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
49214 int macvlan_link_register(struct rtnl_link_ops *ops)
49215 {
49216 /* common fields */
49217- ops->priv_size = sizeof(struct macvlan_dev);
49218- ops->validate = macvlan_validate;
49219- ops->maxtype = IFLA_MACVLAN_MAX;
49220- ops->policy = macvlan_policy;
49221- ops->changelink = macvlan_changelink;
49222- ops->get_size = macvlan_get_size;
49223- ops->fill_info = macvlan_fill_info;
49224+ pax_open_kernel();
49225+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
49226+ *(void **)&ops->validate = macvlan_validate;
49227+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
49228+ *(const void **)&ops->policy = macvlan_policy;
49229+ *(void **)&ops->changelink = macvlan_changelink;
49230+ *(void **)&ops->get_size = macvlan_get_size;
49231+ *(void **)&ops->fill_info = macvlan_fill_info;
49232+ pax_close_kernel();
49233
49234 return rtnl_link_register(ops);
49235 };
49236@@ -1572,7 +1574,7 @@ static int macvlan_device_event(struct notifier_block *unused,
49237 return NOTIFY_DONE;
49238 }
49239
49240-static struct notifier_block macvlan_notifier_block __read_mostly = {
49241+static struct notifier_block macvlan_notifier_block = {
49242 .notifier_call = macvlan_device_event,
49243 };
49244
49245diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
49246index 8c350c5..30fdc98 100644
49247--- a/drivers/net/macvtap.c
49248+++ b/drivers/net/macvtap.c
49249@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
49250 dev->tx_queue_len = TUN_READQ_SIZE;
49251 }
49252
49253-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
49254+static struct rtnl_link_ops macvtap_link_ops = {
49255 .kind = "macvtap",
49256 .setup = macvtap_setup,
49257 .newlink = macvtap_newlink,
49258@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
49259
49260 ret = 0;
49261 u = q->flags;
49262- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49263+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
49264 put_user(u, &ifr->ifr_flags))
49265 ret = -EFAULT;
49266 macvtap_put_vlan(vlan);
49267@@ -1214,7 +1214,7 @@ static int macvtap_device_event(struct notifier_block *unused,
49268 return NOTIFY_DONE;
49269 }
49270
49271-static struct notifier_block macvtap_notifier_block __read_mostly = {
49272+static struct notifier_block macvtap_notifier_block = {
49273 .notifier_call = macvtap_device_event,
49274 };
49275
49276@@ -1268,6 +1268,7 @@ static void macvtap_exit(void)
49277 class_unregister(macvtap_class);
49278 cdev_del(&macvtap_cdev);
49279 unregister_chrdev_region(macvtap_major, MACVTAP_NUM_DEVS);
49280+ idr_destroy(&minor_idr);
49281 }
49282 module_exit(macvtap_exit);
49283
49284diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
49285index 34924df..a747360 100644
49286--- a/drivers/net/nlmon.c
49287+++ b/drivers/net/nlmon.c
49288@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
49289 return 0;
49290 }
49291
49292-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
49293+static struct rtnl_link_ops nlmon_link_ops = {
49294 .kind = "nlmon",
49295 .priv_size = sizeof(struct nlmon),
49296 .setup = nlmon_setup,
49297diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
49298index d551df6..fa4c2df 100644
49299--- a/drivers/net/phy/phy_device.c
49300+++ b/drivers/net/phy/phy_device.c
49301@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
49302 * zero on success.
49303 *
49304 */
49305-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49306+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
49307 struct phy_c45_device_ids *c45_ids) {
49308 int phy_reg;
49309 int i, reg_addr;
49310@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
49311 * its return value is in turn returned.
49312 *
49313 */
49314-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49315+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
49316 bool is_c45, struct phy_c45_device_ids *c45_ids)
49317 {
49318 int phy_reg;
49319@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
49320 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
49321 {
49322 struct phy_c45_device_ids c45_ids = {0};
49323- u32 phy_id = 0;
49324+ int phy_id = 0;
49325 int r;
49326
49327 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
49328diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
49329index 9d15566..5ad4ef6 100644
49330--- a/drivers/net/ppp/ppp_generic.c
49331+++ b/drivers/net/ppp/ppp_generic.c
49332@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49333 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
49334 struct ppp_stats stats;
49335 struct ppp_comp_stats cstats;
49336- char *vers;
49337
49338 switch (cmd) {
49339 case SIOCGPPPSTATS:
49340@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
49341 break;
49342
49343 case SIOCGPPPVER:
49344- vers = PPP_VERSION;
49345- if (copy_to_user(addr, vers, strlen(vers) + 1))
49346+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
49347 break;
49348 err = 0;
49349 break;
49350diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
49351index 079f7ad..b2a2bfa7 100644
49352--- a/drivers/net/slip/slhc.c
49353+++ b/drivers/net/slip/slhc.c
49354@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
49355 register struct tcphdr *thp;
49356 register struct iphdr *ip;
49357 register struct cstate *cs;
49358- int len, hdrlen;
49359+ long len, hdrlen;
49360 unsigned char *cp = icp;
49361
49362 /* We've got a compressed packet; read the change byte */
49363diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
49364index 6928448..e30c57f 100644
49365--- a/drivers/net/team/team.c
49366+++ b/drivers/net/team/team.c
49367@@ -2103,7 +2103,7 @@ static unsigned int team_get_num_rx_queues(void)
49368 return TEAM_DEFAULT_NUM_RX_QUEUES;
49369 }
49370
49371-static struct rtnl_link_ops team_link_ops __read_mostly = {
49372+static struct rtnl_link_ops team_link_ops = {
49373 .kind = DRV_NAME,
49374 .priv_size = sizeof(struct team),
49375 .setup = team_setup,
49376@@ -2893,7 +2893,7 @@ static int team_device_event(struct notifier_block *unused,
49377 return NOTIFY_DONE;
49378 }
49379
49380-static struct notifier_block team_notifier_block __read_mostly = {
49381+static struct notifier_block team_notifier_block = {
49382 .notifier_call = team_device_event,
49383 };
49384
49385diff --git a/drivers/net/tun.c b/drivers/net/tun.c
49386index e470ae5..e812f5e 100644
49387--- a/drivers/net/tun.c
49388+++ b/drivers/net/tun.c
49389@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49390 return -EINVAL;
49391 }
49392
49393-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49394+static struct rtnl_link_ops tun_link_ops = {
49395 .kind = DRV_NAME,
49396 .priv_size = sizeof(struct tun_struct),
49397 .setup = tun_setup,
49398@@ -1828,7 +1828,7 @@ unlock:
49399 }
49400
49401 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49402- unsigned long arg, int ifreq_len)
49403+ unsigned long arg, size_t ifreq_len)
49404 {
49405 struct tun_file *tfile = file->private_data;
49406 struct tun_struct *tun;
49407@@ -1842,6 +1842,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49408 int le;
49409 int ret;
49410
49411+ if (ifreq_len > sizeof ifr)
49412+ return -EFAULT;
49413+
49414 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49415 if (copy_from_user(&ifr, argp, ifreq_len))
49416 return -EFAULT;
49417diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49418index 111d907..1ee643e 100644
49419--- a/drivers/net/usb/hso.c
49420+++ b/drivers/net/usb/hso.c
49421@@ -70,7 +70,7 @@
49422 #include <asm/byteorder.h>
49423 #include <linux/serial_core.h>
49424 #include <linux/serial.h>
49425-
49426+#include <asm/local.h>
49427
49428 #define MOD_AUTHOR "Option Wireless"
49429 #define MOD_DESCRIPTION "USB High Speed Option driver"
49430@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49431 struct urb *urb;
49432
49433 urb = serial->rx_urb[0];
49434- if (serial->port.count > 0) {
49435+ if (atomic_read(&serial->port.count) > 0) {
49436 count = put_rxbuf_data(urb, serial);
49437 if (count == -1)
49438 return;
49439@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49440 DUMP1(urb->transfer_buffer, urb->actual_length);
49441
49442 /* Anyone listening? */
49443- if (serial->port.count == 0)
49444+ if (atomic_read(&serial->port.count) == 0)
49445 return;
49446
49447 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49448@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49449 tty_port_tty_set(&serial->port, tty);
49450
49451 /* check for port already opened, if not set the termios */
49452- serial->port.count++;
49453- if (serial->port.count == 1) {
49454+ if (atomic_inc_return(&serial->port.count) == 1) {
49455 serial->rx_state = RX_IDLE;
49456 /* Force default termio settings */
49457 _hso_serial_set_termios(tty, NULL);
49458@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49459 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49460 if (result) {
49461 hso_stop_serial_device(serial->parent);
49462- serial->port.count--;
49463+ atomic_dec(&serial->port.count);
49464 } else {
49465 kref_get(&serial->parent->ref);
49466 }
49467@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49468
49469 /* reset the rts and dtr */
49470 /* do the actual close */
49471- serial->port.count--;
49472+ atomic_dec(&serial->port.count);
49473
49474- if (serial->port.count <= 0) {
49475- serial->port.count = 0;
49476+ if (atomic_read(&serial->port.count) <= 0) {
49477+ atomic_set(&serial->port.count, 0);
49478 tty_port_tty_set(&serial->port, NULL);
49479 if (!usb_gone)
49480 hso_stop_serial_device(serial->parent);
49481@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49482
49483 /* the actual setup */
49484 spin_lock_irqsave(&serial->serial_lock, flags);
49485- if (serial->port.count)
49486+ if (atomic_read(&serial->port.count))
49487 _hso_serial_set_termios(tty, old);
49488 else
49489 tty->termios = *old;
49490@@ -1891,7 +1890,7 @@ static void intr_callback(struct urb *urb)
49491 D1("Pending read interrupt on port %d\n", i);
49492 spin_lock(&serial->serial_lock);
49493 if (serial->rx_state == RX_IDLE &&
49494- serial->port.count > 0) {
49495+ atomic_read(&serial->port.count) > 0) {
49496 /* Setup and send a ctrl req read on
49497 * port i */
49498 if (!serial->rx_urb_filled[0]) {
49499@@ -3058,7 +3057,7 @@ static int hso_resume(struct usb_interface *iface)
49500 /* Start all serial ports */
49501 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49502 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49503- if (dev2ser(serial_table[i])->port.count) {
49504+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49505 result =
49506 hso_start_serial_device(serial_table[i], GFP_NOIO);
49507 hso_kick_transmit(dev2ser(serial_table[i]));
49508diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49509index aafa1a1..f59c651 100644
49510--- a/drivers/net/usb/r8152.c
49511+++ b/drivers/net/usb/r8152.c
49512@@ -602,7 +602,7 @@ struct r8152 {
49513 void (*unload)(struct r8152 *);
49514 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49515 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49516- } rtl_ops;
49517+ } __no_const rtl_ops;
49518
49519 int intr_interval;
49520 u32 saved_wolopts;
49521diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49522index a2515887..6d13233 100644
49523--- a/drivers/net/usb/sierra_net.c
49524+++ b/drivers/net/usb/sierra_net.c
49525@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49526 /* atomic counter partially included in MAC address to make sure 2 devices
49527 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49528 */
49529-static atomic_t iface_counter = ATOMIC_INIT(0);
49530+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49531
49532 /*
49533 * SYNC Timer Delay definition used to set the expiry time
49534@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49535 dev->net->netdev_ops = &sierra_net_device_ops;
49536
49537 /* change MAC addr to include, ifacenum, and to be unique */
49538- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49539+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49540 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49541
49542 /* we will have to manufacture ethernet headers, prepare template */
49543diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49544index 63c7810..a694d2b 100644
49545--- a/drivers/net/virtio_net.c
49546+++ b/drivers/net/virtio_net.c
49547@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49548 #define RECEIVE_AVG_WEIGHT 64
49549
49550 /* Minimum alignment for mergeable packet buffers. */
49551-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49552+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49553
49554 #define VIRTNET_DRIVER_VERSION "1.0.0"
49555
49556@@ -1756,9 +1756,9 @@ static int virtnet_probe(struct virtio_device *vdev)
49557 /* Do we support "hardware" checksums? */
49558 if (virtio_has_feature(vdev, VIRTIO_NET_F_CSUM)) {
49559 /* This opens up the world of extra features. */
49560- dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
49561+ dev->hw_features |= NETIF_F_HW_CSUM|NETIF_F_SG;
49562 if (csum)
49563- dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG|NETIF_F_FRAGLIST;
49564+ dev->features |= NETIF_F_HW_CSUM|NETIF_F_SG;
49565
49566 if (virtio_has_feature(vdev, VIRTIO_NET_F_GSO)) {
49567 dev->hw_features |= NETIF_F_TSO | NETIF_F_UFO
49568diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
49569index 61c0840..92e7f7e 100644
49570--- a/drivers/net/vmxnet3/vmxnet3_drv.c
49571+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
49572@@ -1167,7 +1167,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49573 static const u32 rxprod_reg[2] = {
49574 VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2
49575 };
49576- u32 num_rxd = 0;
49577+ u32 num_pkts = 0;
49578 bool skip_page_frags = false;
49579 struct Vmxnet3_RxCompDesc *rcd;
49580 struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
49581@@ -1185,13 +1185,12 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49582 struct Vmxnet3_RxDesc *rxd;
49583 u32 idx, ring_idx;
49584 struct vmxnet3_cmd_ring *ring = NULL;
49585- if (num_rxd >= quota) {
49586+ if (num_pkts >= quota) {
49587 /* we may stop even before we see the EOP desc of
49588 * the current pkt
49589 */
49590 break;
49591 }
49592- num_rxd++;
49593 BUG_ON(rcd->rqID != rq->qid && rcd->rqID != rq->qid2);
49594 idx = rcd->rxdIdx;
49595 ring_idx = rcd->rqID < adapter->num_rx_queues ? 0 : 1;
49596@@ -1323,6 +1322,7 @@ vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
49597 napi_gro_receive(&rq->napi, skb);
49598
49599 ctx->skb = NULL;
49600+ num_pkts++;
49601 }
49602
49603 rcd_done:
49604@@ -1353,7 +1353,7 @@ rcd_done:
49605 &rq->comp_ring.base[rq->comp_ring.next2proc].rcd, &rxComp);
49606 }
49607
49608- return num_rxd;
49609+ return num_pkts;
49610 }
49611
49612
49613diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49614index 21a0fbf..055b54f 100644
49615--- a/drivers/net/vxlan.c
49616+++ b/drivers/net/vxlan.c
49617@@ -2878,7 +2878,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49618 return vxlan->net;
49619 }
49620
49621-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49622+static struct rtnl_link_ops vxlan_link_ops = {
49623 .kind = "vxlan",
49624 .maxtype = IFLA_VXLAN_MAX,
49625 .policy = vxlan_policy,
49626@@ -2926,7 +2926,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49627 return NOTIFY_DONE;
49628 }
49629
49630-static struct notifier_block vxlan_notifier_block __read_mostly = {
49631+static struct notifier_block vxlan_notifier_block = {
49632 .notifier_call = vxlan_lowerdev_event,
49633 };
49634
49635diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49636index 5920c99..ff2e4a5 100644
49637--- a/drivers/net/wan/lmc/lmc_media.c
49638+++ b/drivers/net/wan/lmc/lmc_media.c
49639@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49640 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49641
49642 lmc_media_t lmc_ds3_media = {
49643- lmc_ds3_init, /* special media init stuff */
49644- lmc_ds3_default, /* reset to default state */
49645- lmc_ds3_set_status, /* reset status to state provided */
49646- lmc_dummy_set_1, /* set clock source */
49647- lmc_dummy_set2_1, /* set line speed */
49648- lmc_ds3_set_100ft, /* set cable length */
49649- lmc_ds3_set_scram, /* set scrambler */
49650- lmc_ds3_get_link_status, /* get link status */
49651- lmc_dummy_set_1, /* set link status */
49652- lmc_ds3_set_crc_length, /* set CRC length */
49653- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49654- lmc_ds3_watchdog
49655+ .init = lmc_ds3_init, /* special media init stuff */
49656+ .defaults = lmc_ds3_default, /* reset to default state */
49657+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49658+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49659+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49660+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49661+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49662+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49663+ .set_link_status = lmc_dummy_set_1, /* set link status */
49664+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49665+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49666+ .watchdog = lmc_ds3_watchdog
49667 };
49668
49669 lmc_media_t lmc_hssi_media = {
49670- lmc_hssi_init, /* special media init stuff */
49671- lmc_hssi_default, /* reset to default state */
49672- lmc_hssi_set_status, /* reset status to state provided */
49673- lmc_hssi_set_clock, /* set clock source */
49674- lmc_dummy_set2_1, /* set line speed */
49675- lmc_dummy_set_1, /* set cable length */
49676- lmc_dummy_set_1, /* set scrambler */
49677- lmc_hssi_get_link_status, /* get link status */
49678- lmc_hssi_set_link_status, /* set link status */
49679- lmc_hssi_set_crc_length, /* set CRC length */
49680- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49681- lmc_hssi_watchdog
49682+ .init = lmc_hssi_init, /* special media init stuff */
49683+ .defaults = lmc_hssi_default, /* reset to default state */
49684+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49685+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49686+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49687+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49688+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49689+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49690+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49691+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49692+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49693+ .watchdog = lmc_hssi_watchdog
49694 };
49695
49696-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49697- lmc_ssi_default, /* reset to default state */
49698- lmc_ssi_set_status, /* reset status to state provided */
49699- lmc_ssi_set_clock, /* set clock source */
49700- lmc_ssi_set_speed, /* set line speed */
49701- lmc_dummy_set_1, /* set cable length */
49702- lmc_dummy_set_1, /* set scrambler */
49703- lmc_ssi_get_link_status, /* get link status */
49704- lmc_ssi_set_link_status, /* set link status */
49705- lmc_ssi_set_crc_length, /* set CRC length */
49706- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49707- lmc_ssi_watchdog
49708+lmc_media_t lmc_ssi_media = {
49709+ .init = lmc_ssi_init, /* special media init stuff */
49710+ .defaults = lmc_ssi_default, /* reset to default state */
49711+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49712+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49713+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49714+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49715+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49716+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49717+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49718+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49719+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49720+ .watchdog = lmc_ssi_watchdog
49721 };
49722
49723 lmc_media_t lmc_t1_media = {
49724- lmc_t1_init, /* special media init stuff */
49725- lmc_t1_default, /* reset to default state */
49726- lmc_t1_set_status, /* reset status to state provided */
49727- lmc_t1_set_clock, /* set clock source */
49728- lmc_dummy_set2_1, /* set line speed */
49729- lmc_dummy_set_1, /* set cable length */
49730- lmc_dummy_set_1, /* set scrambler */
49731- lmc_t1_get_link_status, /* get link status */
49732- lmc_dummy_set_1, /* set link status */
49733- lmc_t1_set_crc_length, /* set CRC length */
49734- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49735- lmc_t1_watchdog
49736+ .init = lmc_t1_init, /* special media init stuff */
49737+ .defaults = lmc_t1_default, /* reset to default state */
49738+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49739+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49740+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49741+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49742+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49743+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49744+ .set_link_status = lmc_dummy_set_1, /* set link status */
49745+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49746+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49747+ .watchdog = lmc_t1_watchdog
49748 };
49749
49750 static void
49751diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49752index feacc3b..5bac0de 100644
49753--- a/drivers/net/wan/z85230.c
49754+++ b/drivers/net/wan/z85230.c
49755@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49756
49757 struct z8530_irqhandler z8530_sync =
49758 {
49759- z8530_rx,
49760- z8530_tx,
49761- z8530_status
49762+ .rx = z8530_rx,
49763+ .tx = z8530_tx,
49764+ .status = z8530_status
49765 };
49766
49767 EXPORT_SYMBOL(z8530_sync);
49768@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49769 }
49770
49771 static struct z8530_irqhandler z8530_dma_sync = {
49772- z8530_dma_rx,
49773- z8530_dma_tx,
49774- z8530_dma_status
49775+ .rx = z8530_dma_rx,
49776+ .tx = z8530_dma_tx,
49777+ .status = z8530_dma_status
49778 };
49779
49780 static struct z8530_irqhandler z8530_txdma_sync = {
49781- z8530_rx,
49782- z8530_dma_tx,
49783- z8530_dma_status
49784+ .rx = z8530_rx,
49785+ .tx = z8530_dma_tx,
49786+ .status = z8530_dma_status
49787 };
49788
49789 /**
49790@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49791
49792 struct z8530_irqhandler z8530_nop=
49793 {
49794- z8530_rx_clear,
49795- z8530_tx_clear,
49796- z8530_status_clear
49797+ .rx = z8530_rx_clear,
49798+ .tx = z8530_tx_clear,
49799+ .status = z8530_status_clear
49800 };
49801
49802
49803diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49804index 0b60295..b8bfa5b 100644
49805--- a/drivers/net/wimax/i2400m/rx.c
49806+++ b/drivers/net/wimax/i2400m/rx.c
49807@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49808 if (i2400m->rx_roq == NULL)
49809 goto error_roq_alloc;
49810
49811- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49812+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49813 GFP_KERNEL);
49814 if (rd == NULL) {
49815 result = -ENOMEM;
49816diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49817index d0c97c2..108f59b 100644
49818--- a/drivers/net/wireless/airo.c
49819+++ b/drivers/net/wireless/airo.c
49820@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49821 struct airo_info *ai = dev->ml_priv;
49822 int ridcode;
49823 int enabled;
49824- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49825+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49826 unsigned char *iobuf;
49827
49828 /* Only super-user can write RIDs */
49829diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49830index 49219c5..3625441 100644
49831--- a/drivers/net/wireless/at76c50x-usb.c
49832+++ b/drivers/net/wireless/at76c50x-usb.c
49833@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49834 }
49835
49836 /* Convert timeout from the DFU status to jiffies */
49837-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49838+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49839 {
49840 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49841 | (s->poll_timeout[1] << 8)
49842diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49843index 2fd9e18..3f55bdd 100644
49844--- a/drivers/net/wireless/ath/ath10k/htc.c
49845+++ b/drivers/net/wireless/ath/ath10k/htc.c
49846@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49847 /* registered target arrival callback from the HIF layer */
49848 int ath10k_htc_init(struct ath10k *ar)
49849 {
49850- struct ath10k_hif_cb htc_callbacks;
49851+ static struct ath10k_hif_cb htc_callbacks = {
49852+ .rx_completion = ath10k_htc_rx_completion_handler,
49853+ .tx_completion = ath10k_htc_tx_completion_handler,
49854+ };
49855 struct ath10k_htc_ep *ep = NULL;
49856 struct ath10k_htc *htc = &ar->htc;
49857
49858@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
49859 ath10k_htc_reset_endpoint_states(htc);
49860
49861 /* setup HIF layer callbacks */
49862- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49863- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49864 htc->ar = ar;
49865
49866 /* Get HIF default pipe for HTC message exchange */
49867diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49868index 527179c..a890150 100644
49869--- a/drivers/net/wireless/ath/ath10k/htc.h
49870+++ b/drivers/net/wireless/ath/ath10k/htc.h
49871@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49872
49873 struct ath10k_htc_ops {
49874 void (*target_send_suspend_complete)(struct ath10k *ar);
49875-};
49876+} __no_const;
49877
49878 struct ath10k_htc_ep_ops {
49879 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
49880 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
49881 void (*ep_tx_credits)(struct ath10k *);
49882-};
49883+} __no_const;
49884
49885 /* service connection information */
49886 struct ath10k_htc_svc_conn_req {
49887diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49888index f816909..e56cd8b 100644
49889--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49890+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49891@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49892 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
49893 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
49894
49895- ACCESS_ONCE(ads->ds_link) = i->link;
49896- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
49897+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
49898+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
49899
49900 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
49901 ctl6 = SM(i->keytype, AR_EncrType);
49902@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49903
49904 if ((i->is_first || i->is_last) &&
49905 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
49906- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
49907+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
49908 | set11nTries(i->rates, 1)
49909 | set11nTries(i->rates, 2)
49910 | set11nTries(i->rates, 3)
49911 | (i->dur_update ? AR_DurUpdateEna : 0)
49912 | SM(0, AR_BurstDur);
49913
49914- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
49915+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
49916 | set11nRate(i->rates, 1)
49917 | set11nRate(i->rates, 2)
49918 | set11nRate(i->rates, 3);
49919 } else {
49920- ACCESS_ONCE(ads->ds_ctl2) = 0;
49921- ACCESS_ONCE(ads->ds_ctl3) = 0;
49922+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
49923+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
49924 }
49925
49926 if (!i->is_first) {
49927- ACCESS_ONCE(ads->ds_ctl0) = 0;
49928- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49929- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49930+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
49931+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49932+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49933 return;
49934 }
49935
49936@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49937 break;
49938 }
49939
49940- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49941+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49942 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49943 | SM(i->txpower[0], AR_XmitPower0)
49944 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49945@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49946 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
49947 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
49948
49949- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49950- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49951+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49952+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49953
49954 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
49955 return;
49956
49957- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49958+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49959 | set11nPktDurRTSCTS(i->rates, 1);
49960
49961- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49962+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49963 | set11nPktDurRTSCTS(i->rates, 3);
49964
49965- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49966+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49967 | set11nRateFlags(i->rates, 1)
49968 | set11nRateFlags(i->rates, 2)
49969 | set11nRateFlags(i->rates, 3)
49970 | SM(i->rtscts_rate, AR_RTSCTSRate);
49971
49972- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49973- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49974- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49975+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49976+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49977+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49978 }
49979
49980 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
49981diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49982index da84b70..83e4978 100644
49983--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49984+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49985@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49986 (i->qcu << AR_TxQcuNum_S) | desc_len;
49987
49988 checksum += val;
49989- ACCESS_ONCE(ads->info) = val;
49990+ ACCESS_ONCE_RW(ads->info) = val;
49991
49992 checksum += i->link;
49993- ACCESS_ONCE(ads->link) = i->link;
49994+ ACCESS_ONCE_RW(ads->link) = i->link;
49995
49996 checksum += i->buf_addr[0];
49997- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
49998+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
49999 checksum += i->buf_addr[1];
50000- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
50001+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
50002 checksum += i->buf_addr[2];
50003- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
50004+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
50005 checksum += i->buf_addr[3];
50006- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
50007+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
50008
50009 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
50010- ACCESS_ONCE(ads->ctl3) = val;
50011+ ACCESS_ONCE_RW(ads->ctl3) = val;
50012 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
50013- ACCESS_ONCE(ads->ctl5) = val;
50014+ ACCESS_ONCE_RW(ads->ctl5) = val;
50015 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
50016- ACCESS_ONCE(ads->ctl7) = val;
50017+ ACCESS_ONCE_RW(ads->ctl7) = val;
50018 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
50019- ACCESS_ONCE(ads->ctl9) = val;
50020+ ACCESS_ONCE_RW(ads->ctl9) = val;
50021
50022 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
50023- ACCESS_ONCE(ads->ctl10) = checksum;
50024+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
50025
50026 if (i->is_first || i->is_last) {
50027- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
50028+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
50029 | set11nTries(i->rates, 1)
50030 | set11nTries(i->rates, 2)
50031 | set11nTries(i->rates, 3)
50032 | (i->dur_update ? AR_DurUpdateEna : 0)
50033 | SM(0, AR_BurstDur);
50034
50035- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
50036+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
50037 | set11nRate(i->rates, 1)
50038 | set11nRate(i->rates, 2)
50039 | set11nRate(i->rates, 3);
50040 } else {
50041- ACCESS_ONCE(ads->ctl13) = 0;
50042- ACCESS_ONCE(ads->ctl14) = 0;
50043+ ACCESS_ONCE_RW(ads->ctl13) = 0;
50044+ ACCESS_ONCE_RW(ads->ctl14) = 0;
50045 }
50046
50047 ads->ctl20 = 0;
50048@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50049
50050 ctl17 = SM(i->keytype, AR_EncrType);
50051 if (!i->is_first) {
50052- ACCESS_ONCE(ads->ctl11) = 0;
50053- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50054- ACCESS_ONCE(ads->ctl15) = 0;
50055- ACCESS_ONCE(ads->ctl16) = 0;
50056- ACCESS_ONCE(ads->ctl17) = ctl17;
50057- ACCESS_ONCE(ads->ctl18) = 0;
50058- ACCESS_ONCE(ads->ctl19) = 0;
50059+ ACCESS_ONCE_RW(ads->ctl11) = 0;
50060+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
50061+ ACCESS_ONCE_RW(ads->ctl15) = 0;
50062+ ACCESS_ONCE_RW(ads->ctl16) = 0;
50063+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50064+ ACCESS_ONCE_RW(ads->ctl18) = 0;
50065+ ACCESS_ONCE_RW(ads->ctl19) = 0;
50066 return;
50067 }
50068
50069- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50070+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
50071 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
50072 | SM(i->txpower[0], AR_XmitPower0)
50073 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
50074@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
50075 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
50076 ctl12 |= SM(val, AR_PAPRDChainMask);
50077
50078- ACCESS_ONCE(ads->ctl12) = ctl12;
50079- ACCESS_ONCE(ads->ctl17) = ctl17;
50080+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
50081+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
50082
50083- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50084+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
50085 | set11nPktDurRTSCTS(i->rates, 1);
50086
50087- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50088+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
50089 | set11nPktDurRTSCTS(i->rates, 3);
50090
50091- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
50092+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
50093 | set11nRateFlags(i->rates, 1)
50094 | set11nRateFlags(i->rates, 2)
50095 | set11nRateFlags(i->rates, 3)
50096 | SM(i->rtscts_rate, AR_RTSCTSRate);
50097
50098- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
50099+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
50100
50101- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50102- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50103- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50104+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
50105+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
50106+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
50107 }
50108
50109 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
50110diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
50111index c1d2d03..08352db 100644
50112--- a/drivers/net/wireless/ath/ath9k/hw.h
50113+++ b/drivers/net/wireless/ath/ath9k/hw.h
50114@@ -671,7 +671,7 @@ struct ath_hw_private_ops {
50115 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50116 bool (*is_aic_enabled)(struct ath_hw *ah);
50117 #endif /* CONFIG_ATH9K_BTCOEX_SUPPORT */
50118-};
50119+} __no_const;
50120
50121 /**
50122 * struct ath_spec_scan - parameters for Atheros spectral scan
50123@@ -747,7 +747,7 @@ struct ath_hw_ops {
50124 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
50125 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
50126 #endif
50127-};
50128+} __no_const;
50129
50130 struct ath_nf_limits {
50131 s16 max;
50132diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
50133index d5f2fbf..0740c8b 100644
50134--- a/drivers/net/wireless/ath/ath9k/main.c
50135+++ b/drivers/net/wireless/ath/ath9k/main.c
50136@@ -2575,16 +2575,18 @@ void ath9k_fill_chanctx_ops(void)
50137 if (!ath9k_is_chanctx_enabled())
50138 return;
50139
50140- ath9k_ops.hw_scan = ath9k_hw_scan;
50141- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50142- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50143- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50144- ath9k_ops.add_chanctx = ath9k_add_chanctx;
50145- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50146- ath9k_ops.change_chanctx = ath9k_change_chanctx;
50147- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50148- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50149- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50150+ pax_open_kernel();
50151+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
50152+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
50153+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
50154+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
50155+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
50156+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
50157+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
50158+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
50159+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
50160+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
50161+ pax_close_kernel();
50162 }
50163
50164 #endif
50165diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
50166index 058a9f2..d5cb1ba 100644
50167--- a/drivers/net/wireless/b43/phy_lp.c
50168+++ b/drivers/net/wireless/b43/phy_lp.c
50169@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
50170 {
50171 struct ssb_bus *bus = dev->dev->sdev->bus;
50172
50173- static const struct b206x_channel *chandata = NULL;
50174+ const struct b206x_channel *chandata = NULL;
50175 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
50176 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
50177 u16 old_comm15, scale;
50178diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
50179index e566580..2c218ca 100644
50180--- a/drivers/net/wireless/iwlegacy/3945-mac.c
50181+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
50182@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
50183 */
50184 if (il3945_mod_params.disable_hw_scan) {
50185 D_INFO("Disabling hw_scan\n");
50186- il3945_mac_ops.hw_scan = NULL;
50187+ pax_open_kernel();
50188+ *(void **)&il3945_mac_ops.hw_scan = NULL;
50189+ pax_close_kernel();
50190 }
50191
50192 D_INFO("*** LOAD DRIVER ***\n");
50193diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50194index 0ffb6ff..c0b7f0e 100644
50195--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50196+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
50197@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
50198 {
50199 struct iwl_priv *priv = file->private_data;
50200 char buf[64];
50201- int buf_size;
50202+ size_t buf_size;
50203 u32 offset, len;
50204
50205 memset(buf, 0, sizeof(buf));
50206@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
50207 struct iwl_priv *priv = file->private_data;
50208
50209 char buf[8];
50210- int buf_size;
50211+ size_t buf_size;
50212 u32 reset_flag;
50213
50214 memset(buf, 0, sizeof(buf));
50215@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
50216 {
50217 struct iwl_priv *priv = file->private_data;
50218 char buf[8];
50219- int buf_size;
50220+ size_t buf_size;
50221 int ht40;
50222
50223 memset(buf, 0, sizeof(buf));
50224@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
50225 {
50226 struct iwl_priv *priv = file->private_data;
50227 char buf[8];
50228- int buf_size;
50229+ size_t buf_size;
50230 int value;
50231
50232 memset(buf, 0, sizeof(buf));
50233@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
50234 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
50235 DEBUGFS_READ_FILE_OPS(current_sleep_command);
50236
50237-static const char *fmt_value = " %-30s %10u\n";
50238-static const char *fmt_hex = " %-30s 0x%02X\n";
50239-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
50240-static const char *fmt_header =
50241+static const char fmt_value[] = " %-30s %10u\n";
50242+static const char fmt_hex[] = " %-30s 0x%02X\n";
50243+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
50244+static const char fmt_header[] =
50245 "%-32s current cumulative delta max\n";
50246
50247 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
50248@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
50249 {
50250 struct iwl_priv *priv = file->private_data;
50251 char buf[8];
50252- int buf_size;
50253+ size_t buf_size;
50254 int clear;
50255
50256 memset(buf, 0, sizeof(buf));
50257@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
50258 {
50259 struct iwl_priv *priv = file->private_data;
50260 char buf[8];
50261- int buf_size;
50262+ size_t buf_size;
50263 int trace;
50264
50265 memset(buf, 0, sizeof(buf));
50266@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
50267 {
50268 struct iwl_priv *priv = file->private_data;
50269 char buf[8];
50270- int buf_size;
50271+ size_t buf_size;
50272 int missed;
50273
50274 memset(buf, 0, sizeof(buf));
50275@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
50276
50277 struct iwl_priv *priv = file->private_data;
50278 char buf[8];
50279- int buf_size;
50280+ size_t buf_size;
50281 int plcp;
50282
50283 memset(buf, 0, sizeof(buf));
50284@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
50285
50286 struct iwl_priv *priv = file->private_data;
50287 char buf[8];
50288- int buf_size;
50289+ size_t buf_size;
50290 int flush;
50291
50292 memset(buf, 0, sizeof(buf));
50293@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
50294
50295 struct iwl_priv *priv = file->private_data;
50296 char buf[8];
50297- int buf_size;
50298+ size_t buf_size;
50299 int rts;
50300
50301 if (!priv->cfg->ht_params)
50302@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
50303 {
50304 struct iwl_priv *priv = file->private_data;
50305 char buf[8];
50306- int buf_size;
50307+ size_t buf_size;
50308
50309 memset(buf, 0, sizeof(buf));
50310 buf_size = min(count, sizeof(buf) - 1);
50311@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
50312 struct iwl_priv *priv = file->private_data;
50313 u32 event_log_flag;
50314 char buf[8];
50315- int buf_size;
50316+ size_t buf_size;
50317
50318 /* check that the interface is up */
50319 if (!iwl_is_ready(priv))
50320@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
50321 struct iwl_priv *priv = file->private_data;
50322 char buf[8];
50323 u32 calib_disabled;
50324- int buf_size;
50325+ size_t buf_size;
50326
50327 memset(buf, 0, sizeof(buf));
50328 buf_size = min(count, sizeof(buf) - 1);
50329diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
50330index 37e6a6f..b3b0369 100644
50331--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
50332+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
50333@@ -1919,7 +1919,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
50334 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
50335
50336 char buf[8];
50337- int buf_size;
50338+ size_t buf_size;
50339 u32 reset_flag;
50340
50341 memset(buf, 0, sizeof(buf));
50342@@ -1940,7 +1940,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
50343 {
50344 struct iwl_trans *trans = file->private_data;
50345 char buf[8];
50346- int buf_size;
50347+ size_t buf_size;
50348 int csr;
50349
50350 memset(buf, 0, sizeof(buf));
50351diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
50352index d5c0a1a..d056b20 100644
50353--- a/drivers/net/wireless/mac80211_hwsim.c
50354+++ b/drivers/net/wireless/mac80211_hwsim.c
50355@@ -3149,20 +3149,20 @@ static int __init init_mac80211_hwsim(void)
50356 if (channels < 1)
50357 return -EINVAL;
50358
50359- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
50360- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50361- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50362- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50363- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50364- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50365- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50366- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50367- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50368- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50369- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
50370- mac80211_hwsim_assign_vif_chanctx;
50371- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
50372- mac80211_hwsim_unassign_vif_chanctx;
50373+ pax_open_kernel();
50374+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
50375+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
50376+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
50377+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
50378+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
50379+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
50380+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
50381+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
50382+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
50383+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
50384+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
50385+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
50386+ pax_close_kernel();
50387
50388 spin_lock_init(&hwsim_radio_lock);
50389 INIT_LIST_HEAD(&hwsim_radios);
50390diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
50391index d72ff8e..c209a45 100644
50392--- a/drivers/net/wireless/rndis_wlan.c
50393+++ b/drivers/net/wireless/rndis_wlan.c
50394@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
50395
50396 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
50397
50398- if (rts_threshold < 0 || rts_threshold > 2347)
50399+ if (rts_threshold > 2347)
50400 rts_threshold = 2347;
50401
50402 tmp = cpu_to_le32(rts_threshold);
50403diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
50404index 9bb398b..b0cc047 100644
50405--- a/drivers/net/wireless/rt2x00/rt2x00.h
50406+++ b/drivers/net/wireless/rt2x00/rt2x00.h
50407@@ -375,7 +375,7 @@ struct rt2x00_intf {
50408 * for hardware which doesn't support hardware
50409 * sequence counting.
50410 */
50411- atomic_t seqno;
50412+ atomic_unchecked_t seqno;
50413 };
50414
50415 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
50416diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
50417index 68b620b..92ecd9e 100644
50418--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
50419+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
50420@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
50421 * sequence counter given by mac80211.
50422 */
50423 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
50424- seqno = atomic_add_return(0x10, &intf->seqno);
50425+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
50426 else
50427- seqno = atomic_read(&intf->seqno);
50428+ seqno = atomic_read_unchecked(&intf->seqno);
50429
50430 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
50431 hdr->seq_ctrl |= cpu_to_le16(seqno);
50432diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
50433index b661f896..ddf7d2b 100644
50434--- a/drivers/net/wireless/ti/wl1251/sdio.c
50435+++ b/drivers/net/wireless/ti/wl1251/sdio.c
50436@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
50437
50438 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
50439
50440- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50441- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50442+ pax_open_kernel();
50443+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
50444+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50445+ pax_close_kernel();
50446
50447 wl1251_info("using dedicated interrupt line");
50448 } else {
50449- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50450- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50451+ pax_open_kernel();
50452+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50453+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50454+ pax_close_kernel();
50455
50456 wl1251_info("using SDIO interrupt");
50457 }
50458diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50459index af0fe2e..d04986b 100644
50460--- a/drivers/net/wireless/ti/wl12xx/main.c
50461+++ b/drivers/net/wireless/ti/wl12xx/main.c
50462@@ -655,7 +655,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50463 sizeof(wl->conf.mem));
50464
50465 /* read data preparation is only needed by wl127x */
50466- wl->ops->prepare_read = wl127x_prepare_read;
50467+ pax_open_kernel();
50468+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50469+ pax_close_kernel();
50470
50471 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50472 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50473@@ -680,7 +682,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50474 sizeof(wl->conf.mem));
50475
50476 /* read data preparation is only needed by wl127x */
50477- wl->ops->prepare_read = wl127x_prepare_read;
50478+ pax_open_kernel();
50479+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50480+ pax_close_kernel();
50481
50482 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50483 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50484diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50485index 717c4f5..a813aeb 100644
50486--- a/drivers/net/wireless/ti/wl18xx/main.c
50487+++ b/drivers/net/wireless/ti/wl18xx/main.c
50488@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50489 }
50490
50491 if (!checksum_param) {
50492- wl18xx_ops.set_rx_csum = NULL;
50493- wl18xx_ops.init_vif = NULL;
50494+ pax_open_kernel();
50495+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50496+ *(void **)&wl18xx_ops.init_vif = NULL;
50497+ pax_close_kernel();
50498 }
50499
50500 /* Enable 11a Band only if we have 5G antennas */
50501diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50502index a912dc0..a8225ba 100644
50503--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50504+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50505@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50506 {
50507 struct zd_usb *usb = urb->context;
50508 struct zd_usb_interrupt *intr = &usb->intr;
50509- int len;
50510+ unsigned int len;
50511 u16 int_num;
50512
50513 ZD_ASSERT(in_interrupt());
50514diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
50515index 0d25943..0866c5d 100644
50516--- a/drivers/net/xen-netback/netback.c
50517+++ b/drivers/net/xen-netback/netback.c
50518@@ -1571,13 +1571,13 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue)
50519 smp_rmb();
50520
50521 while (dc != dp) {
50522- BUG_ON(gop - queue->tx_unmap_ops > MAX_PENDING_REQS);
50523+ BUG_ON(gop - queue->tx_unmap_ops >= MAX_PENDING_REQS);
50524 pending_idx =
50525 queue->dealloc_ring[pending_index(dc++)];
50526
50527- pending_idx_release[gop-queue->tx_unmap_ops] =
50528+ pending_idx_release[gop - queue->tx_unmap_ops] =
50529 pending_idx;
50530- queue->pages_to_unmap[gop-queue->tx_unmap_ops] =
50531+ queue->pages_to_unmap[gop - queue->tx_unmap_ops] =
50532 queue->mmap_pages[pending_idx];
50533 gnttab_set_unmap_op(gop,
50534 idx_to_kaddr(queue, pending_idx),
50535diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50536index ce2e2cf..f81e500 100644
50537--- a/drivers/nfc/nfcwilink.c
50538+++ b/drivers/nfc/nfcwilink.c
50539@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50540
50541 static int nfcwilink_probe(struct platform_device *pdev)
50542 {
50543- static struct nfcwilink *drv;
50544+ struct nfcwilink *drv;
50545 int rc;
50546 __u32 protocols;
50547
50548diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50549index d251f72..0512865 100644
50550--- a/drivers/nfc/st21nfca/st21nfca.c
50551+++ b/drivers/nfc/st21nfca/st21nfca.c
50552@@ -148,14 +148,14 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50553 ST21NFCA_DEVICE_MGNT_GATE,
50554 ST21NFCA_DEVICE_MGNT_PIPE);
50555 if (r < 0)
50556- goto free_info;
50557+ return r;
50558
50559 /* Get pipe list */
50560 r = nfc_hci_send_cmd(hdev, ST21NFCA_DEVICE_MGNT_GATE,
50561 ST21NFCA_DM_GETINFO, pipe_list, sizeof(pipe_list),
50562 &skb_pipe_list);
50563 if (r < 0)
50564- goto free_info;
50565+ return r;
50566
50567 /* Complete the existing gate_pipe table */
50568 for (i = 0; i < skb_pipe_list->len; i++) {
50569@@ -181,6 +181,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50570 info->src_host_id != ST21NFCA_ESE_HOST_ID) {
50571 pr_err("Unexpected apdu_reader pipe on host %x\n",
50572 info->src_host_id);
50573+ kfree_skb(skb_pipe_info);
50574 continue;
50575 }
50576
50577@@ -200,6 +201,7 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50578 hdev->pipes[st21nfca_gates[j].pipe].dest_host =
50579 info->src_host_id;
50580 }
50581+ kfree_skb(skb_pipe_info);
50582 }
50583
50584 /*
50585@@ -214,13 +216,12 @@ static int st21nfca_hci_load_session(struct nfc_hci_dev *hdev)
50586 st21nfca_gates[i].gate,
50587 st21nfca_gates[i].pipe);
50588 if (r < 0)
50589- goto free_info;
50590+ goto free_list;
50591 }
50592 }
50593
50594 memcpy(hdev->init_data.gates, st21nfca_gates, sizeof(st21nfca_gates));
50595-free_info:
50596- kfree_skb(skb_pipe_info);
50597+free_list:
50598 kfree_skb(skb_pipe_list);
50599 return r;
50600 }
50601diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50602index cde35c5d01..2dbfdbbf 100644
50603--- a/drivers/of/fdt.c
50604+++ b/drivers/of/fdt.c
50605@@ -1136,7 +1136,9 @@ static int __init of_fdt_raw_init(void)
50606 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50607 return 0;
50608 }
50609- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50610+ pax_open_kernel();
50611+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50612+ pax_close_kernel();
50613 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50614 }
50615 late_initcall(of_fdt_raw_init);
50616diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50617index 82f7000..d6d0447 100644
50618--- a/drivers/oprofile/buffer_sync.c
50619+++ b/drivers/oprofile/buffer_sync.c
50620@@ -345,7 +345,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50621 if (cookie == NO_COOKIE)
50622 offset = pc;
50623 if (cookie == INVALID_COOKIE) {
50624- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50625+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50626 offset = pc;
50627 }
50628 if (cookie != last_cookie) {
50629@@ -389,14 +389,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50630 /* add userspace sample */
50631
50632 if (!mm) {
50633- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50634+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50635 return 0;
50636 }
50637
50638 cookie = lookup_dcookie(mm, s->eip, &offset);
50639
50640 if (cookie == INVALID_COOKIE) {
50641- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50642+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50643 return 0;
50644 }
50645
50646@@ -554,7 +554,7 @@ void sync_buffer(int cpu)
50647 /* ignore backtraces if failed to add a sample */
50648 if (state == sb_bt_start) {
50649 state = sb_bt_ignore;
50650- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50651+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50652 }
50653 }
50654 release_mm(mm);
50655diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50656index c0cc4e7..44d4e54 100644
50657--- a/drivers/oprofile/event_buffer.c
50658+++ b/drivers/oprofile/event_buffer.c
50659@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50660 }
50661
50662 if (buffer_pos == buffer_size) {
50663- atomic_inc(&oprofile_stats.event_lost_overflow);
50664+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50665 return;
50666 }
50667
50668diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50669index ed2c3ec..deda85a 100644
50670--- a/drivers/oprofile/oprof.c
50671+++ b/drivers/oprofile/oprof.c
50672@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50673 if (oprofile_ops.switch_events())
50674 return;
50675
50676- atomic_inc(&oprofile_stats.multiplex_counter);
50677+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50678 start_switch_worker();
50679 }
50680
50681diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50682index ee2cfce..7f8f699 100644
50683--- a/drivers/oprofile/oprofile_files.c
50684+++ b/drivers/oprofile/oprofile_files.c
50685@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50686
50687 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50688
50689-static ssize_t timeout_read(struct file *file, char __user *buf,
50690+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50691 size_t count, loff_t *offset)
50692 {
50693 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50694diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50695index 59659ce..6c860a0 100644
50696--- a/drivers/oprofile/oprofile_stats.c
50697+++ b/drivers/oprofile/oprofile_stats.c
50698@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50699 cpu_buf->sample_invalid_eip = 0;
50700 }
50701
50702- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50703- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50704- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50705- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50706- atomic_set(&oprofile_stats.multiplex_counter, 0);
50707+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50708+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50709+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50710+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50711+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50712 }
50713
50714
50715diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50716index 1fc622b..8c48fc3 100644
50717--- a/drivers/oprofile/oprofile_stats.h
50718+++ b/drivers/oprofile/oprofile_stats.h
50719@@ -13,11 +13,11 @@
50720 #include <linux/atomic.h>
50721
50722 struct oprofile_stat_struct {
50723- atomic_t sample_lost_no_mm;
50724- atomic_t sample_lost_no_mapping;
50725- atomic_t bt_lost_no_mapping;
50726- atomic_t event_lost_overflow;
50727- atomic_t multiplex_counter;
50728+ atomic_unchecked_t sample_lost_no_mm;
50729+ atomic_unchecked_t sample_lost_no_mapping;
50730+ atomic_unchecked_t bt_lost_no_mapping;
50731+ atomic_unchecked_t event_lost_overflow;
50732+ atomic_unchecked_t multiplex_counter;
50733 };
50734
50735 extern struct oprofile_stat_struct oprofile_stats;
50736diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50737index dd92c5e..dfc04b5 100644
50738--- a/drivers/oprofile/oprofilefs.c
50739+++ b/drivers/oprofile/oprofilefs.c
50740@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50741
50742 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50743 {
50744- atomic_t *val = file->private_data;
50745- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50746+ atomic_unchecked_t *val = file->private_data;
50747+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50748 }
50749
50750
50751@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50752
50753
50754 int oprofilefs_create_ro_atomic(struct dentry *root,
50755- char const *name, atomic_t *val)
50756+ char const *name, atomic_unchecked_t *val)
50757 {
50758 return __oprofilefs_create_file(root, name,
50759 &atomic_ro_fops, 0444, val);
50760diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50761index bdef916..88c7dee 100644
50762--- a/drivers/oprofile/timer_int.c
50763+++ b/drivers/oprofile/timer_int.c
50764@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50765 return NOTIFY_OK;
50766 }
50767
50768-static struct notifier_block __refdata oprofile_cpu_notifier = {
50769+static struct notifier_block oprofile_cpu_notifier = {
50770 .notifier_call = oprofile_cpu_notify,
50771 };
50772
50773diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50774index 3b47080..6cd05dd 100644
50775--- a/drivers/parport/procfs.c
50776+++ b/drivers/parport/procfs.c
50777@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50778
50779 *ppos += len;
50780
50781- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50782+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50783 }
50784
50785 #ifdef CONFIG_PARPORT_1284
50786@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50787
50788 *ppos += len;
50789
50790- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50791+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50792 }
50793 #endif /* IEEE1284.3 support. */
50794
50795diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
50796index ba46e58..90cfc24 100644
50797--- a/drivers/pci/host/pci-host-generic.c
50798+++ b/drivers/pci/host/pci-host-generic.c
50799@@ -26,9 +26,9 @@
50800 #include <linux/platform_device.h>
50801
50802 struct gen_pci_cfg_bus_ops {
50803+ struct pci_ops ops;
50804 u32 bus_shift;
50805- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
50806-};
50807+} __do_const;
50808
50809 struct gen_pci_cfg_windows {
50810 struct resource res;
50811@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
50812 }
50813
50814 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
50815+ .ops = {
50816+ .map_bus = gen_pci_map_cfg_bus_cam,
50817+ .read = pci_generic_config_read,
50818+ .write = pci_generic_config_write,
50819+ },
50820 .bus_shift = 16,
50821- .map_bus = gen_pci_map_cfg_bus_cam,
50822 };
50823
50824 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50825@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50826 }
50827
50828 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
50829+ .ops = {
50830+ .map_bus = gen_pci_map_cfg_bus_ecam,
50831+ .read = pci_generic_config_read,
50832+ .write = pci_generic_config_write,
50833+ },
50834 .bus_shift = 20,
50835- .map_bus = gen_pci_map_cfg_bus_ecam,
50836-};
50837-
50838-static struct pci_ops gen_pci_ops = {
50839- .read = pci_generic_config_read,
50840- .write = pci_generic_config_write,
50841 };
50842
50843 static const struct of_device_id gen_pci_of_match[] = {
50844@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
50845 .private_data = (void **)&pci,
50846 .setup = gen_pci_setup,
50847 .map_irq = of_irq_parse_and_map_pci,
50848- .ops = &gen_pci_ops,
50849 };
50850
50851 if (!pci)
50852@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
50853
50854 of_id = of_match_node(gen_pci_of_match, np);
50855 pci->cfg.ops = of_id->data;
50856- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
50857+ hw.ops = &pci->cfg.ops->ops;
50858 pci->host.dev.parent = dev;
50859 INIT_LIST_HEAD(&pci->host.windows);
50860 INIT_LIST_HEAD(&pci->resources);
50861diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50862index 6ca2399..68d866b 100644
50863--- a/drivers/pci/hotplug/acpiphp_ibm.c
50864+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50865@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50866 goto init_cleanup;
50867 }
50868
50869- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50870+ pax_open_kernel();
50871+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50872+ pax_close_kernel();
50873 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50874
50875 return retval;
50876diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50877index 66b7bbe..26bee78 100644
50878--- a/drivers/pci/hotplug/cpcihp_generic.c
50879+++ b/drivers/pci/hotplug/cpcihp_generic.c
50880@@ -73,7 +73,6 @@ static u16 port;
50881 static unsigned int enum_bit;
50882 static u8 enum_mask;
50883
50884-static struct cpci_hp_controller_ops generic_hpc_ops;
50885 static struct cpci_hp_controller generic_hpc;
50886
50887 static int __init validate_parameters(void)
50888@@ -139,6 +138,10 @@ static int query_enum(void)
50889 return ((value & enum_mask) == enum_mask);
50890 }
50891
50892+static struct cpci_hp_controller_ops generic_hpc_ops = {
50893+ .query_enum = query_enum,
50894+};
50895+
50896 static int __init cpcihp_generic_init(void)
50897 {
50898 int status;
50899@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
50900 pci_dev_put(dev);
50901
50902 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
50903- generic_hpc_ops.query_enum = query_enum;
50904 generic_hpc.ops = &generic_hpc_ops;
50905
50906 status = cpci_hp_register_controller(&generic_hpc);
50907diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
50908index 7ecf34e..effed62 100644
50909--- a/drivers/pci/hotplug/cpcihp_zt5550.c
50910+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
50911@@ -59,7 +59,6 @@
50912 /* local variables */
50913 static bool debug;
50914 static bool poll;
50915-static struct cpci_hp_controller_ops zt5550_hpc_ops;
50916 static struct cpci_hp_controller zt5550_hpc;
50917
50918 /* Primary cPCI bus bridge device */
50919@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
50920 return 0;
50921 }
50922
50923+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
50924+ .query_enum = zt5550_hc_query_enum,
50925+};
50926+
50927 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
50928 {
50929 int status;
50930@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
50931 dbg("returned from zt5550_hc_config");
50932
50933 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
50934- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
50935 zt5550_hpc.ops = &zt5550_hpc_ops;
50936 if (!poll) {
50937 zt5550_hpc.irq = hc_dev->irq;
50938 zt5550_hpc.irq_flags = IRQF_SHARED;
50939 zt5550_hpc.dev_id = hc_dev;
50940
50941- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50942- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50943- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50944+ pax_open_kernel();
50945+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50946+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50947+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50948+ pax_open_kernel();
50949 } else {
50950 info("using ENUM# polling mode");
50951 }
50952diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
50953index 1e08ff8c..3cd145f 100644
50954--- a/drivers/pci/hotplug/cpqphp_nvram.c
50955+++ b/drivers/pci/hotplug/cpqphp_nvram.c
50956@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
50957
50958 void compaq_nvram_init (void __iomem *rom_start)
50959 {
50960+#ifndef CONFIG_PAX_KERNEXEC
50961 if (rom_start)
50962 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
50963+#endif
50964
50965 dbg("int15 entry = %p\n", compaq_int15_entry_point);
50966
50967diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
50968index 56d8486..f26113f 100644
50969--- a/drivers/pci/hotplug/pci_hotplug_core.c
50970+++ b/drivers/pci/hotplug/pci_hotplug_core.c
50971@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
50972 return -EINVAL;
50973 }
50974
50975- slot->ops->owner = owner;
50976- slot->ops->mod_name = mod_name;
50977+ pax_open_kernel();
50978+ *(struct module **)&slot->ops->owner = owner;
50979+ *(const char **)&slot->ops->mod_name = mod_name;
50980+ pax_close_kernel();
50981
50982 mutex_lock(&pci_hp_mutex);
50983 /*
50984diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
50985index 07aa722..84514b4 100644
50986--- a/drivers/pci/hotplug/pciehp_core.c
50987+++ b/drivers/pci/hotplug/pciehp_core.c
50988@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
50989 struct slot *slot = ctrl->slot;
50990 struct hotplug_slot *hotplug = NULL;
50991 struct hotplug_slot_info *info = NULL;
50992- struct hotplug_slot_ops *ops = NULL;
50993+ hotplug_slot_ops_no_const *ops = NULL;
50994 char name[SLOT_NAME_SIZE];
50995 int retval = -ENOMEM;
50996
50997diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
50998index c3e7dfc..cbd9625 100644
50999--- a/drivers/pci/msi.c
51000+++ b/drivers/pci/msi.c
51001@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
51002 {
51003 struct attribute **msi_attrs;
51004 struct attribute *msi_attr;
51005- struct device_attribute *msi_dev_attr;
51006- struct attribute_group *msi_irq_group;
51007+ device_attribute_no_const *msi_dev_attr;
51008+ attribute_group_no_const *msi_irq_group;
51009 const struct attribute_group **msi_irq_groups;
51010 struct msi_desc *entry;
51011 int ret = -ENOMEM;
51012@@ -573,7 +573,7 @@ error_attrs:
51013 count = 0;
51014 msi_attr = msi_attrs[count];
51015 while (msi_attr) {
51016- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
51017+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
51018 kfree(msi_attr->name);
51019 kfree(msi_dev_attr);
51020 ++count;
51021diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
51022index 312f23a..d21181c 100644
51023--- a/drivers/pci/pci-sysfs.c
51024+++ b/drivers/pci/pci-sysfs.c
51025@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
51026 {
51027 /* allocate attribute structure, piggyback attribute name */
51028 int name_len = write_combine ? 13 : 10;
51029- struct bin_attribute *res_attr;
51030+ bin_attribute_no_const *res_attr;
51031 int retval;
51032
51033 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
51034@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
51035 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
51036 {
51037 int retval;
51038- struct bin_attribute *attr;
51039+ bin_attribute_no_const *attr;
51040
51041 /* If the device has VPD, try to expose it in sysfs. */
51042 if (dev->vpd) {
51043@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
51044 {
51045 int retval;
51046 int rom_size = 0;
51047- struct bin_attribute *attr;
51048+ bin_attribute_no_const *attr;
51049
51050 if (!sysfs_initialized)
51051 return -EACCES;
51052diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
51053index 9bd762c2..6fb9504 100644
51054--- a/drivers/pci/pci.h
51055+++ b/drivers/pci/pci.h
51056@@ -99,7 +99,7 @@ struct pci_vpd_ops {
51057 struct pci_vpd {
51058 unsigned int len;
51059 const struct pci_vpd_ops *ops;
51060- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
51061+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
51062 };
51063
51064 int pci_vpd_pci22_init(struct pci_dev *dev);
51065diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
51066index 7d4fcdc..2f6d8f8 100644
51067--- a/drivers/pci/pcie/aspm.c
51068+++ b/drivers/pci/pcie/aspm.c
51069@@ -27,9 +27,9 @@
51070 #define MODULE_PARAM_PREFIX "pcie_aspm."
51071
51072 /* Note: those are not register definitions */
51073-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
51074-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
51075-#define ASPM_STATE_L1 (4) /* L1 state */
51076+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
51077+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
51078+#define ASPM_STATE_L1 (4U) /* L1 state */
51079 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
51080 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
51081
51082diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
51083index be35da2..ec16cdb 100644
51084--- a/drivers/pci/pcie/portdrv_pci.c
51085+++ b/drivers/pci/pcie/portdrv_pci.c
51086@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
51087 return 0;
51088 }
51089
51090-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
51091+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
51092 /*
51093 * Boxes that should not use MSI for PCIe PME signaling.
51094 */
51095diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
51096index c911857..56f3f9d 100644
51097--- a/drivers/pci/probe.c
51098+++ b/drivers/pci/probe.c
51099@@ -176,7 +176,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
51100 u16 orig_cmd;
51101 struct pci_bus_region region, inverted_region;
51102
51103- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
51104+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
51105
51106 /* No printks while decoding is disabled! */
51107 if (!dev->mmio_always_on) {
51108diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
51109index 3f155e7..0f4b1f0 100644
51110--- a/drivers/pci/proc.c
51111+++ b/drivers/pci/proc.c
51112@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
51113 static int __init pci_proc_init(void)
51114 {
51115 struct pci_dev *dev = NULL;
51116+
51117+#ifdef CONFIG_GRKERNSEC_PROC_ADD
51118+#ifdef CONFIG_GRKERNSEC_PROC_USER
51119+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
51120+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
51121+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
51122+#endif
51123+#else
51124 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
51125+#endif
51126 proc_create("devices", 0, proc_bus_pci_dir,
51127 &proc_bus_pci_dev_operations);
51128 proc_initialized = 1;
51129diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
51130index 3474920..acc9581 100644
51131--- a/drivers/platform/chrome/chromeos_pstore.c
51132+++ b/drivers/platform/chrome/chromeos_pstore.c
51133@@ -13,7 +13,7 @@
51134 #include <linux/platform_device.h>
51135 #include <linux/pstore_ram.h>
51136
51137-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
51138+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
51139 {
51140 /*
51141 * Today all Chromebooks/boxes ship with Google_* as version and
51142diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
51143index 1e1e594..8fe59c5 100644
51144--- a/drivers/platform/x86/alienware-wmi.c
51145+++ b/drivers/platform/x86/alienware-wmi.c
51146@@ -150,7 +150,7 @@ struct wmax_led_args {
51147 } __packed;
51148
51149 static struct platform_device *platform_device;
51150-static struct device_attribute *zone_dev_attrs;
51151+static device_attribute_no_const *zone_dev_attrs;
51152 static struct attribute **zone_attrs;
51153 static struct platform_zone *zone_data;
51154
51155@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
51156 }
51157 };
51158
51159-static struct attribute_group zone_attribute_group = {
51160+static attribute_group_no_const zone_attribute_group = {
51161 .name = "rgb_zones",
51162 };
51163
51164diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
51165index 7543a56..367ca8ed 100644
51166--- a/drivers/platform/x86/asus-wmi.c
51167+++ b/drivers/platform/x86/asus-wmi.c
51168@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
51169 int err;
51170 u32 retval = -1;
51171
51172+#ifdef CONFIG_GRKERNSEC_KMEM
51173+ return -EPERM;
51174+#endif
51175+
51176 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
51177
51178 if (err < 0)
51179@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
51180 int err;
51181 u32 retval = -1;
51182
51183+#ifdef CONFIG_GRKERNSEC_KMEM
51184+ return -EPERM;
51185+#endif
51186+
51187 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
51188 &retval);
51189
51190@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
51191 union acpi_object *obj;
51192 acpi_status status;
51193
51194+#ifdef CONFIG_GRKERNSEC_KMEM
51195+ return -EPERM;
51196+#endif
51197+
51198 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
51199 1, asus->debug.method_id,
51200 &input, &output);
51201diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
51202index b4e9447..9dc6ec34 100644
51203--- a/drivers/platform/x86/compal-laptop.c
51204+++ b/drivers/platform/x86/compal-laptop.c
51205@@ -765,7 +765,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
51206 return 1;
51207 }
51208
51209-static struct dmi_system_id __initdata compal_dmi_table[] = {
51210+static const struct dmi_system_id __initconst compal_dmi_table[] = {
51211 {
51212 .ident = "FL90/IFL90",
51213 .matches = {
51214diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
51215index 458e6c9..089aee7 100644
51216--- a/drivers/platform/x86/hdaps.c
51217+++ b/drivers/platform/x86/hdaps.c
51218@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
51219 "ThinkPad T42p", so the order of the entries matters.
51220 If your ThinkPad is not recognized, please update to latest
51221 BIOS. This is especially the case for some R52 ThinkPads. */
51222-static struct dmi_system_id __initdata hdaps_whitelist[] = {
51223+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
51224 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
51225 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
51226 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
51227diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
51228index 97c2be1..2ee50ce 100644
51229--- a/drivers/platform/x86/ibm_rtl.c
51230+++ b/drivers/platform/x86/ibm_rtl.c
51231@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
51232 }
51233
51234
51235-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
51236+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
51237 { \
51238 .matches = { \
51239 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
51240diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
51241index 8037c8b..f88445c 100644
51242--- a/drivers/platform/x86/intel_oaktrail.c
51243+++ b/drivers/platform/x86/intel_oaktrail.c
51244@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
51245 return 0;
51246 }
51247
51248-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
51249+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
51250 {
51251 .ident = "OakTrail platform",
51252 .matches = {
51253diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
51254index 0859877..59d596d 100644
51255--- a/drivers/platform/x86/msi-laptop.c
51256+++ b/drivers/platform/x86/msi-laptop.c
51257@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
51258 return 1;
51259 }
51260
51261-static struct dmi_system_id __initdata msi_dmi_table[] = {
51262+static const struct dmi_system_id __initconst msi_dmi_table[] = {
51263 {
51264 .ident = "MSI S270",
51265 .matches = {
51266@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
51267
51268 if (!quirks->ec_read_only) {
51269 /* allow userland write sysfs file */
51270- dev_attr_bluetooth.store = store_bluetooth;
51271- dev_attr_wlan.store = store_wlan;
51272- dev_attr_threeg.store = store_threeg;
51273- dev_attr_bluetooth.attr.mode |= S_IWUSR;
51274- dev_attr_wlan.attr.mode |= S_IWUSR;
51275- dev_attr_threeg.attr.mode |= S_IWUSR;
51276+ pax_open_kernel();
51277+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
51278+ *(void **)&dev_attr_wlan.store = store_wlan;
51279+ *(void **)&dev_attr_threeg.store = store_threeg;
51280+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
51281+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
51282+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
51283+ pax_close_kernel();
51284 }
51285
51286 /* disable hardware control by fn key */
51287diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
51288index 6d2bac0..ec2b029 100644
51289--- a/drivers/platform/x86/msi-wmi.c
51290+++ b/drivers/platform/x86/msi-wmi.c
51291@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
51292 static void msi_wmi_notify(u32 value, void *context)
51293 {
51294 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
51295- static struct key_entry *key;
51296+ struct key_entry *key;
51297 union acpi_object *obj;
51298 acpi_status status;
51299
51300diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
51301index 9e701b2..c68a7b5 100644
51302--- a/drivers/platform/x86/samsung-laptop.c
51303+++ b/drivers/platform/x86/samsung-laptop.c
51304@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
51305 return 0;
51306 }
51307
51308-static struct dmi_system_id __initdata samsung_dmi_table[] = {
51309+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
51310 {
51311 .matches = {
51312 DMI_MATCH(DMI_SYS_VENDOR,
51313diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
51314index e6aac72..e11ff24 100644
51315--- a/drivers/platform/x86/samsung-q10.c
51316+++ b/drivers/platform/x86/samsung-q10.c
51317@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
51318 return 1;
51319 }
51320
51321-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
51322+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
51323 {
51324 .ident = "Samsung Q10",
51325 .matches = {
51326diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
51327index e51c1e7..71bb385 100644
51328--- a/drivers/platform/x86/sony-laptop.c
51329+++ b/drivers/platform/x86/sony-laptop.c
51330@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
51331 }
51332
51333 /* High speed charging function */
51334-static struct device_attribute *hsc_handle;
51335+static device_attribute_no_const *hsc_handle;
51336
51337 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
51338 struct device_attribute *attr,
51339@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
51340 }
51341
51342 /* low battery function */
51343-static struct device_attribute *lowbatt_handle;
51344+static device_attribute_no_const *lowbatt_handle;
51345
51346 static ssize_t sony_nc_lowbatt_store(struct device *dev,
51347 struct device_attribute *attr,
51348@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
51349 }
51350
51351 /* fan speed function */
51352-static struct device_attribute *fan_handle, *hsf_handle;
51353+static device_attribute_no_const *fan_handle, *hsf_handle;
51354
51355 static ssize_t sony_nc_hsfan_store(struct device *dev,
51356 struct device_attribute *attr,
51357@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
51358 }
51359
51360 /* USB charge function */
51361-static struct device_attribute *uc_handle;
51362+static device_attribute_no_const *uc_handle;
51363
51364 static ssize_t sony_nc_usb_charge_store(struct device *dev,
51365 struct device_attribute *attr,
51366@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
51367 }
51368
51369 /* Panel ID function */
51370-static struct device_attribute *panel_handle;
51371+static device_attribute_no_const *panel_handle;
51372
51373 static ssize_t sony_nc_panelid_show(struct device *dev,
51374 struct device_attribute *attr, char *buffer)
51375@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
51376 }
51377
51378 /* smart connect function */
51379-static struct device_attribute *sc_handle;
51380+static device_attribute_no_const *sc_handle;
51381
51382 static ssize_t sony_nc_smart_conn_store(struct device *dev,
51383 struct device_attribute *attr,
51384@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
51385 .drv.pm = &sony_pic_pm,
51386 };
51387
51388-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
51389+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
51390 {
51391 .ident = "Sony Vaio",
51392 .matches = {
51393diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
51394index 28f3281..171d8c3 100644
51395--- a/drivers/platform/x86/thinkpad_acpi.c
51396+++ b/drivers/platform/x86/thinkpad_acpi.c
51397@@ -2459,10 +2459,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
51398 && !tp_features.bright_unkfw)
51399 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
51400 }
51401+}
51402
51403 #undef TPACPI_COMPARE_KEY
51404 #undef TPACPI_MAY_SEND_KEY
51405-}
51406
51407 /*
51408 * Polling driver
51409diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
51410index 438d4c7..ca8a2fb 100644
51411--- a/drivers/pnp/pnpbios/bioscalls.c
51412+++ b/drivers/pnp/pnpbios/bioscalls.c
51413@@ -59,7 +59,7 @@ do { \
51414 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
51415 } while(0)
51416
51417-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
51418+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
51419 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
51420
51421 /*
51422@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51423
51424 cpu = get_cpu();
51425 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
51426+
51427+ pax_open_kernel();
51428 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
51429+ pax_close_kernel();
51430
51431 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
51432 spin_lock_irqsave(&pnp_bios_lock, flags);
51433@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
51434 :"memory");
51435 spin_unlock_irqrestore(&pnp_bios_lock, flags);
51436
51437+ pax_open_kernel();
51438 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
51439+ pax_close_kernel();
51440+
51441 put_cpu();
51442
51443 /* If we get here and this is set then the PnP BIOS faulted on us. */
51444@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
51445 return status;
51446 }
51447
51448-void pnpbios_calls_init(union pnp_bios_install_struct *header)
51449+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
51450 {
51451 int i;
51452
51453@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51454 pnp_bios_callpoint.offset = header->fields.pm16offset;
51455 pnp_bios_callpoint.segment = PNP_CS16;
51456
51457+ pax_open_kernel();
51458+
51459 for_each_possible_cpu(i) {
51460 struct desc_struct *gdt = get_cpu_gdt_table(i);
51461 if (!gdt)
51462@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
51463 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
51464 (unsigned long)__va(header->fields.pm16dseg));
51465 }
51466+
51467+ pax_close_kernel();
51468 }
51469diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
51470index facd43b..b291260 100644
51471--- a/drivers/pnp/pnpbios/core.c
51472+++ b/drivers/pnp/pnpbios/core.c
51473@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
51474 return 0;
51475 }
51476
51477-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
51478+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
51479 { /* PnPBIOS GPF on boot */
51480 .callback = exploding_pnp_bios,
51481 .ident = "Higraded P14H",
51482diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
51483index dfe1ee8..67e820c 100644
51484--- a/drivers/power/pda_power.c
51485+++ b/drivers/power/pda_power.c
51486@@ -38,7 +38,11 @@ static struct power_supply *pda_psy_ac, *pda_psy_usb;
51487
51488 #if IS_ENABLED(CONFIG_USB_PHY)
51489 static struct usb_phy *transceiver;
51490-static struct notifier_block otg_nb;
51491+static int otg_handle_notification(struct notifier_block *nb,
51492+ unsigned long event, void *unused);
51493+static struct notifier_block otg_nb = {
51494+ .notifier_call = otg_handle_notification
51495+};
51496 #endif
51497
51498 static struct regulator *ac_draw;
51499@@ -373,7 +377,6 @@ static int pda_power_probe(struct platform_device *pdev)
51500
51501 #if IS_ENABLED(CONFIG_USB_PHY)
51502 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51503- otg_nb.notifier_call = otg_handle_notification;
51504 ret = usb_register_notifier(transceiver, &otg_nb);
51505 if (ret) {
51506 dev_err(dev, "failure to register otg notifier\n");
51507diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51508index cc439fd..8fa30df 100644
51509--- a/drivers/power/power_supply.h
51510+++ b/drivers/power/power_supply.h
51511@@ -16,12 +16,12 @@ struct power_supply;
51512
51513 #ifdef CONFIG_SYSFS
51514
51515-extern void power_supply_init_attrs(struct device_type *dev_type);
51516+extern void power_supply_init_attrs(void);
51517 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51518
51519 #else
51520
51521-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51522+static inline void power_supply_init_attrs(void) {}
51523 #define power_supply_uevent NULL
51524
51525 #endif /* CONFIG_SYSFS */
51526diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51527index 4bc0c7f..198c99d 100644
51528--- a/drivers/power/power_supply_core.c
51529+++ b/drivers/power/power_supply_core.c
51530@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51531 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51532 EXPORT_SYMBOL_GPL(power_supply_notifier);
51533
51534-static struct device_type power_supply_dev_type;
51535+extern const struct attribute_group *power_supply_attr_groups[];
51536+static struct device_type power_supply_dev_type = {
51537+ .groups = power_supply_attr_groups,
51538+};
51539
51540 #define POWER_SUPPLY_DEFERRED_REGISTER_TIME msecs_to_jiffies(10)
51541
51542@@ -921,7 +924,7 @@ static int __init power_supply_class_init(void)
51543 return PTR_ERR(power_supply_class);
51544
51545 power_supply_class->dev_uevent = power_supply_uevent;
51546- power_supply_init_attrs(&power_supply_dev_type);
51547+ power_supply_init_attrs();
51548
51549 return 0;
51550 }
51551diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51552index 9134e3d..45eee1e 100644
51553--- a/drivers/power/power_supply_sysfs.c
51554+++ b/drivers/power/power_supply_sysfs.c
51555@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51556 .is_visible = power_supply_attr_is_visible,
51557 };
51558
51559-static const struct attribute_group *power_supply_attr_groups[] = {
51560+const struct attribute_group *power_supply_attr_groups[] = {
51561 &power_supply_attr_group,
51562 NULL,
51563 };
51564
51565-void power_supply_init_attrs(struct device_type *dev_type)
51566+void power_supply_init_attrs(void)
51567 {
51568 int i;
51569
51570- dev_type->groups = power_supply_attr_groups;
51571-
51572 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51573 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51574 }
51575diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51576index 84419af..268ede8 100644
51577--- a/drivers/powercap/powercap_sys.c
51578+++ b/drivers/powercap/powercap_sys.c
51579@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51580 struct device_attribute name_attr;
51581 };
51582
51583+static ssize_t show_constraint_name(struct device *dev,
51584+ struct device_attribute *dev_attr,
51585+ char *buf);
51586+
51587 static struct powercap_constraint_attr
51588- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51589+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51590+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51591+ .power_limit_attr = {
51592+ .attr = {
51593+ .name = NULL,
51594+ .mode = S_IWUSR | S_IRUGO
51595+ },
51596+ .show = show_constraint_power_limit_uw,
51597+ .store = store_constraint_power_limit_uw
51598+ },
51599+
51600+ .time_window_attr = {
51601+ .attr = {
51602+ .name = NULL,
51603+ .mode = S_IWUSR | S_IRUGO
51604+ },
51605+ .show = show_constraint_time_window_us,
51606+ .store = store_constraint_time_window_us
51607+ },
51608+
51609+ .max_power_attr = {
51610+ .attr = {
51611+ .name = NULL,
51612+ .mode = S_IRUGO
51613+ },
51614+ .show = show_constraint_max_power_uw,
51615+ .store = NULL
51616+ },
51617+
51618+ .min_power_attr = {
51619+ .attr = {
51620+ .name = NULL,
51621+ .mode = S_IRUGO
51622+ },
51623+ .show = show_constraint_min_power_uw,
51624+ .store = NULL
51625+ },
51626+
51627+ .max_time_window_attr = {
51628+ .attr = {
51629+ .name = NULL,
51630+ .mode = S_IRUGO
51631+ },
51632+ .show = show_constraint_max_time_window_us,
51633+ .store = NULL
51634+ },
51635+
51636+ .min_time_window_attr = {
51637+ .attr = {
51638+ .name = NULL,
51639+ .mode = S_IRUGO
51640+ },
51641+ .show = show_constraint_min_time_window_us,
51642+ .store = NULL
51643+ },
51644+
51645+ .name_attr = {
51646+ .attr = {
51647+ .name = NULL,
51648+ .mode = S_IRUGO
51649+ },
51650+ .show = show_constraint_name,
51651+ .store = NULL
51652+ }
51653+ }
51654+};
51655
51656 /* A list of powercap control_types */
51657 static LIST_HEAD(powercap_cntrl_list);
51658@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51659 }
51660
51661 static int create_constraint_attribute(int id, const char *name,
51662- int mode,
51663- struct device_attribute *dev_attr,
51664- ssize_t (*show)(struct device *,
51665- struct device_attribute *, char *),
51666- ssize_t (*store)(struct device *,
51667- struct device_attribute *,
51668- const char *, size_t)
51669- )
51670+ struct device_attribute *dev_attr)
51671 {
51672+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51673
51674- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51675- id, name);
51676- if (!dev_attr->attr.name)
51677+ if (!name)
51678 return -ENOMEM;
51679- dev_attr->attr.mode = mode;
51680- dev_attr->show = show;
51681- dev_attr->store = store;
51682+
51683+ pax_open_kernel();
51684+ *(const char **)&dev_attr->attr.name = name;
51685+ pax_close_kernel();
51686
51687 return 0;
51688 }
51689@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51690
51691 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51692 ret = create_constraint_attribute(i, "power_limit_uw",
51693- S_IWUSR | S_IRUGO,
51694- &constraint_attrs[i].power_limit_attr,
51695- show_constraint_power_limit_uw,
51696- store_constraint_power_limit_uw);
51697+ &constraint_attrs[i].power_limit_attr);
51698 if (ret)
51699 goto err_alloc;
51700 ret = create_constraint_attribute(i, "time_window_us",
51701- S_IWUSR | S_IRUGO,
51702- &constraint_attrs[i].time_window_attr,
51703- show_constraint_time_window_us,
51704- store_constraint_time_window_us);
51705+ &constraint_attrs[i].time_window_attr);
51706 if (ret)
51707 goto err_alloc;
51708- ret = create_constraint_attribute(i, "name", S_IRUGO,
51709- &constraint_attrs[i].name_attr,
51710- show_constraint_name,
51711- NULL);
51712+ ret = create_constraint_attribute(i, "name",
51713+ &constraint_attrs[i].name_attr);
51714 if (ret)
51715 goto err_alloc;
51716- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51717- &constraint_attrs[i].max_power_attr,
51718- show_constraint_max_power_uw,
51719- NULL);
51720+ ret = create_constraint_attribute(i, "max_power_uw",
51721+ &constraint_attrs[i].max_power_attr);
51722 if (ret)
51723 goto err_alloc;
51724- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51725- &constraint_attrs[i].min_power_attr,
51726- show_constraint_min_power_uw,
51727- NULL);
51728+ ret = create_constraint_attribute(i, "min_power_uw",
51729+ &constraint_attrs[i].min_power_attr);
51730 if (ret)
51731 goto err_alloc;
51732 ret = create_constraint_attribute(i, "max_time_window_us",
51733- S_IRUGO,
51734- &constraint_attrs[i].max_time_window_attr,
51735- show_constraint_max_time_window_us,
51736- NULL);
51737+ &constraint_attrs[i].max_time_window_attr);
51738 if (ret)
51739 goto err_alloc;
51740 ret = create_constraint_attribute(i, "min_time_window_us",
51741- S_IRUGO,
51742- &constraint_attrs[i].min_time_window_attr,
51743- show_constraint_min_time_window_us,
51744- NULL);
51745+ &constraint_attrs[i].min_time_window_attr);
51746 if (ret)
51747 goto err_alloc;
51748
51749@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51750 power_zone->zone_dev_attrs[count++] =
51751 &dev_attr_max_energy_range_uj.attr;
51752 if (power_zone->ops->get_energy_uj) {
51753+ pax_open_kernel();
51754 if (power_zone->ops->reset_energy_uj)
51755- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51756+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51757 else
51758- dev_attr_energy_uj.attr.mode = S_IRUGO;
51759+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51760+ pax_close_kernel();
51761 power_zone->zone_dev_attrs[count++] =
51762 &dev_attr_energy_uj.attr;
51763 }
51764diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51765index 9c5d414..c7900ce 100644
51766--- a/drivers/ptp/ptp_private.h
51767+++ b/drivers/ptp/ptp_private.h
51768@@ -51,7 +51,7 @@ struct ptp_clock {
51769 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51770 wait_queue_head_t tsev_wq;
51771 int defunct; /* tells readers to go away when clock is being removed */
51772- struct device_attribute *pin_dev_attr;
51773+ device_attribute_no_const *pin_dev_attr;
51774 struct attribute **pin_attr;
51775 struct attribute_group pin_attr_group;
51776 };
51777diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51778index 302e626..12579af 100644
51779--- a/drivers/ptp/ptp_sysfs.c
51780+++ b/drivers/ptp/ptp_sysfs.c
51781@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
51782 goto no_pin_attr;
51783
51784 for (i = 0; i < n_pins; i++) {
51785- struct device_attribute *da = &ptp->pin_dev_attr[i];
51786+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
51787 sysfs_attr_init(&da->attr);
51788 da->attr.name = info->pin_config[i].name;
51789 da->attr.mode = 0644;
51790diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
51791index 8a28116..05b0ad5 100644
51792--- a/drivers/regulator/core.c
51793+++ b/drivers/regulator/core.c
51794@@ -3603,7 +3603,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51795 const struct regulation_constraints *constraints = NULL;
51796 const struct regulator_init_data *init_data;
51797 struct regulator_config *config = NULL;
51798- static atomic_t regulator_no = ATOMIC_INIT(-1);
51799+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
51800 struct regulator_dev *rdev;
51801 struct device *dev;
51802 int ret, i;
51803@@ -3686,7 +3686,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51804 rdev->dev.class = &regulator_class;
51805 rdev->dev.parent = dev;
51806 dev_set_name(&rdev->dev, "regulator.%lu",
51807- (unsigned long) atomic_inc_return(&regulator_no));
51808+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
51809 ret = device_register(&rdev->dev);
51810 if (ret != 0) {
51811 put_device(&rdev->dev);
51812diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51813index 4071d74..260b15a 100644
51814--- a/drivers/regulator/max8660.c
51815+++ b/drivers/regulator/max8660.c
51816@@ -423,8 +423,10 @@ static int max8660_probe(struct i2c_client *client,
51817 max8660->shadow_regs[MAX8660_OVER1] = 5;
51818 } else {
51819 /* Otherwise devices can be toggled via software */
51820- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51821- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51822+ pax_open_kernel();
51823+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51824+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51825+ pax_close_kernel();
51826 }
51827
51828 /*
51829diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51830index c3d55c2..0dddfe6 100644
51831--- a/drivers/regulator/max8973-regulator.c
51832+++ b/drivers/regulator/max8973-regulator.c
51833@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51834 if (!pdata || !pdata->enable_ext_control) {
51835 max->desc.enable_reg = MAX8973_VOUT;
51836 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51837- max->ops.enable = regulator_enable_regmap;
51838- max->ops.disable = regulator_disable_regmap;
51839- max->ops.is_enabled = regulator_is_enabled_regmap;
51840+ pax_open_kernel();
51841+ *(void **)&max->ops.enable = regulator_enable_regmap;
51842+ *(void **)&max->ops.disable = regulator_disable_regmap;
51843+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51844+ pax_close_kernel();
51845 }
51846
51847 if (pdata) {
51848diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51849index 0d17c92..a29f627 100644
51850--- a/drivers/regulator/mc13892-regulator.c
51851+++ b/drivers/regulator/mc13892-regulator.c
51852@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51853 mc13xxx_unlock(mc13892);
51854
51855 /* update mc13892_vcam ops */
51856- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51857+ pax_open_kernel();
51858+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51859 sizeof(struct regulator_ops));
51860- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51861- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51862+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51863+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51864+ pax_close_kernel();
51865 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51866
51867 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51868diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51869index a82556a0..e842923 100644
51870--- a/drivers/rtc/rtc-cmos.c
51871+++ b/drivers/rtc/rtc-cmos.c
51872@@ -793,7 +793,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51873 hpet_rtc_timer_init();
51874
51875 /* export at least the first block of NVRAM */
51876- nvram.size = address_space - NVRAM_OFFSET;
51877+ pax_open_kernel();
51878+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
51879+ pax_close_kernel();
51880 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
51881 if (retval < 0) {
51882 dev_dbg(dev, "can't create nvram file? %d\n", retval);
51883diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
51884index 799c34b..8e9786a 100644
51885--- a/drivers/rtc/rtc-dev.c
51886+++ b/drivers/rtc/rtc-dev.c
51887@@ -16,6 +16,7 @@
51888 #include <linux/module.h>
51889 #include <linux/rtc.h>
51890 #include <linux/sched.h>
51891+#include <linux/grsecurity.h>
51892 #include "rtc-core.h"
51893
51894 static dev_t rtc_devt;
51895@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
51896 if (copy_from_user(&tm, uarg, sizeof(tm)))
51897 return -EFAULT;
51898
51899+ gr_log_timechange();
51900+
51901 return rtc_set_time(rtc, &tm);
51902
51903 case RTC_PIE_ON:
51904diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
51905index 4ffabb3..1f87fca 100644
51906--- a/drivers/rtc/rtc-ds1307.c
51907+++ b/drivers/rtc/rtc-ds1307.c
51908@@ -107,7 +107,7 @@ struct ds1307 {
51909 u8 offset; /* register's offset */
51910 u8 regs[11];
51911 u16 nvram_offset;
51912- struct bin_attribute *nvram;
51913+ bin_attribute_no_const *nvram;
51914 enum ds_type type;
51915 unsigned long flags;
51916 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
51917diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
51918index 90abb5b..e0bf6dd 100644
51919--- a/drivers/rtc/rtc-m48t59.c
51920+++ b/drivers/rtc/rtc-m48t59.c
51921@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
51922 if (IS_ERR(m48t59->rtc))
51923 return PTR_ERR(m48t59->rtc);
51924
51925- m48t59_nvram_attr.size = pdata->offset;
51926+ pax_open_kernel();
51927+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
51928+ pax_close_kernel();
51929
51930 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
51931 if (ret)
51932diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c
51933index 3a2da4c..e88493c 100644
51934--- a/drivers/rtc/rtc-test.c
51935+++ b/drivers/rtc/rtc-test.c
51936@@ -112,8 +112,10 @@ static int test_probe(struct platform_device *plat_dev)
51937 struct rtc_device *rtc;
51938
51939 if (test_mmss64) {
51940- test_rtc_ops.set_mmss64 = test_rtc_set_mmss64;
51941- test_rtc_ops.set_mmss = NULL;
51942+ pax_open_kernel();
51943+ *(void **)&test_rtc_ops.set_mmss64 = test_rtc_set_mmss64;
51944+ *(void **)&test_rtc_ops.set_mmss = NULL;
51945+ pax_close_kernel();
51946 }
51947
51948 rtc = devm_rtc_device_register(&plat_dev->dev, "test",
51949diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
51950index 1f74760..8e00a89 100644
51951--- a/drivers/scsi/be2iscsi/be_main.c
51952+++ b/drivers/scsi/be2iscsi/be_main.c
51953@@ -3165,7 +3165,7 @@ be_sgl_create_contiguous(void *virtual_address,
51954 {
51955 WARN_ON(!virtual_address);
51956 WARN_ON(!physical_address);
51957- WARN_ON(!length > 0);
51958+ WARN_ON(!length);
51959 WARN_ON(!sgl);
51960
51961 sgl->va = virtual_address;
51962diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
51963index e693af6..2e525b6 100644
51964--- a/drivers/scsi/bfa/bfa_fcpim.h
51965+++ b/drivers/scsi/bfa/bfa_fcpim.h
51966@@ -36,7 +36,7 @@ struct bfa_iotag_s {
51967
51968 struct bfa_itn_s {
51969 bfa_isr_func_t isr;
51970-};
51971+} __no_const;
51972
51973 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
51974 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
51975diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
51976index 0f19455..ef7adb5 100644
51977--- a/drivers/scsi/bfa/bfa_fcs.c
51978+++ b/drivers/scsi/bfa/bfa_fcs.c
51979@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
51980 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
51981
51982 static struct bfa_fcs_mod_s fcs_modules[] = {
51983- { bfa_fcs_port_attach, NULL, NULL },
51984- { bfa_fcs_uf_attach, NULL, NULL },
51985- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
51986- bfa_fcs_fabric_modexit },
51987+ {
51988+ .attach = bfa_fcs_port_attach,
51989+ .modinit = NULL,
51990+ .modexit = NULL
51991+ },
51992+ {
51993+ .attach = bfa_fcs_uf_attach,
51994+ .modinit = NULL,
51995+ .modexit = NULL
51996+ },
51997+ {
51998+ .attach = bfa_fcs_fabric_attach,
51999+ .modinit = bfa_fcs_fabric_modinit,
52000+ .modexit = bfa_fcs_fabric_modexit
52001+ },
52002 };
52003
52004 /*
52005diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
52006index ff75ef8..2dfe00a 100644
52007--- a/drivers/scsi/bfa/bfa_fcs_lport.c
52008+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
52009@@ -89,15 +89,26 @@ static struct {
52010 void (*offline) (struct bfa_fcs_lport_s *port);
52011 } __port_action[] = {
52012 {
52013- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
52014- bfa_fcs_lport_unknown_offline}, {
52015- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
52016- bfa_fcs_lport_fab_offline}, {
52017- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
52018- bfa_fcs_lport_n2n_offline}, {
52019- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
52020- bfa_fcs_lport_loop_offline},
52021- };
52022+ .init = bfa_fcs_lport_unknown_init,
52023+ .online = bfa_fcs_lport_unknown_online,
52024+ .offline = bfa_fcs_lport_unknown_offline
52025+ },
52026+ {
52027+ .init = bfa_fcs_lport_fab_init,
52028+ .online = bfa_fcs_lport_fab_online,
52029+ .offline = bfa_fcs_lport_fab_offline
52030+ },
52031+ {
52032+ .init = bfa_fcs_lport_n2n_init,
52033+ .online = bfa_fcs_lport_n2n_online,
52034+ .offline = bfa_fcs_lport_n2n_offline
52035+ },
52036+ {
52037+ .init = bfa_fcs_lport_loop_init,
52038+ .online = bfa_fcs_lport_loop_online,
52039+ .offline = bfa_fcs_lport_loop_offline
52040+ },
52041+};
52042
52043 /*
52044 * fcs_port_sm FCS logical port state machine
52045diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
52046index a38aafa0..fe8f03b 100644
52047--- a/drivers/scsi/bfa/bfa_ioc.h
52048+++ b/drivers/scsi/bfa/bfa_ioc.h
52049@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
52050 bfa_ioc_disable_cbfn_t disable_cbfn;
52051 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
52052 bfa_ioc_reset_cbfn_t reset_cbfn;
52053-};
52054+} __no_const;
52055
52056 /*
52057 * IOC event notification mechanism.
52058@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
52059 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
52060 enum bfi_ioc_state fwstate);
52061 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
52062-};
52063+} __no_const;
52064
52065 /*
52066 * Queue element to wait for room in request queue. FIFO order is
52067diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
52068index a14c784..6de6790 100644
52069--- a/drivers/scsi/bfa/bfa_modules.h
52070+++ b/drivers/scsi/bfa/bfa_modules.h
52071@@ -78,12 +78,12 @@ enum {
52072 \
52073 extern struct bfa_module_s hal_mod_ ## __mod; \
52074 struct bfa_module_s hal_mod_ ## __mod = { \
52075- bfa_ ## __mod ## _meminfo, \
52076- bfa_ ## __mod ## _attach, \
52077- bfa_ ## __mod ## _detach, \
52078- bfa_ ## __mod ## _start, \
52079- bfa_ ## __mod ## _stop, \
52080- bfa_ ## __mod ## _iocdisable, \
52081+ .meminfo = bfa_ ## __mod ## _meminfo, \
52082+ .attach = bfa_ ## __mod ## _attach, \
52083+ .detach = bfa_ ## __mod ## _detach, \
52084+ .start = bfa_ ## __mod ## _start, \
52085+ .stop = bfa_ ## __mod ## _stop, \
52086+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
52087 }
52088
52089 #define BFA_CACHELINE_SZ (256)
52090diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
52091index 045c4e1..13de803 100644
52092--- a/drivers/scsi/fcoe/fcoe_sysfs.c
52093+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
52094@@ -33,8 +33,8 @@
52095 */
52096 #include "libfcoe.h"
52097
52098-static atomic_t ctlr_num;
52099-static atomic_t fcf_num;
52100+static atomic_unchecked_t ctlr_num;
52101+static atomic_unchecked_t fcf_num;
52102
52103 /*
52104 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
52105@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
52106 if (!ctlr)
52107 goto out;
52108
52109- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
52110+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
52111 ctlr->f = f;
52112 ctlr->mode = FIP_CONN_TYPE_FABRIC;
52113 INIT_LIST_HEAD(&ctlr->fcfs);
52114@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
52115 fcf->dev.parent = &ctlr->dev;
52116 fcf->dev.bus = &fcoe_bus_type;
52117 fcf->dev.type = &fcoe_fcf_device_type;
52118- fcf->id = atomic_inc_return(&fcf_num) - 1;
52119+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
52120 fcf->state = FCOE_FCF_STATE_UNKNOWN;
52121
52122 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
52123@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
52124 {
52125 int error;
52126
52127- atomic_set(&ctlr_num, 0);
52128- atomic_set(&fcf_num, 0);
52129+ atomic_set_unchecked(&ctlr_num, 0);
52130+ atomic_set_unchecked(&fcf_num, 0);
52131
52132 error = bus_register(&fcoe_bus_type);
52133 if (error)
52134diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
52135index 8bb173e..20236b4 100644
52136--- a/drivers/scsi/hosts.c
52137+++ b/drivers/scsi/hosts.c
52138@@ -42,7 +42,7 @@
52139 #include "scsi_logging.h"
52140
52141
52142-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52143+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
52144
52145
52146 static void scsi_host_cls_release(struct device *dev)
52147@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
52148 * subtract one because we increment first then return, but we need to
52149 * know what the next host number was before increment
52150 */
52151- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
52152+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
52153 shost->dma_channel = 0xff;
52154
52155 /* These three are default values which can be overridden */
52156diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
52157index 8eab107..599cd79 100644
52158--- a/drivers/scsi/hpsa.c
52159+++ b/drivers/scsi/hpsa.c
52160@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
52161 struct reply_queue_buffer *rq = &h->reply_queue[q];
52162
52163 if (h->transMethod & CFGTBL_Trans_io_accel1)
52164- return h->access.command_completed(h, q);
52165+ return h->access->command_completed(h, q);
52166
52167 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
52168- return h->access.command_completed(h, q);
52169+ return h->access->command_completed(h, q);
52170
52171 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
52172 a = rq->head[rq->current_entry];
52173@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
52174 break;
52175 default:
52176 set_performant_mode(h, c);
52177- h->access.submit_command(h, c);
52178+ h->access->submit_command(h, c);
52179 }
52180 }
52181
52182@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
52183
52184 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
52185 {
52186- return h->access.command_completed(h, q);
52187+ return h->access->command_completed(h, q);
52188 }
52189
52190 static inline bool interrupt_pending(struct ctlr_info *h)
52191 {
52192- return h->access.intr_pending(h);
52193+ return h->access->intr_pending(h);
52194 }
52195
52196 static inline long interrupt_not_for_us(struct ctlr_info *h)
52197 {
52198- return (h->access.intr_pending(h) == 0) ||
52199+ return (h->access->intr_pending(h) == 0) ||
52200 (h->interrupts_enabled == 0);
52201 }
52202
52203@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
52204 if (prod_index < 0)
52205 return prod_index;
52206 h->product_name = products[prod_index].product_name;
52207- h->access = *(products[prod_index].access);
52208+ h->access = products[prod_index].access;
52209
52210 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
52211 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
52212@@ -6647,7 +6647,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
52213 unsigned long flags;
52214 u32 lockup_detected;
52215
52216- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52217+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52218 spin_lock_irqsave(&h->lock, flags);
52219 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
52220 if (!lockup_detected) {
52221@@ -6922,7 +6922,7 @@ reinit_after_soft_reset:
52222 }
52223
52224 /* make sure the board interrupts are off */
52225- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52226+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52227
52228 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
52229 goto clean2;
52230@@ -6958,7 +6958,7 @@ reinit_after_soft_reset:
52231 * fake ones to scoop up any residual completions.
52232 */
52233 spin_lock_irqsave(&h->lock, flags);
52234- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52235+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52236 spin_unlock_irqrestore(&h->lock, flags);
52237 hpsa_free_irqs(h);
52238 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
52239@@ -6977,9 +6977,9 @@ reinit_after_soft_reset:
52240 dev_info(&h->pdev->dev, "Board READY.\n");
52241 dev_info(&h->pdev->dev,
52242 "Waiting for stale completions to drain.\n");
52243- h->access.set_intr_mask(h, HPSA_INTR_ON);
52244+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52245 msleep(10000);
52246- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52247+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52248
52249 rc = controller_reset_failed(h->cfgtable);
52250 if (rc)
52251@@ -7004,7 +7004,7 @@ reinit_after_soft_reset:
52252
52253
52254 /* Turn the interrupts on so we can service requests */
52255- h->access.set_intr_mask(h, HPSA_INTR_ON);
52256+ h->access->set_intr_mask(h, HPSA_INTR_ON);
52257
52258 hpsa_hba_inquiry(h);
52259 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
52260@@ -7077,7 +7077,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
52261 * To write all data in the battery backed cache to disks
52262 */
52263 hpsa_flush_cache(h);
52264- h->access.set_intr_mask(h, HPSA_INTR_OFF);
52265+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
52266 hpsa_free_irqs_and_disable_msix(h);
52267 }
52268
52269@@ -7198,7 +7198,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52270 CFGTBL_Trans_enable_directed_msix |
52271 (trans_support & (CFGTBL_Trans_io_accel1 |
52272 CFGTBL_Trans_io_accel2));
52273- struct access_method access = SA5_performant_access;
52274+ struct access_method *access = &SA5_performant_access;
52275
52276 /* This is a bit complicated. There are 8 registers on
52277 * the controller which we write to to tell it 8 different
52278@@ -7240,7 +7240,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52279 * perform the superfluous readl() after each command submission.
52280 */
52281 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
52282- access = SA5_performant_access_no_read;
52283+ access = &SA5_performant_access_no_read;
52284
52285 /* Controller spec: zero out this buffer. */
52286 for (i = 0; i < h->nreply_queues; i++)
52287@@ -7270,12 +7270,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
52288 * enable outbound interrupt coalescing in accelerator mode;
52289 */
52290 if (trans_support & CFGTBL_Trans_io_accel1) {
52291- access = SA5_ioaccel_mode1_access;
52292+ access = &SA5_ioaccel_mode1_access;
52293 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52294 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52295 } else {
52296 if (trans_support & CFGTBL_Trans_io_accel2) {
52297- access = SA5_ioaccel_mode2_access;
52298+ access = &SA5_ioaccel_mode2_access;
52299 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
52300 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
52301 }
52302diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
52303index 6577130..955f9a4 100644
52304--- a/drivers/scsi/hpsa.h
52305+++ b/drivers/scsi/hpsa.h
52306@@ -143,7 +143,7 @@ struct ctlr_info {
52307 unsigned int msix_vector;
52308 unsigned int msi_vector;
52309 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
52310- struct access_method access;
52311+ struct access_method *access;
52312 char hba_mode_enabled;
52313
52314 /* queue and queue Info */
52315@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
52316 }
52317
52318 static struct access_method SA5_access = {
52319- SA5_submit_command,
52320- SA5_intr_mask,
52321- SA5_intr_pending,
52322- SA5_completed,
52323+ .submit_command = SA5_submit_command,
52324+ .set_intr_mask = SA5_intr_mask,
52325+ .intr_pending = SA5_intr_pending,
52326+ .command_completed = SA5_completed,
52327 };
52328
52329 static struct access_method SA5_ioaccel_mode1_access = {
52330- SA5_submit_command,
52331- SA5_performant_intr_mask,
52332- SA5_ioaccel_mode1_intr_pending,
52333- SA5_ioaccel_mode1_completed,
52334+ .submit_command = SA5_submit_command,
52335+ .set_intr_mask = SA5_performant_intr_mask,
52336+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
52337+ .command_completed = SA5_ioaccel_mode1_completed,
52338 };
52339
52340 static struct access_method SA5_ioaccel_mode2_access = {
52341- SA5_submit_command_ioaccel2,
52342- SA5_performant_intr_mask,
52343- SA5_performant_intr_pending,
52344- SA5_performant_completed,
52345+ .submit_command = SA5_submit_command_ioaccel2,
52346+ .set_intr_mask = SA5_performant_intr_mask,
52347+ .intr_pending = SA5_performant_intr_pending,
52348+ .command_completed = SA5_performant_completed,
52349 };
52350
52351 static struct access_method SA5_performant_access = {
52352- SA5_submit_command,
52353- SA5_performant_intr_mask,
52354- SA5_performant_intr_pending,
52355- SA5_performant_completed,
52356+ .submit_command = SA5_submit_command,
52357+ .set_intr_mask = SA5_performant_intr_mask,
52358+ .intr_pending = SA5_performant_intr_pending,
52359+ .command_completed = SA5_performant_completed,
52360 };
52361
52362 static struct access_method SA5_performant_access_no_read = {
52363- SA5_submit_command_no_read,
52364- SA5_performant_intr_mask,
52365- SA5_performant_intr_pending,
52366- SA5_performant_completed,
52367+ .submit_command = SA5_submit_command_no_read,
52368+ .set_intr_mask = SA5_performant_intr_mask,
52369+ .intr_pending = SA5_performant_intr_pending,
52370+ .command_completed = SA5_performant_completed,
52371 };
52372
52373 struct board_type {
52374diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
52375index 1b3a094..068e683 100644
52376--- a/drivers/scsi/libfc/fc_exch.c
52377+++ b/drivers/scsi/libfc/fc_exch.c
52378@@ -101,12 +101,12 @@ struct fc_exch_mgr {
52379 u16 pool_max_index;
52380
52381 struct {
52382- atomic_t no_free_exch;
52383- atomic_t no_free_exch_xid;
52384- atomic_t xid_not_found;
52385- atomic_t xid_busy;
52386- atomic_t seq_not_found;
52387- atomic_t non_bls_resp;
52388+ atomic_unchecked_t no_free_exch;
52389+ atomic_unchecked_t no_free_exch_xid;
52390+ atomic_unchecked_t xid_not_found;
52391+ atomic_unchecked_t xid_busy;
52392+ atomic_unchecked_t seq_not_found;
52393+ atomic_unchecked_t non_bls_resp;
52394 } stats;
52395 };
52396
52397@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
52398 /* allocate memory for exchange */
52399 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
52400 if (!ep) {
52401- atomic_inc(&mp->stats.no_free_exch);
52402+ atomic_inc_unchecked(&mp->stats.no_free_exch);
52403 goto out;
52404 }
52405 memset(ep, 0, sizeof(*ep));
52406@@ -874,7 +874,7 @@ out:
52407 return ep;
52408 err:
52409 spin_unlock_bh(&pool->lock);
52410- atomic_inc(&mp->stats.no_free_exch_xid);
52411+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
52412 mempool_free(ep, mp->ep_pool);
52413 return NULL;
52414 }
52415@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52416 xid = ntohs(fh->fh_ox_id); /* we originated exch */
52417 ep = fc_exch_find(mp, xid);
52418 if (!ep) {
52419- atomic_inc(&mp->stats.xid_not_found);
52420+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52421 reject = FC_RJT_OX_ID;
52422 goto out;
52423 }
52424@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52425 ep = fc_exch_find(mp, xid);
52426 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
52427 if (ep) {
52428- atomic_inc(&mp->stats.xid_busy);
52429+ atomic_inc_unchecked(&mp->stats.xid_busy);
52430 reject = FC_RJT_RX_ID;
52431 goto rel;
52432 }
52433@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52434 }
52435 xid = ep->xid; /* get our XID */
52436 } else if (!ep) {
52437- atomic_inc(&mp->stats.xid_not_found);
52438+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52439 reject = FC_RJT_RX_ID; /* XID not found */
52440 goto out;
52441 }
52442@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
52443 } else {
52444 sp = &ep->seq;
52445 if (sp->id != fh->fh_seq_id) {
52446- atomic_inc(&mp->stats.seq_not_found);
52447+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52448 if (f_ctl & FC_FC_END_SEQ) {
52449 /*
52450 * Update sequence_id based on incoming last
52451@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52452
52453 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
52454 if (!ep) {
52455- atomic_inc(&mp->stats.xid_not_found);
52456+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52457 goto out;
52458 }
52459 if (ep->esb_stat & ESB_ST_COMPLETE) {
52460- atomic_inc(&mp->stats.xid_not_found);
52461+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52462 goto rel;
52463 }
52464 if (ep->rxid == FC_XID_UNKNOWN)
52465 ep->rxid = ntohs(fh->fh_rx_id);
52466 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
52467- atomic_inc(&mp->stats.xid_not_found);
52468+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52469 goto rel;
52470 }
52471 if (ep->did != ntoh24(fh->fh_s_id) &&
52472 ep->did != FC_FID_FLOGI) {
52473- atomic_inc(&mp->stats.xid_not_found);
52474+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52475 goto rel;
52476 }
52477 sof = fr_sof(fp);
52478@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52479 sp->ssb_stat |= SSB_ST_RESP;
52480 sp->id = fh->fh_seq_id;
52481 } else if (sp->id != fh->fh_seq_id) {
52482- atomic_inc(&mp->stats.seq_not_found);
52483+ atomic_inc_unchecked(&mp->stats.seq_not_found);
52484 goto rel;
52485 }
52486
52487@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
52488 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
52489
52490 if (!sp)
52491- atomic_inc(&mp->stats.xid_not_found);
52492+ atomic_inc_unchecked(&mp->stats.xid_not_found);
52493 else
52494- atomic_inc(&mp->stats.non_bls_resp);
52495+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
52496
52497 fc_frame_free(fp);
52498 }
52499@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
52500
52501 list_for_each_entry(ema, &lport->ema_list, ema_list) {
52502 mp = ema->mp;
52503- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
52504+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
52505 st->fc_no_free_exch_xid +=
52506- atomic_read(&mp->stats.no_free_exch_xid);
52507- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
52508- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
52509- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
52510- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
52511+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
52512+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
52513+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52514+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52515+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52516 }
52517 }
52518 EXPORT_SYMBOL(fc_exch_update_stats);
52519diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52520index 9c706d8..d3e3ed2 100644
52521--- a/drivers/scsi/libsas/sas_ata.c
52522+++ b/drivers/scsi/libsas/sas_ata.c
52523@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52524 .postreset = ata_std_postreset,
52525 .error_handler = ata_std_error_handler,
52526 .post_internal_cmd = sas_ata_post_internal,
52527- .qc_defer = ata_std_qc_defer,
52528+ .qc_defer = ata_std_qc_defer,
52529 .qc_prep = ata_noop_qc_prep,
52530 .qc_issue = sas_ata_qc_issue,
52531 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52532diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52533index 9b81a34..a9b7b8c 100644
52534--- a/drivers/scsi/lpfc/lpfc.h
52535+++ b/drivers/scsi/lpfc/lpfc.h
52536@@ -433,7 +433,7 @@ struct lpfc_vport {
52537 struct dentry *debug_nodelist;
52538 struct dentry *vport_debugfs_root;
52539 struct lpfc_debugfs_trc *disc_trc;
52540- atomic_t disc_trc_cnt;
52541+ atomic_unchecked_t disc_trc_cnt;
52542 #endif
52543 uint8_t stat_data_enabled;
52544 uint8_t stat_data_blocked;
52545@@ -883,8 +883,8 @@ struct lpfc_hba {
52546 struct timer_list fabric_block_timer;
52547 unsigned long bit_flags;
52548 #define FABRIC_COMANDS_BLOCKED 0
52549- atomic_t num_rsrc_err;
52550- atomic_t num_cmd_success;
52551+ atomic_unchecked_t num_rsrc_err;
52552+ atomic_unchecked_t num_cmd_success;
52553 unsigned long last_rsrc_error_time;
52554 unsigned long last_ramp_down_time;
52555 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52556@@ -919,7 +919,7 @@ struct lpfc_hba {
52557
52558 struct dentry *debug_slow_ring_trc;
52559 struct lpfc_debugfs_trc *slow_ring_trc;
52560- atomic_t slow_ring_trc_cnt;
52561+ atomic_unchecked_t slow_ring_trc_cnt;
52562 /* iDiag debugfs sub-directory */
52563 struct dentry *idiag_root;
52564 struct dentry *idiag_pci_cfg;
52565diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52566index 513edcb..805c6a8 100644
52567--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52568+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52569@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52570
52571 #include <linux/debugfs.h>
52572
52573-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52574+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52575 static unsigned long lpfc_debugfs_start_time = 0L;
52576
52577 /* iDiag */
52578@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52579 lpfc_debugfs_enable = 0;
52580
52581 len = 0;
52582- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52583+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52584 (lpfc_debugfs_max_disc_trc - 1);
52585 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52586 dtp = vport->disc_trc + i;
52587@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52588 lpfc_debugfs_enable = 0;
52589
52590 len = 0;
52591- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52592+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52593 (lpfc_debugfs_max_slow_ring_trc - 1);
52594 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52595 dtp = phba->slow_ring_trc + i;
52596@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52597 !vport || !vport->disc_trc)
52598 return;
52599
52600- index = atomic_inc_return(&vport->disc_trc_cnt) &
52601+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52602 (lpfc_debugfs_max_disc_trc - 1);
52603 dtp = vport->disc_trc + index;
52604 dtp->fmt = fmt;
52605 dtp->data1 = data1;
52606 dtp->data2 = data2;
52607 dtp->data3 = data3;
52608- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52609+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52610 dtp->jif = jiffies;
52611 #endif
52612 return;
52613@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52614 !phba || !phba->slow_ring_trc)
52615 return;
52616
52617- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52618+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52619 (lpfc_debugfs_max_slow_ring_trc - 1);
52620 dtp = phba->slow_ring_trc + index;
52621 dtp->fmt = fmt;
52622 dtp->data1 = data1;
52623 dtp->data2 = data2;
52624 dtp->data3 = data3;
52625- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52626+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52627 dtp->jif = jiffies;
52628 #endif
52629 return;
52630@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52631 "slow_ring buffer\n");
52632 goto debug_failed;
52633 }
52634- atomic_set(&phba->slow_ring_trc_cnt, 0);
52635+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52636 memset(phba->slow_ring_trc, 0,
52637 (sizeof(struct lpfc_debugfs_trc) *
52638 lpfc_debugfs_max_slow_ring_trc));
52639@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52640 "buffer\n");
52641 goto debug_failed;
52642 }
52643- atomic_set(&vport->disc_trc_cnt, 0);
52644+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52645
52646 snprintf(name, sizeof(name), "discovery_trace");
52647 vport->debug_disc_trc =
52648diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52649index e8c8c1e..5f2e11c 100644
52650--- a/drivers/scsi/lpfc/lpfc_init.c
52651+++ b/drivers/scsi/lpfc/lpfc_init.c
52652@@ -11406,8 +11406,10 @@ lpfc_init(void)
52653 "misc_register returned with status %d", error);
52654
52655 if (lpfc_enable_npiv) {
52656- lpfc_transport_functions.vport_create = lpfc_vport_create;
52657- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52658+ pax_open_kernel();
52659+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52660+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52661+ pax_close_kernel();
52662 }
52663 lpfc_transport_template =
52664 fc_attach_transport(&lpfc_transport_functions);
52665diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52666index c140f99..11b2505 100644
52667--- a/drivers/scsi/lpfc/lpfc_scsi.c
52668+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52669@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52670 unsigned long expires;
52671
52672 spin_lock_irqsave(&phba->hbalock, flags);
52673- atomic_inc(&phba->num_rsrc_err);
52674+ atomic_inc_unchecked(&phba->num_rsrc_err);
52675 phba->last_rsrc_error_time = jiffies;
52676
52677 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52678@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52679 unsigned long num_rsrc_err, num_cmd_success;
52680 int i;
52681
52682- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52683- num_cmd_success = atomic_read(&phba->num_cmd_success);
52684+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52685+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52686
52687 /*
52688 * The error and success command counters are global per
52689@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52690 }
52691 }
52692 lpfc_destroy_vport_work_array(phba, vports);
52693- atomic_set(&phba->num_rsrc_err, 0);
52694- atomic_set(&phba->num_cmd_success, 0);
52695+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52696+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52697 }
52698
52699 /**
52700diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52701index 3f26147..ee8efd1 100644
52702--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52703+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52704@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52705 {
52706 struct scsi_device *sdev = to_scsi_device(dev);
52707 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52708- static struct _raid_device *raid_device;
52709+ struct _raid_device *raid_device;
52710 unsigned long flags;
52711 Mpi2RaidVolPage0_t vol_pg0;
52712 Mpi2ConfigReply_t mpi_reply;
52713@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52714 {
52715 struct scsi_device *sdev = to_scsi_device(dev);
52716 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52717- static struct _raid_device *raid_device;
52718+ struct _raid_device *raid_device;
52719 unsigned long flags;
52720 Mpi2RaidVolPage0_t vol_pg0;
52721 Mpi2ConfigReply_t mpi_reply;
52722@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52723 Mpi2EventDataIrOperationStatus_t *event_data =
52724 (Mpi2EventDataIrOperationStatus_t *)
52725 fw_event->event_data;
52726- static struct _raid_device *raid_device;
52727+ struct _raid_device *raid_device;
52728 unsigned long flags;
52729 u16 handle;
52730
52731@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52732 u64 sas_address;
52733 struct _sas_device *sas_device;
52734 struct _sas_node *expander_device;
52735- static struct _raid_device *raid_device;
52736+ struct _raid_device *raid_device;
52737 u8 retry_count;
52738 unsigned long flags;
52739
52740diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52741index ed31d8c..ab856b3 100644
52742--- a/drivers/scsi/pmcraid.c
52743+++ b/drivers/scsi/pmcraid.c
52744@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52745 res->scsi_dev = scsi_dev;
52746 scsi_dev->hostdata = res;
52747 res->change_detected = 0;
52748- atomic_set(&res->read_failures, 0);
52749- atomic_set(&res->write_failures, 0);
52750+ atomic_set_unchecked(&res->read_failures, 0);
52751+ atomic_set_unchecked(&res->write_failures, 0);
52752 rc = 0;
52753 }
52754 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52755@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52756
52757 /* If this was a SCSI read/write command keep count of errors */
52758 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52759- atomic_inc(&res->read_failures);
52760+ atomic_inc_unchecked(&res->read_failures);
52761 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52762- atomic_inc(&res->write_failures);
52763+ atomic_inc_unchecked(&res->write_failures);
52764
52765 if (!RES_IS_GSCSI(res->cfg_entry) &&
52766 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52767@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52768 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52769 * hrrq_id assigned here in queuecommand
52770 */
52771- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52772+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52773 pinstance->num_hrrq;
52774 cmd->cmd_done = pmcraid_io_done;
52775
52776@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52777 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52778 * hrrq_id assigned here in queuecommand
52779 */
52780- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52781+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52782 pinstance->num_hrrq;
52783
52784 if (request_size) {
52785@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
52786
52787 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
52788 /* add resources only after host is added into system */
52789- if (!atomic_read(&pinstance->expose_resources))
52790+ if (!atomic_read_unchecked(&pinstance->expose_resources))
52791 return;
52792
52793 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
52794@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
52795 init_waitqueue_head(&pinstance->reset_wait_q);
52796
52797 atomic_set(&pinstance->outstanding_cmds, 0);
52798- atomic_set(&pinstance->last_message_id, 0);
52799- atomic_set(&pinstance->expose_resources, 0);
52800+ atomic_set_unchecked(&pinstance->last_message_id, 0);
52801+ atomic_set_unchecked(&pinstance->expose_resources, 0);
52802
52803 INIT_LIST_HEAD(&pinstance->free_res_q);
52804 INIT_LIST_HEAD(&pinstance->used_res_q);
52805@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52806 /* Schedule worker thread to handle CCN and take care of adding and
52807 * removing devices to OS
52808 */
52809- atomic_set(&pinstance->expose_resources, 1);
52810+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52811 schedule_work(&pinstance->worker_q);
52812 return rc;
52813
52814diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52815index e1d150f..6c6df44 100644
52816--- a/drivers/scsi/pmcraid.h
52817+++ b/drivers/scsi/pmcraid.h
52818@@ -748,7 +748,7 @@ struct pmcraid_instance {
52819 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52820
52821 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52822- atomic_t last_message_id;
52823+ atomic_unchecked_t last_message_id;
52824
52825 /* configuration table */
52826 struct pmcraid_config_table *cfg_table;
52827@@ -777,7 +777,7 @@ struct pmcraid_instance {
52828 atomic_t outstanding_cmds;
52829
52830 /* should add/delete resources to mid-layer now ?*/
52831- atomic_t expose_resources;
52832+ atomic_unchecked_t expose_resources;
52833
52834
52835
52836@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52837 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52838 };
52839 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52840- atomic_t read_failures; /* count of failed READ commands */
52841- atomic_t write_failures; /* count of failed WRITE commands */
52842+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52843+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52844
52845 /* To indicate add/delete/modify during CCN */
52846 u8 change_detected;
52847diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52848index 82b92c4..3178171 100644
52849--- a/drivers/scsi/qla2xxx/qla_attr.c
52850+++ b/drivers/scsi/qla2xxx/qla_attr.c
52851@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52852 return 0;
52853 }
52854
52855-struct fc_function_template qla2xxx_transport_functions = {
52856+fc_function_template_no_const qla2xxx_transport_functions = {
52857
52858 .show_host_node_name = 1,
52859 .show_host_port_name = 1,
52860@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52861 .bsg_timeout = qla24xx_bsg_timeout,
52862 };
52863
52864-struct fc_function_template qla2xxx_transport_vport_functions = {
52865+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52866
52867 .show_host_node_name = 1,
52868 .show_host_port_name = 1,
52869diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52870index 7686bfe..4710893 100644
52871--- a/drivers/scsi/qla2xxx/qla_gbl.h
52872+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52873@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52874 struct device_attribute;
52875 extern struct device_attribute *qla2x00_host_attrs[];
52876 struct fc_function_template;
52877-extern struct fc_function_template qla2xxx_transport_functions;
52878-extern struct fc_function_template qla2xxx_transport_vport_functions;
52879+extern fc_function_template_no_const qla2xxx_transport_functions;
52880+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52881 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52882 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52883 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52884diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52885index 7462dd7..5b64c24 100644
52886--- a/drivers/scsi/qla2xxx/qla_os.c
52887+++ b/drivers/scsi/qla2xxx/qla_os.c
52888@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52889 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52890 /* Ok, a 64bit DMA mask is applicable. */
52891 ha->flags.enable_64bit_addressing = 1;
52892- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52893- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52894+ pax_open_kernel();
52895+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52896+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52897+ pax_close_kernel();
52898 return;
52899 }
52900 }
52901diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52902index 8f6d0fb..1b21097 100644
52903--- a/drivers/scsi/qla4xxx/ql4_def.h
52904+++ b/drivers/scsi/qla4xxx/ql4_def.h
52905@@ -305,7 +305,7 @@ struct ddb_entry {
52906 * (4000 only) */
52907 atomic_t relogin_timer; /* Max Time to wait for
52908 * relogin to complete */
52909- atomic_t relogin_retry_count; /* Num of times relogin has been
52910+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
52911 * retried */
52912 uint32_t default_time2wait; /* Default Min time between
52913 * relogins (+aens) */
52914diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
52915index 6d25879..3031a9f 100644
52916--- a/drivers/scsi/qla4xxx/ql4_os.c
52917+++ b/drivers/scsi/qla4xxx/ql4_os.c
52918@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
52919 */
52920 if (!iscsi_is_session_online(cls_sess)) {
52921 /* Reset retry relogin timer */
52922- atomic_inc(&ddb_entry->relogin_retry_count);
52923+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
52924 DEBUG2(ql4_printk(KERN_INFO, ha,
52925 "%s: index[%d] relogin timed out-retrying"
52926 " relogin (%d), retry (%d)\n", __func__,
52927 ddb_entry->fw_ddb_index,
52928- atomic_read(&ddb_entry->relogin_retry_count),
52929+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
52930 ddb_entry->default_time2wait + 4));
52931 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
52932 atomic_set(&ddb_entry->retry_relogin_timer,
52933@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
52934
52935 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
52936 atomic_set(&ddb_entry->relogin_timer, 0);
52937- atomic_set(&ddb_entry->relogin_retry_count, 0);
52938+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
52939 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
52940 ddb_entry->default_relogin_timeout =
52941 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
52942diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
52943index 3833bf5..95feaf1 100644
52944--- a/drivers/scsi/scsi.c
52945+++ b/drivers/scsi/scsi.c
52946@@ -637,7 +637,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
52947
52948 good_bytes = scsi_bufflen(cmd);
52949 if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
52950- int old_good_bytes = good_bytes;
52951+ unsigned int old_good_bytes = good_bytes;
52952 drv = scsi_cmd_to_driver(cmd);
52953 if (drv->done)
52954 good_bytes = drv->done(cmd);
52955diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
52956index 448ebda..9bd345f 100644
52957--- a/drivers/scsi/scsi_lib.c
52958+++ b/drivers/scsi/scsi_lib.c
52959@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
52960 shost = sdev->host;
52961 scsi_init_cmd_errh(cmd);
52962 cmd->result = DID_NO_CONNECT << 16;
52963- atomic_inc(&cmd->device->iorequest_cnt);
52964+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52965
52966 /*
52967 * SCSI request completion path will do scsi_device_unbusy(),
52968@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
52969
52970 INIT_LIST_HEAD(&cmd->eh_entry);
52971
52972- atomic_inc(&cmd->device->iodone_cnt);
52973+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
52974 if (cmd->result)
52975- atomic_inc(&cmd->device->ioerr_cnt);
52976+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
52977
52978 disposition = scsi_decide_disposition(cmd);
52979 if (disposition != SUCCESS &&
52980@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
52981 struct Scsi_Host *host = cmd->device->host;
52982 int rtn = 0;
52983
52984- atomic_inc(&cmd->device->iorequest_cnt);
52985+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52986
52987 /* check if the device is still usable */
52988 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
52989diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
52990index 9ad4116..4e736fc 100644
52991--- a/drivers/scsi/scsi_sysfs.c
52992+++ b/drivers/scsi/scsi_sysfs.c
52993@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
52994 char *buf) \
52995 { \
52996 struct scsi_device *sdev = to_scsi_device(dev); \
52997- unsigned long long count = atomic_read(&sdev->field); \
52998+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
52999 return snprintf(buf, 20, "0x%llx\n", count); \
53000 } \
53001 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
53002diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
53003index 24eaaf6..de30ec9 100644
53004--- a/drivers/scsi/scsi_transport_fc.c
53005+++ b/drivers/scsi/scsi_transport_fc.c
53006@@ -502,7 +502,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
53007 * Netlink Infrastructure
53008 */
53009
53010-static atomic_t fc_event_seq;
53011+static atomic_unchecked_t fc_event_seq;
53012
53013 /**
53014 * fc_get_event_number - Obtain the next sequential FC event number
53015@@ -515,7 +515,7 @@ static atomic_t fc_event_seq;
53016 u32
53017 fc_get_event_number(void)
53018 {
53019- return atomic_add_return(1, &fc_event_seq);
53020+ return atomic_add_return_unchecked(1, &fc_event_seq);
53021 }
53022 EXPORT_SYMBOL(fc_get_event_number);
53023
53024@@ -659,7 +659,7 @@ static __init int fc_transport_init(void)
53025 {
53026 int error;
53027
53028- atomic_set(&fc_event_seq, 0);
53029+ atomic_set_unchecked(&fc_event_seq, 0);
53030
53031 error = transport_class_register(&fc_host_class);
53032 if (error)
53033@@ -849,7 +849,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
53034 char *cp;
53035
53036 *val = simple_strtoul(buf, &cp, 0);
53037- if ((*cp && (*cp != '\n')) || (*val < 0))
53038+ if (*cp && (*cp != '\n'))
53039 return -EINVAL;
53040 /*
53041 * Check for overflow; dev_loss_tmo is u32
53042diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
53043index 67d43e3..8cee73c 100644
53044--- a/drivers/scsi/scsi_transport_iscsi.c
53045+++ b/drivers/scsi/scsi_transport_iscsi.c
53046@@ -79,7 +79,7 @@ struct iscsi_internal {
53047 struct transport_container session_cont;
53048 };
53049
53050-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
53051+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
53052 static struct workqueue_struct *iscsi_eh_timer_workq;
53053
53054 static DEFINE_IDA(iscsi_sess_ida);
53055@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
53056 int err;
53057
53058 ihost = shost->shost_data;
53059- session->sid = atomic_add_return(1, &iscsi_session_nr);
53060+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
53061
53062 if (target_id == ISCSI_MAX_TARGET) {
53063 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
53064@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
53065 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
53066 ISCSI_TRANSPORT_VERSION);
53067
53068- atomic_set(&iscsi_session_nr, 0);
53069+ atomic_set_unchecked(&iscsi_session_nr, 0);
53070
53071 err = class_register(&iscsi_transport_class);
53072 if (err)
53073diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
53074index f115f67..b80b2c1 100644
53075--- a/drivers/scsi/scsi_transport_srp.c
53076+++ b/drivers/scsi/scsi_transport_srp.c
53077@@ -35,7 +35,7 @@
53078 #include "scsi_priv.h"
53079
53080 struct srp_host_attrs {
53081- atomic_t next_port_id;
53082+ atomic_unchecked_t next_port_id;
53083 };
53084 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
53085
53086@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
53087 struct Scsi_Host *shost = dev_to_shost(dev);
53088 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
53089
53090- atomic_set(&srp_host->next_port_id, 0);
53091+ atomic_set_unchecked(&srp_host->next_port_id, 0);
53092 return 0;
53093 }
53094
53095@@ -744,7 +744,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
53096 rport_fast_io_fail_timedout);
53097 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
53098
53099- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
53100+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
53101 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
53102
53103 transport_setup_device(&rport->dev);
53104diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
53105index 7f9d65f..e856438 100644
53106--- a/drivers/scsi/sd.c
53107+++ b/drivers/scsi/sd.c
53108@@ -111,7 +111,7 @@ static int sd_resume(struct device *);
53109 static void sd_rescan(struct device *);
53110 static int sd_init_command(struct scsi_cmnd *SCpnt);
53111 static void sd_uninit_command(struct scsi_cmnd *SCpnt);
53112-static int sd_done(struct scsi_cmnd *);
53113+static unsigned int sd_done(struct scsi_cmnd *);
53114 static int sd_eh_action(struct scsi_cmnd *, int);
53115 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
53116 static void scsi_disk_release(struct device *cdev);
53117@@ -1646,7 +1646,7 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
53118 *
53119 * Note: potentially run from within an ISR. Must not block.
53120 **/
53121-static int sd_done(struct scsi_cmnd *SCpnt)
53122+static unsigned int sd_done(struct scsi_cmnd *SCpnt)
53123 {
53124 int result = SCpnt->result;
53125 unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
53126@@ -2973,7 +2973,7 @@ static int sd_probe(struct device *dev)
53127 sdkp->disk = gd;
53128 sdkp->index = index;
53129 atomic_set(&sdkp->openers, 0);
53130- atomic_set(&sdkp->device->ioerr_cnt, 0);
53131+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
53132
53133 if (!sdp->request_queue->rq_timeout) {
53134 if (sdp->type != TYPE_MOD)
53135diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
53136index 9d7b7db..33ecc51 100644
53137--- a/drivers/scsi/sg.c
53138+++ b/drivers/scsi/sg.c
53139@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
53140 sdp->disk->disk_name,
53141 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
53142 NULL,
53143- (char *)arg);
53144+ (char __user *)arg);
53145 case BLKTRACESTART:
53146 return blk_trace_startstop(sdp->device->request_queue, 1);
53147 case BLKTRACESTOP:
53148diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
53149index 8bd54a6..58fa0d6 100644
53150--- a/drivers/scsi/sr.c
53151+++ b/drivers/scsi/sr.c
53152@@ -80,7 +80,7 @@ static DEFINE_MUTEX(sr_mutex);
53153 static int sr_probe(struct device *);
53154 static int sr_remove(struct device *);
53155 static int sr_init_command(struct scsi_cmnd *SCpnt);
53156-static int sr_done(struct scsi_cmnd *);
53157+static unsigned int sr_done(struct scsi_cmnd *);
53158 static int sr_runtime_suspend(struct device *dev);
53159
53160 static struct dev_pm_ops sr_pm_ops = {
53161@@ -312,13 +312,13 @@ do_tur:
53162 * It will be notified on the end of a SCSI read / write, and will take one
53163 * of several actions based on success or failure.
53164 */
53165-static int sr_done(struct scsi_cmnd *SCpnt)
53166+static unsigned int sr_done(struct scsi_cmnd *SCpnt)
53167 {
53168 int result = SCpnt->result;
53169- int this_count = scsi_bufflen(SCpnt);
53170- int good_bytes = (result == 0 ? this_count : 0);
53171- int block_sectors = 0;
53172- long error_sector;
53173+ unsigned int this_count = scsi_bufflen(SCpnt);
53174+ unsigned int good_bytes = (result == 0 ? this_count : 0);
53175+ unsigned int block_sectors = 0;
53176+ sector_t error_sector;
53177 struct scsi_cd *cd = scsi_cd(SCpnt->request->rq_disk);
53178
53179 #ifdef DEBUG
53180@@ -351,9 +351,12 @@ static int sr_done(struct scsi_cmnd *SCpnt)
53181 if (cd->device->sector_size == 2048)
53182 error_sector <<= 2;
53183 error_sector &= ~(block_sectors - 1);
53184- good_bytes = (error_sector -
53185- blk_rq_pos(SCpnt->request)) << 9;
53186- if (good_bytes < 0 || good_bytes >= this_count)
53187+ if (error_sector >= blk_rq_pos(SCpnt->request)) {
53188+ good_bytes = (error_sector -
53189+ blk_rq_pos(SCpnt->request)) << 9;
53190+ if (good_bytes >= this_count)
53191+ good_bytes = 0;
53192+ } else
53193 good_bytes = 0;
53194 /*
53195 * The SCSI specification allows for the value
53196diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
53197index c0d660f..24a5854 100644
53198--- a/drivers/soc/tegra/fuse/fuse-tegra.c
53199+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
53200@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
53201 return i;
53202 }
53203
53204-static struct bin_attribute fuse_bin_attr = {
53205+static bin_attribute_no_const fuse_bin_attr = {
53206 .attr = { .name = "fuse", .mode = S_IRUGO, },
53207 .read = fuse_read,
53208 };
53209diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
53210index d35c1a1..eda08dc 100644
53211--- a/drivers/spi/spi.c
53212+++ b/drivers/spi/spi.c
53213@@ -2206,7 +2206,7 @@ int spi_bus_unlock(struct spi_master *master)
53214 EXPORT_SYMBOL_GPL(spi_bus_unlock);
53215
53216 /* portable code must never pass more than 32 bytes */
53217-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
53218+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
53219
53220 static u8 *buf;
53221
53222diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
53223index b41429f..2de5373 100644
53224--- a/drivers/staging/android/timed_output.c
53225+++ b/drivers/staging/android/timed_output.c
53226@@ -25,7 +25,7 @@
53227 #include "timed_output.h"
53228
53229 static struct class *timed_output_class;
53230-static atomic_t device_count;
53231+static atomic_unchecked_t device_count;
53232
53233 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
53234 char *buf)
53235@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
53236 timed_output_class = class_create(THIS_MODULE, "timed_output");
53237 if (IS_ERR(timed_output_class))
53238 return PTR_ERR(timed_output_class);
53239- atomic_set(&device_count, 0);
53240+ atomic_set_unchecked(&device_count, 0);
53241 timed_output_class->dev_groups = timed_output_groups;
53242 }
53243
53244@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
53245 if (ret < 0)
53246 return ret;
53247
53248- tdev->index = atomic_inc_return(&device_count);
53249+ tdev->index = atomic_inc_return_unchecked(&device_count);
53250 tdev->dev = device_create(timed_output_class, NULL,
53251 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
53252 if (IS_ERR(tdev->dev))
53253diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
53254index e78ddbe..ac437c0 100644
53255--- a/drivers/staging/comedi/comedi_fops.c
53256+++ b/drivers/staging/comedi/comedi_fops.c
53257@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
53258 }
53259 cfp->last_attached = dev->attached;
53260 cfp->last_detach_count = dev->detach_count;
53261- ACCESS_ONCE(cfp->read_subdev) = read_s;
53262- ACCESS_ONCE(cfp->write_subdev) = write_s;
53263+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
53264+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
53265 }
53266
53267 static void comedi_file_check(struct file *file)
53268@@ -1951,7 +1951,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53269 !(s_old->async->cmd.flags & CMDF_WRITE))
53270 return -EBUSY;
53271
53272- ACCESS_ONCE(cfp->read_subdev) = s_new;
53273+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
53274 return 0;
53275 }
53276
53277@@ -1993,7 +1993,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
53278 (s_old->async->cmd.flags & CMDF_WRITE))
53279 return -EBUSY;
53280
53281- ACCESS_ONCE(cfp->write_subdev) = s_new;
53282+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
53283 return 0;
53284 }
53285
53286diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
53287index 53b748b..a5ae0b3 100644
53288--- a/drivers/staging/fbtft/fbtft-core.c
53289+++ b/drivers/staging/fbtft/fbtft-core.c
53290@@ -680,7 +680,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
53291 {
53292 struct fb_info *info;
53293 struct fbtft_par *par;
53294- struct fb_ops *fbops = NULL;
53295+ fb_ops_no_const *fbops = NULL;
53296 struct fb_deferred_io *fbdefio = NULL;
53297 struct fbtft_platform_data *pdata = dev->platform_data;
53298 u8 *vmem = NULL;
53299diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
53300index 9fd98cb..a9cf912 100644
53301--- a/drivers/staging/fbtft/fbtft.h
53302+++ b/drivers/staging/fbtft/fbtft.h
53303@@ -106,7 +106,7 @@ struct fbtft_ops {
53304
53305 int (*set_var)(struct fbtft_par *par);
53306 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
53307-};
53308+} __no_const;
53309
53310 /**
53311 * struct fbtft_display - Describes the display properties
53312diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
53313index 001348c..cfaac8a 100644
53314--- a/drivers/staging/gdm724x/gdm_tty.c
53315+++ b/drivers/staging/gdm724x/gdm_tty.c
53316@@ -44,7 +44,7 @@
53317 #define gdm_tty_send_control(n, r, v, d, l) (\
53318 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
53319
53320-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
53321+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
53322
53323 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
53324 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
53325diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
53326index d23c3c2..eb63c81 100644
53327--- a/drivers/staging/i2o/i2o.h
53328+++ b/drivers/staging/i2o/i2o.h
53329@@ -565,7 +565,7 @@ struct i2o_controller {
53330 struct i2o_device *exec; /* Executive */
53331 #if BITS_PER_LONG == 64
53332 spinlock_t context_list_lock; /* lock for context_list */
53333- atomic_t context_list_counter; /* needed for unique contexts */
53334+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
53335 struct list_head context_list; /* list of context id's
53336 and pointers */
53337 #endif
53338diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
53339index 780fee3..ca9dcae 100644
53340--- a/drivers/staging/i2o/i2o_proc.c
53341+++ b/drivers/staging/i2o/i2o_proc.c
53342@@ -253,12 +253,6 @@ static char *scsi_devices[] = {
53343 "Array Controller Device"
53344 };
53345
53346-static char *chtostr(char *tmp, u8 *chars, int n)
53347-{
53348- tmp[0] = 0;
53349- return strncat(tmp, (char *)chars, n);
53350-}
53351-
53352 static int i2o_report_query_status(struct seq_file *seq, int block_status,
53353 char *group)
53354 {
53355@@ -711,9 +705,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
53356 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
53357 {
53358 struct i2o_controller *c = (struct i2o_controller *)seq->private;
53359- static u32 work32[5];
53360- static u8 *work8 = (u8 *) work32;
53361- static u16 *work16 = (u16 *) work32;
53362+ u32 work32[5];
53363+ u8 *work8 = (u8 *) work32;
53364+ u16 *work16 = (u16 *) work32;
53365 int token;
53366 u32 hwcap;
53367
53368@@ -794,7 +788,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53369 } *result;
53370
53371 i2o_exec_execute_ddm_table ddm_table;
53372- char tmp[28 + 1];
53373
53374 result = kmalloc(sizeof(*result), GFP_KERNEL);
53375 if (!result)
53376@@ -829,8 +822,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
53377
53378 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
53379 seq_printf(seq, "%-#8x", ddm_table.module_id);
53380- seq_printf(seq, "%-29s",
53381- chtostr(tmp, ddm_table.module_name_version, 28));
53382+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
53383 seq_printf(seq, "%9d ", ddm_table.data_size);
53384 seq_printf(seq, "%8d", ddm_table.code_size);
53385
53386@@ -897,7 +889,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53387
53388 i2o_driver_result_table *result;
53389 i2o_driver_store_table *dst;
53390- char tmp[28 + 1];
53391
53392 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
53393 if (result == NULL)
53394@@ -932,9 +923,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
53395
53396 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
53397 seq_printf(seq, "%-#8x", dst->module_id);
53398- seq_printf(seq, "%-29s",
53399- chtostr(tmp, dst->module_name_version, 28));
53400- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
53401+ seq_printf(seq, "%-.28s", dst->module_name_version);
53402+ seq_printf(seq, "%-.8s", dst->date);
53403 seq_printf(seq, "%8d ", dst->module_size);
53404 seq_printf(seq, "%8d ", dst->mpb_size);
53405 seq_printf(seq, "0x%04x", dst->module_flags);
53406@@ -1250,11 +1240,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
53407 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53408 {
53409 struct i2o_device *d = (struct i2o_device *)seq->private;
53410- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53411+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
53412 // == (allow) 512d bytes (max)
53413- static u16 *work16 = (u16 *) work32;
53414+ u16 *work16 = (u16 *) work32;
53415 int token;
53416- char tmp[16 + 1];
53417
53418 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
53419
53420@@ -1266,14 +1255,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
53421 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
53422 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
53423 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
53424- seq_printf(seq, "Vendor info : %s\n",
53425- chtostr(tmp, (u8 *) (work32 + 2), 16));
53426- seq_printf(seq, "Product info : %s\n",
53427- chtostr(tmp, (u8 *) (work32 + 6), 16));
53428- seq_printf(seq, "Description : %s\n",
53429- chtostr(tmp, (u8 *) (work32 + 10), 16));
53430- seq_printf(seq, "Product rev. : %s\n",
53431- chtostr(tmp, (u8 *) (work32 + 14), 8));
53432+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
53433+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
53434+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
53435+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
53436
53437 seq_printf(seq, "Serial number : ");
53438 print_serial_number(seq, (u8 *) (work32 + 16),
53439@@ -1310,8 +1295,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53440 u8 pad[256]; // allow up to 256 byte (max) serial number
53441 } result;
53442
53443- char tmp[24 + 1];
53444-
53445 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
53446
53447 if (token < 0) {
53448@@ -1320,10 +1303,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
53449 }
53450
53451 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
53452- seq_printf(seq, "Module name : %s\n",
53453- chtostr(tmp, result.module_name, 24));
53454- seq_printf(seq, "Module revision : %s\n",
53455- chtostr(tmp, result.module_rev, 8));
53456+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
53457+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
53458
53459 seq_printf(seq, "Serial number : ");
53460 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
53461@@ -1347,8 +1328,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53462 u8 instance_number[4];
53463 } result;
53464
53465- char tmp[64 + 1];
53466-
53467 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
53468
53469 if (token < 0) {
53470@@ -1356,14 +1335,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53471 return 0;
53472 }
53473
53474- seq_printf(seq, "Device name : %s\n",
53475- chtostr(tmp, result.device_name, 64));
53476- seq_printf(seq, "Service name : %s\n",
53477- chtostr(tmp, result.service_name, 64));
53478- seq_printf(seq, "Physical name : %s\n",
53479- chtostr(tmp, result.physical_location, 64));
53480- seq_printf(seq, "Instance number : %s\n",
53481- chtostr(tmp, result.instance_number, 4));
53482+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
53483+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
53484+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
53485+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
53486
53487 return 0;
53488 }
53489@@ -1372,9 +1347,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
53490 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
53491 {
53492 struct i2o_device *d = (struct i2o_device *)seq->private;
53493- static u32 work32[12];
53494- static u16 *work16 = (u16 *) work32;
53495- static u8 *work8 = (u8 *) work32;
53496+ u32 work32[12];
53497+ u16 *work16 = (u16 *) work32;
53498+ u8 *work8 = (u8 *) work32;
53499 int token;
53500
53501 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
53502diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
53503index 23bdbe4..4e1f340 100644
53504--- a/drivers/staging/i2o/iop.c
53505+++ b/drivers/staging/i2o/iop.c
53506@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
53507
53508 spin_lock_irqsave(&c->context_list_lock, flags);
53509
53510- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
53511- atomic_inc(&c->context_list_counter);
53512+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
53513+ atomic_inc_unchecked(&c->context_list_counter);
53514
53515- entry->context = atomic_read(&c->context_list_counter);
53516+ entry->context = atomic_read_unchecked(&c->context_list_counter);
53517
53518 list_add(&entry->list, &c->context_list);
53519
53520@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
53521
53522 #if BITS_PER_LONG == 64
53523 spin_lock_init(&c->context_list_lock);
53524- atomic_set(&c->context_list_counter, 0);
53525+ atomic_set_unchecked(&c->context_list_counter, 0);
53526 INIT_LIST_HEAD(&c->context_list);
53527 #endif
53528
53529diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
53530index b892f2c..9b4898a 100644
53531--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
53532+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
53533@@ -118,7 +118,7 @@ static int lis3l02dq_get_buffer_element(struct iio_dev *indio_dev,
53534 int scan_count = bitmap_weight(indio_dev->active_scan_mask,
53535 indio_dev->masklength);
53536
53537- rx_array = kcalloc(4, scan_count, GFP_KERNEL);
53538+ rx_array = kcalloc(scan_count, 4, GFP_KERNEL);
53539 if (!rx_array)
53540 return -ENOMEM;
53541 ret = lis3l02dq_read_all(indio_dev, rx_array);
53542diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
53543index d98e229..9c59bc2 100644
53544--- a/drivers/staging/iio/adc/ad7280a.c
53545+++ b/drivers/staging/iio/adc/ad7280a.c
53546@@ -547,8 +547,8 @@ static int ad7280_attr_init(struct ad7280_state *st)
53547 {
53548 int dev, ch, cnt;
53549
53550- st->iio_attr = kcalloc(2, sizeof(*st->iio_attr) *
53551- (st->slave_num + 1) * AD7280A_CELLS_PER_DEV,
53552+ st->iio_attr = kcalloc(sizeof(*st->iio_attr) *
53553+ (st->slave_num + 1) * AD7280A_CELLS_PER_DEV, 2,
53554 GFP_KERNEL);
53555 if (st->iio_attr == NULL)
53556 return -ENOMEM;
53557diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
53558index 658f458..0564216 100644
53559--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
53560+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
53561@@ -487,13 +487,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
53562 return 0;
53563 }
53564
53565-sfw_test_client_ops_t brw_test_client;
53566-void brw_init_test_client(void)
53567-{
53568- brw_test_client.tso_init = brw_client_init;
53569- brw_test_client.tso_fini = brw_client_fini;
53570- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
53571- brw_test_client.tso_done_rpc = brw_client_done_rpc;
53572+sfw_test_client_ops_t brw_test_client = {
53573+ .tso_init = brw_client_init,
53574+ .tso_fini = brw_client_fini,
53575+ .tso_prep_rpc = brw_client_prep_rpc,
53576+ .tso_done_rpc = brw_client_done_rpc,
53577 };
53578
53579 srpc_service_t brw_test_service;
53580diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
53581index a93a90d..c51dde6 100644
53582--- a/drivers/staging/lustre/lnet/selftest/framework.c
53583+++ b/drivers/staging/lustre/lnet/selftest/framework.c
53584@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
53585
53586 extern sfw_test_client_ops_t ping_test_client;
53587 extern srpc_service_t ping_test_service;
53588-extern void ping_init_test_client(void);
53589 extern void ping_init_test_service(void);
53590
53591 extern sfw_test_client_ops_t brw_test_client;
53592 extern srpc_service_t brw_test_service;
53593-extern void brw_init_test_client(void);
53594 extern void brw_init_test_service(void);
53595
53596
53597@@ -1675,12 +1673,10 @@ sfw_startup(void)
53598 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
53599 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
53600
53601- brw_init_test_client();
53602 brw_init_test_service();
53603 rc = sfw_register_test(&brw_test_service, &brw_test_client);
53604 LASSERT(rc == 0);
53605
53606- ping_init_test_client();
53607 ping_init_test_service();
53608 rc = sfw_register_test(&ping_test_service, &ping_test_client);
53609 LASSERT(rc == 0);
53610diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
53611index 644069a..83cbd26 100644
53612--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
53613+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
53614@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
53615 return 0;
53616 }
53617
53618-sfw_test_client_ops_t ping_test_client;
53619-void ping_init_test_client(void)
53620-{
53621- ping_test_client.tso_init = ping_client_init;
53622- ping_test_client.tso_fini = ping_client_fini;
53623- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53624- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53625-}
53626+sfw_test_client_ops_t ping_test_client = {
53627+ .tso_init = ping_client_init,
53628+ .tso_fini = ping_client_fini,
53629+ .tso_prep_rpc = ping_client_prep_rpc,
53630+ .tso_done_rpc = ping_client_done_rpc,
53631+};
53632
53633 srpc_service_t ping_test_service;
53634 void ping_init_test_service(void)
53635diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53636index bac9902..0225fe1 100644
53637--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53638+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53639@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53640 ldlm_completion_callback lcs_completion;
53641 ldlm_blocking_callback lcs_blocking;
53642 ldlm_glimpse_callback lcs_glimpse;
53643-};
53644+} __no_const;
53645
53646 /* ldlm_lockd.c */
53647 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53648diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53649index 2a88b80..62e7e5f 100644
53650--- a/drivers/staging/lustre/lustre/include/obd.h
53651+++ b/drivers/staging/lustre/lustre/include/obd.h
53652@@ -1362,7 +1362,7 @@ struct md_ops {
53653 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53654 * wrapper function in include/linux/obd_class.h.
53655 */
53656-};
53657+} __no_const;
53658
53659 struct lsm_operations {
53660 void (*lsm_free)(struct lov_stripe_md *);
53661diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53662index a4c252f..b21acac 100644
53663--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53664+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53665@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53666 int added = (mode == LCK_NL);
53667 int overlaps = 0;
53668 int splitted = 0;
53669- const struct ldlm_callback_suite null_cbs = { NULL };
53670+ const struct ldlm_callback_suite null_cbs = { };
53671
53672 CDEBUG(D_DLMTRACE,
53673 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53674diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53675index f0ee76a..1d01af9 100644
53676--- a/drivers/staging/lustre/lustre/libcfs/module.c
53677+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53678@@ -380,11 +380,11 @@ out:
53679
53680
53681 struct cfs_psdev_ops libcfs_psdev_ops = {
53682- libcfs_psdev_open,
53683- libcfs_psdev_release,
53684- NULL,
53685- NULL,
53686- libcfs_ioctl
53687+ .p_open = libcfs_psdev_open,
53688+ .p_close = libcfs_psdev_release,
53689+ .p_read = NULL,
53690+ .p_write = NULL,
53691+ .p_ioctl = libcfs_ioctl
53692 };
53693
53694 static int init_libcfs_module(void)
53695@@ -631,7 +631,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53696 loff_t *ppos)
53697 {
53698 int rc, max_delay_cs;
53699- struct ctl_table dummy = *table;
53700+ ctl_table_no_const dummy = *table;
53701 long d;
53702
53703 dummy.data = &max_delay_cs;
53704@@ -664,7 +664,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53705 loff_t *ppos)
53706 {
53707 int rc, min_delay_cs;
53708- struct ctl_table dummy = *table;
53709+ ctl_table_no_const dummy = *table;
53710 long d;
53711
53712 dummy.data = &min_delay_cs;
53713@@ -696,7 +696,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53714 void __user *buffer, size_t *lenp, loff_t *ppos)
53715 {
53716 int rc, backoff;
53717- struct ctl_table dummy = *table;
53718+ ctl_table_no_const dummy = *table;
53719
53720 dummy.data = &backoff;
53721 dummy.proc_handler = &proc_dointvec;
53722diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53723index 22667db..8b703b6 100644
53724--- a/drivers/staging/octeon/ethernet-rx.c
53725+++ b/drivers/staging/octeon/ethernet-rx.c
53726@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53727 /* Increment RX stats for virtual ports */
53728 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53729 #ifdef CONFIG_64BIT
53730- atomic64_add(1,
53731+ atomic64_add_unchecked(1,
53732 (atomic64_t *)&priv->stats.rx_packets);
53733- atomic64_add(skb->len,
53734+ atomic64_add_unchecked(skb->len,
53735 (atomic64_t *)&priv->stats.rx_bytes);
53736 #else
53737- atomic_add(1,
53738+ atomic_add_unchecked(1,
53739 (atomic_t *)&priv->stats.rx_packets);
53740- atomic_add(skb->len,
53741+ atomic_add_unchecked(skb->len,
53742 (atomic_t *)&priv->stats.rx_bytes);
53743 #endif
53744 }
53745@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53746 dev->name);
53747 */
53748 #ifdef CONFIG_64BIT
53749- atomic64_add(1,
53750+ atomic64_add_unchecked(1,
53751 (atomic64_t *)&priv->stats.rx_dropped);
53752 #else
53753- atomic_add(1,
53754+ atomic_add_unchecked(1,
53755 (atomic_t *)&priv->stats.rx_dropped);
53756 #endif
53757 dev_kfree_skb_irq(skb);
53758diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53759index fbbe866..2943243 100644
53760--- a/drivers/staging/octeon/ethernet.c
53761+++ b/drivers/staging/octeon/ethernet.c
53762@@ -251,11 +251,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53763 * since the RX tasklet also increments it.
53764 */
53765 #ifdef CONFIG_64BIT
53766- atomic64_add(rx_status.dropped_packets,
53767- (atomic64_t *)&priv->stats.rx_dropped);
53768+ atomic64_add_unchecked(rx_status.dropped_packets,
53769+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53770 #else
53771- atomic_add(rx_status.dropped_packets,
53772- (atomic_t *)&priv->stats.rx_dropped);
53773+ atomic_add_unchecked(rx_status.dropped_packets,
53774+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53775 #endif
53776 }
53777
53778diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53779index 3b476d8..f522d68 100644
53780--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53781+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53782@@ -225,7 +225,7 @@ struct hal_ops {
53783
53784 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53785 void (*hal_reset_security_engine)(struct adapter *adapter);
53786-};
53787+} __no_const;
53788
53789 enum rt_eeprom_type {
53790 EEPROM_93C46,
53791diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
53792index 070cc03..6806e37 100644
53793--- a/drivers/staging/rtl8712/rtl871x_io.h
53794+++ b/drivers/staging/rtl8712/rtl871x_io.h
53795@@ -108,7 +108,7 @@ struct _io_ops {
53796 u8 *pmem);
53797 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
53798 u8 *pmem);
53799-};
53800+} __no_const;
53801
53802 struct io_req {
53803 struct list_head list;
53804diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
53805index dbbb2f8..5232114 100644
53806--- a/drivers/staging/sm750fb/sm750.c
53807+++ b/drivers/staging/sm750fb/sm750.c
53808@@ -780,6 +780,7 @@ static struct fb_ops lynxfb_ops = {
53809 .fb_set_par = lynxfb_ops_set_par,
53810 .fb_setcolreg = lynxfb_ops_setcolreg,
53811 .fb_blank = lynxfb_ops_blank,
53812+ .fb_pan_display = lynxfb_ops_pan_display,
53813 .fb_fillrect = cfb_fillrect,
53814 .fb_imageblit = cfb_imageblit,
53815 .fb_copyarea = cfb_copyarea,
53816@@ -827,8 +828,10 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53817 par->index = index;
53818 output->channel = &crtc->channel;
53819 sm750fb_set_drv(par);
53820- lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
53821
53822+ pax_open_kernel();
53823+ *(void **)&lynxfb_ops.fb_pan_display = lynxfb_ops_pan_display;
53824+ pax_close_kernel();
53825
53826 /* set current cursor variable and proc pointer,
53827 * must be set after crtc member initialized */
53828@@ -850,7 +853,9 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53829 crtc->cursor.share = share;
53830 memset_io(crtc->cursor.vstart, 0, crtc->cursor.size);
53831 if (!g_hwcursor) {
53832- lynxfb_ops.fb_cursor = NULL;
53833+ pax_open_kernel();
53834+ *(void **)&lynxfb_ops.fb_cursor = NULL;
53835+ pax_close_kernel();
53836 crtc->cursor.disable(&crtc->cursor);
53837 }
53838
53839@@ -858,9 +863,11 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index)
53840 /* set info->fbops, must be set before fb_find_mode */
53841 if (!share->accel_off) {
53842 /* use 2d acceleration */
53843- lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect;
53844- lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea;
53845- lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit;
53846+ pax_open_kernel();
53847+ *(void **)&lynxfb_ops.fb_fillrect = lynxfb_ops_fillrect;
53848+ *(void **)&lynxfb_ops.fb_copyarea = lynxfb_ops_copyarea;
53849+ *(void **)&lynxfb_ops.fb_imageblit = lynxfb_ops_imageblit;
53850+ pax_close_kernel();
53851 }
53852 info->fbops = &lynxfb_ops;
53853
53854diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
53855index bd46df9..a0a5274 100644
53856--- a/drivers/staging/unisys/visorchipset/visorchipset.h
53857+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
53858@@ -170,7 +170,7 @@ struct visorchipset_busdev_notifiers {
53859 void (*device_resume)(ulong bus_no, ulong dev_no);
53860 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
53861 ulong *max_size);
53862-};
53863+} __no_const;
53864
53865 /* These functions live inside visorchipset, and will be called to indicate
53866 * responses to specific events (by code outside of visorchipset).
53867@@ -185,7 +185,7 @@ struct visorchipset_busdev_responders {
53868 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
53869 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
53870 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
53871-};
53872+} __no_const;
53873
53874 /** Register functions (in the bus driver) to get called by visorchipset
53875 * whenever a bus or device appears for which this service partition is
53876diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
53877index 18b0f97..9c7716e 100644
53878--- a/drivers/target/sbp/sbp_target.c
53879+++ b/drivers/target/sbp/sbp_target.c
53880@@ -61,7 +61,7 @@ static const u32 sbp_unit_directory_template[] = {
53881
53882 #define SESSION_MAINTENANCE_INTERVAL HZ
53883
53884-static atomic_t login_id = ATOMIC_INIT(0);
53885+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
53886
53887 static void session_maintenance_work(struct work_struct *);
53888 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
53889@@ -443,7 +443,7 @@ static void sbp_management_request_login(
53890 login->lun = se_lun;
53891 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
53892 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
53893- login->login_id = atomic_inc_return(&login_id);
53894+ login->login_id = atomic_inc_return_unchecked(&login_id);
53895
53896 login->tgt_agt = sbp_target_agent_register(login);
53897 if (IS_ERR(login->tgt_agt)) {
53898diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
53899index ce5f768..a4f884a 100644
53900--- a/drivers/target/target_core_device.c
53901+++ b/drivers/target/target_core_device.c
53902@@ -1496,7 +1496,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
53903 spin_lock_init(&dev->se_tmr_lock);
53904 spin_lock_init(&dev->qf_cmd_lock);
53905 sema_init(&dev->caw_sem, 1);
53906- atomic_set(&dev->dev_ordered_id, 0);
53907+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
53908 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
53909 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
53910 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
53911diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
53912index 675f2d9..1389429 100644
53913--- a/drivers/target/target_core_transport.c
53914+++ b/drivers/target/target_core_transport.c
53915@@ -1208,7 +1208,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
53916 * Used to determine when ORDERED commands should go from
53917 * Dormant to Active status.
53918 */
53919- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
53920+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
53921 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
53922 cmd->se_ordered_id, cmd->sam_task_attr,
53923 dev->transport->name);
53924diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
53925index 031018e..90981a1 100644
53926--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
53927+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
53928@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
53929 platform_set_drvdata(pdev, priv);
53930
53931 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
53932- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53933- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53934+ pax_open_kernel();
53935+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53936+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53937+ pax_close_kernel();
53938 }
53939 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
53940 priv, &int3400_thermal_ops,
53941diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
53942index 668fb1b..2737bbe 100644
53943--- a/drivers/thermal/of-thermal.c
53944+++ b/drivers/thermal/of-thermal.c
53945@@ -31,6 +31,7 @@
53946 #include <linux/export.h>
53947 #include <linux/string.h>
53948 #include <linux/thermal.h>
53949+#include <linux/mm.h>
53950
53951 #include "thermal_core.h"
53952
53953@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
53954 tz->ops = ops;
53955 tz->sensor_data = data;
53956
53957- tzd->ops->get_temp = of_thermal_get_temp;
53958- tzd->ops->get_trend = of_thermal_get_trend;
53959- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53960+ pax_open_kernel();
53961+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
53962+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
53963+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53964+ pax_close_kernel();
53965 mutex_unlock(&tzd->lock);
53966
53967 return tzd;
53968@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
53969 return;
53970
53971 mutex_lock(&tzd->lock);
53972- tzd->ops->get_temp = NULL;
53973- tzd->ops->get_trend = NULL;
53974- tzd->ops->set_emul_temp = NULL;
53975+ pax_open_kernel();
53976+ *(void **)&tzd->ops->get_temp = NULL;
53977+ *(void **)&tzd->ops->get_trend = NULL;
53978+ *(void **)&tzd->ops->set_emul_temp = NULL;
53979+ pax_close_kernel();
53980
53981 tz->ops = NULL;
53982 tz->sensor_data = NULL;
53983diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
53984index 9ea3d9d..53e8792 100644
53985--- a/drivers/thermal/x86_pkg_temp_thermal.c
53986+++ b/drivers/thermal/x86_pkg_temp_thermal.c
53987@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
53988 return NOTIFY_OK;
53989 }
53990
53991-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
53992+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
53993 .notifier_call = pkg_temp_thermal_cpu_callback,
53994 };
53995
53996diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
53997index fd66f57..48e6376 100644
53998--- a/drivers/tty/cyclades.c
53999+++ b/drivers/tty/cyclades.c
54000@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
54001 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
54002 info->port.count);
54003 #endif
54004- info->port.count++;
54005+ atomic_inc(&info->port.count);
54006 #ifdef CY_DEBUG_COUNT
54007 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
54008- current->pid, info->port.count);
54009+ current->pid, atomic_read(&info->port.count));
54010 #endif
54011
54012 /*
54013@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
54014 for (j = 0; j < cy_card[i].nports; j++) {
54015 info = &cy_card[i].ports[j];
54016
54017- if (info->port.count) {
54018+ if (atomic_read(&info->port.count)) {
54019 /* XXX is the ldisc num worth this? */
54020 struct tty_struct *tty;
54021 struct tty_ldisc *ld;
54022diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
54023index 4fcec1d..5a036f7 100644
54024--- a/drivers/tty/hvc/hvc_console.c
54025+++ b/drivers/tty/hvc/hvc_console.c
54026@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
54027
54028 spin_lock_irqsave(&hp->port.lock, flags);
54029 /* Check and then increment for fast path open. */
54030- if (hp->port.count++ > 0) {
54031+ if (atomic_inc_return(&hp->port.count) > 1) {
54032 spin_unlock_irqrestore(&hp->port.lock, flags);
54033 hvc_kick();
54034 return 0;
54035@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
54036
54037 spin_lock_irqsave(&hp->port.lock, flags);
54038
54039- if (--hp->port.count == 0) {
54040+ if (atomic_dec_return(&hp->port.count) == 0) {
54041 spin_unlock_irqrestore(&hp->port.lock, flags);
54042 /* We are done with the tty pointer now. */
54043 tty_port_tty_set(&hp->port, NULL);
54044@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
54045 */
54046 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
54047 } else {
54048- if (hp->port.count < 0)
54049+ if (atomic_read(&hp->port.count) < 0)
54050 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
54051- hp->vtermno, hp->port.count);
54052+ hp->vtermno, atomic_read(&hp->port.count));
54053 spin_unlock_irqrestore(&hp->port.lock, flags);
54054 }
54055 }
54056@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
54057 * open->hangup case this can be called after the final close so prevent
54058 * that from happening for now.
54059 */
54060- if (hp->port.count <= 0) {
54061+ if (atomic_read(&hp->port.count) <= 0) {
54062 spin_unlock_irqrestore(&hp->port.lock, flags);
54063 return;
54064 }
54065
54066- hp->port.count = 0;
54067+ atomic_set(&hp->port.count, 0);
54068 spin_unlock_irqrestore(&hp->port.lock, flags);
54069 tty_port_tty_set(&hp->port, NULL);
54070
54071@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
54072 return -EPIPE;
54073
54074 /* FIXME what's this (unprotected) check for? */
54075- if (hp->port.count <= 0)
54076+ if (atomic_read(&hp->port.count) <= 0)
54077 return -EIO;
54078
54079 spin_lock_irqsave(&hp->lock, flags);
54080diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
54081index 81ff7e1..dfb7b71 100644
54082--- a/drivers/tty/hvc/hvcs.c
54083+++ b/drivers/tty/hvc/hvcs.c
54084@@ -83,6 +83,7 @@
54085 #include <asm/hvcserver.h>
54086 #include <asm/uaccess.h>
54087 #include <asm/vio.h>
54088+#include <asm/local.h>
54089
54090 /*
54091 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
54092@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
54093
54094 spin_lock_irqsave(&hvcsd->lock, flags);
54095
54096- if (hvcsd->port.count > 0) {
54097+ if (atomic_read(&hvcsd->port.count) > 0) {
54098 spin_unlock_irqrestore(&hvcsd->lock, flags);
54099 printk(KERN_INFO "HVCS: vterm state unchanged. "
54100 "The hvcs device node is still in use.\n");
54101@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
54102 }
54103 }
54104
54105- hvcsd->port.count = 0;
54106+ atomic_set(&hvcsd->port.count, 0);
54107 hvcsd->port.tty = tty;
54108 tty->driver_data = hvcsd;
54109
54110@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
54111 unsigned long flags;
54112
54113 spin_lock_irqsave(&hvcsd->lock, flags);
54114- hvcsd->port.count++;
54115+ atomic_inc(&hvcsd->port.count);
54116 hvcsd->todo_mask |= HVCS_SCHED_READ;
54117 spin_unlock_irqrestore(&hvcsd->lock, flags);
54118
54119@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54120 hvcsd = tty->driver_data;
54121
54122 spin_lock_irqsave(&hvcsd->lock, flags);
54123- if (--hvcsd->port.count == 0) {
54124+ if (atomic_dec_and_test(&hvcsd->port.count)) {
54125
54126 vio_disable_interrupts(hvcsd->vdev);
54127
54128@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
54129
54130 free_irq(irq, hvcsd);
54131 return;
54132- } else if (hvcsd->port.count < 0) {
54133+ } else if (atomic_read(&hvcsd->port.count) < 0) {
54134 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
54135 " is missmanaged.\n",
54136- hvcsd->vdev->unit_address, hvcsd->port.count);
54137+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
54138 }
54139
54140 spin_unlock_irqrestore(&hvcsd->lock, flags);
54141@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54142
54143 spin_lock_irqsave(&hvcsd->lock, flags);
54144 /* Preserve this so that we know how many kref refs to put */
54145- temp_open_count = hvcsd->port.count;
54146+ temp_open_count = atomic_read(&hvcsd->port.count);
54147
54148 /*
54149 * Don't kref put inside the spinlock because the destruction
54150@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
54151 tty->driver_data = NULL;
54152 hvcsd->port.tty = NULL;
54153
54154- hvcsd->port.count = 0;
54155+ atomic_set(&hvcsd->port.count, 0);
54156
54157 /* This will drop any buffered data on the floor which is OK in a hangup
54158 * scenario. */
54159@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
54160 * the middle of a write operation? This is a crummy place to do this
54161 * but we want to keep it all in the spinlock.
54162 */
54163- if (hvcsd->port.count <= 0) {
54164+ if (atomic_read(&hvcsd->port.count) <= 0) {
54165 spin_unlock_irqrestore(&hvcsd->lock, flags);
54166 return -ENODEV;
54167 }
54168@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
54169 {
54170 struct hvcs_struct *hvcsd = tty->driver_data;
54171
54172- if (!hvcsd || hvcsd->port.count <= 0)
54173+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
54174 return 0;
54175
54176 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
54177diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
54178index 4190199..06d5bfa 100644
54179--- a/drivers/tty/hvc/hvsi.c
54180+++ b/drivers/tty/hvc/hvsi.c
54181@@ -85,7 +85,7 @@ struct hvsi_struct {
54182 int n_outbuf;
54183 uint32_t vtermno;
54184 uint32_t virq;
54185- atomic_t seqno; /* HVSI packet sequence number */
54186+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
54187 uint16_t mctrl;
54188 uint8_t state; /* HVSI protocol state */
54189 uint8_t flags;
54190@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
54191
54192 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
54193 packet.hdr.len = sizeof(struct hvsi_query_response);
54194- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54195+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54196 packet.verb = VSV_SEND_VERSION_NUMBER;
54197 packet.u.version = HVSI_VERSION;
54198 packet.query_seqno = query_seqno+1;
54199@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
54200
54201 packet.hdr.type = VS_QUERY_PACKET_HEADER;
54202 packet.hdr.len = sizeof(struct hvsi_query);
54203- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54204+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54205 packet.verb = verb;
54206
54207 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
54208@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
54209 int wrote;
54210
54211 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
54212- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54213+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54214 packet.hdr.len = sizeof(struct hvsi_control);
54215 packet.verb = VSV_SET_MODEM_CTL;
54216 packet.mask = HVSI_TSDTR;
54217@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
54218 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
54219
54220 packet.hdr.type = VS_DATA_PACKET_HEADER;
54221- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54222+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54223 packet.hdr.len = count + sizeof(struct hvsi_header);
54224 memcpy(&packet.data, buf, count);
54225
54226@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
54227 struct hvsi_control packet __ALIGNED__;
54228
54229 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
54230- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
54231+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
54232 packet.hdr.len = 6;
54233 packet.verb = VSV_CLOSE_PROTOCOL;
54234
54235@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
54236
54237 tty_port_tty_set(&hp->port, tty);
54238 spin_lock_irqsave(&hp->lock, flags);
54239- hp->port.count++;
54240+ atomic_inc(&hp->port.count);
54241 atomic_set(&hp->seqno, 0);
54242 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
54243 spin_unlock_irqrestore(&hp->lock, flags);
54244@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54245
54246 spin_lock_irqsave(&hp->lock, flags);
54247
54248- if (--hp->port.count == 0) {
54249+ if (atomic_dec_return(&hp->port.count) == 0) {
54250 tty_port_tty_set(&hp->port, NULL);
54251 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
54252
54253@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
54254
54255 spin_lock_irqsave(&hp->lock, flags);
54256 }
54257- } else if (hp->port.count < 0)
54258+ } else if (atomic_read(&hp->port.count) < 0)
54259 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
54260- hp - hvsi_ports, hp->port.count);
54261+ hp - hvsi_ports, atomic_read(&hp->port.count));
54262
54263 spin_unlock_irqrestore(&hp->lock, flags);
54264 }
54265@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
54266 tty_port_tty_set(&hp->port, NULL);
54267
54268 spin_lock_irqsave(&hp->lock, flags);
54269- hp->port.count = 0;
54270+ atomic_set(&hp->port.count, 0);
54271 hp->n_outbuf = 0;
54272 spin_unlock_irqrestore(&hp->lock, flags);
54273 }
54274diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
54275index a270f04..7c77b5d 100644
54276--- a/drivers/tty/hvc/hvsi_lib.c
54277+++ b/drivers/tty/hvc/hvsi_lib.c
54278@@ -8,7 +8,7 @@
54279
54280 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
54281 {
54282- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
54283+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
54284
54285 /* Assumes that always succeeds, works in practice */
54286 return pv->put_chars(pv->termno, (char *)packet, packet->len);
54287@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
54288
54289 /* Reset state */
54290 pv->established = 0;
54291- atomic_set(&pv->seqno, 0);
54292+ atomic_set_unchecked(&pv->seqno, 0);
54293
54294 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
54295
54296diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
54297index 345cebb..d5a1e9e 100644
54298--- a/drivers/tty/ipwireless/tty.c
54299+++ b/drivers/tty/ipwireless/tty.c
54300@@ -28,6 +28,7 @@
54301 #include <linux/tty_driver.h>
54302 #include <linux/tty_flip.h>
54303 #include <linux/uaccess.h>
54304+#include <asm/local.h>
54305
54306 #include "tty.h"
54307 #include "network.h"
54308@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54309 return -ENODEV;
54310
54311 mutex_lock(&tty->ipw_tty_mutex);
54312- if (tty->port.count == 0)
54313+ if (atomic_read(&tty->port.count) == 0)
54314 tty->tx_bytes_queued = 0;
54315
54316- tty->port.count++;
54317+ atomic_inc(&tty->port.count);
54318
54319 tty->port.tty = linux_tty;
54320 linux_tty->driver_data = tty;
54321@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
54322
54323 static void do_ipw_close(struct ipw_tty *tty)
54324 {
54325- tty->port.count--;
54326-
54327- if (tty->port.count == 0) {
54328+ if (atomic_dec_return(&tty->port.count) == 0) {
54329 struct tty_struct *linux_tty = tty->port.tty;
54330
54331 if (linux_tty != NULL) {
54332@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
54333 return;
54334
54335 mutex_lock(&tty->ipw_tty_mutex);
54336- if (tty->port.count == 0) {
54337+ if (atomic_read(&tty->port.count) == 0) {
54338 mutex_unlock(&tty->ipw_tty_mutex);
54339 return;
54340 }
54341@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
54342
54343 mutex_lock(&tty->ipw_tty_mutex);
54344
54345- if (!tty->port.count) {
54346+ if (!atomic_read(&tty->port.count)) {
54347 mutex_unlock(&tty->ipw_tty_mutex);
54348 return;
54349 }
54350@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
54351 return -ENODEV;
54352
54353 mutex_lock(&tty->ipw_tty_mutex);
54354- if (!tty->port.count) {
54355+ if (!atomic_read(&tty->port.count)) {
54356 mutex_unlock(&tty->ipw_tty_mutex);
54357 return -EINVAL;
54358 }
54359@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
54360 if (!tty)
54361 return -ENODEV;
54362
54363- if (!tty->port.count)
54364+ if (!atomic_read(&tty->port.count))
54365 return -EINVAL;
54366
54367 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
54368@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
54369 if (!tty)
54370 return 0;
54371
54372- if (!tty->port.count)
54373+ if (!atomic_read(&tty->port.count))
54374 return 0;
54375
54376 return tty->tx_bytes_queued;
54377@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
54378 if (!tty)
54379 return -ENODEV;
54380
54381- if (!tty->port.count)
54382+ if (!atomic_read(&tty->port.count))
54383 return -EINVAL;
54384
54385 return get_control_lines(tty);
54386@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
54387 if (!tty)
54388 return -ENODEV;
54389
54390- if (!tty->port.count)
54391+ if (!atomic_read(&tty->port.count))
54392 return -EINVAL;
54393
54394 return set_control_lines(tty, set, clear);
54395@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
54396 if (!tty)
54397 return -ENODEV;
54398
54399- if (!tty->port.count)
54400+ if (!atomic_read(&tty->port.count))
54401 return -EINVAL;
54402
54403 /* FIXME: Exactly how is the tty object locked here .. */
54404@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
54405 * are gone */
54406 mutex_lock(&ttyj->ipw_tty_mutex);
54407 }
54408- while (ttyj->port.count)
54409+ while (atomic_read(&ttyj->port.count))
54410 do_ipw_close(ttyj);
54411 ipwireless_disassociate_network_ttys(network,
54412 ttyj->channel_idx);
54413diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
54414index 14c54e0..1efd4f2 100644
54415--- a/drivers/tty/moxa.c
54416+++ b/drivers/tty/moxa.c
54417@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
54418 }
54419
54420 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
54421- ch->port.count++;
54422+ atomic_inc(&ch->port.count);
54423 tty->driver_data = ch;
54424 tty_port_tty_set(&ch->port, tty);
54425 mutex_lock(&ch->port.mutex);
54426diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
54427index 2c34c32..81d10e1 100644
54428--- a/drivers/tty/n_gsm.c
54429+++ b/drivers/tty/n_gsm.c
54430@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
54431 spin_lock_init(&dlci->lock);
54432 mutex_init(&dlci->mutex);
54433 dlci->fifo = &dlci->_fifo;
54434- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
54435+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
54436 kfree(dlci);
54437 return NULL;
54438 }
54439@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
54440 struct gsm_dlci *dlci = tty->driver_data;
54441 struct tty_port *port = &dlci->port;
54442
54443- port->count++;
54444+ atomic_inc(&port->count);
54445 tty_port_tty_set(port, tty);
54446
54447 dlci->modem_rx = 0;
54448diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
54449index 16ed0b6..7d944b4 100644
54450--- a/drivers/tty/n_tty.c
54451+++ b/drivers/tty/n_tty.c
54452@@ -116,7 +116,7 @@ struct n_tty_data {
54453 int minimum_to_wake;
54454
54455 /* consumer-published */
54456- size_t read_tail;
54457+ size_t read_tail __intentional_overflow(-1);
54458 size_t line_start;
54459
54460 /* protected by output lock */
54461@@ -2582,6 +2582,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
54462 {
54463 *ops = tty_ldisc_N_TTY;
54464 ops->owner = NULL;
54465- ops->refcount = ops->flags = 0;
54466+ atomic_set(&ops->refcount, 0);
54467+ ops->flags = 0;
54468 }
54469 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
54470diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
54471index 4d5e840..a2340a6 100644
54472--- a/drivers/tty/pty.c
54473+++ b/drivers/tty/pty.c
54474@@ -849,8 +849,10 @@ static void __init unix98_pty_init(void)
54475 panic("Couldn't register Unix98 pts driver");
54476
54477 /* Now create the /dev/ptmx special device */
54478+ pax_open_kernel();
54479 tty_default_fops(&ptmx_fops);
54480- ptmx_fops.open = ptmx_open;
54481+ *(void **)&ptmx_fops.open = ptmx_open;
54482+ pax_close_kernel();
54483
54484 cdev_init(&ptmx_cdev, &ptmx_fops);
54485 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
54486diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
54487index c8dd8dc..dca6cfd 100644
54488--- a/drivers/tty/rocket.c
54489+++ b/drivers/tty/rocket.c
54490@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54491 tty->driver_data = info;
54492 tty_port_tty_set(port, tty);
54493
54494- if (port->count++ == 0) {
54495+ if (atomic_inc_return(&port->count) == 1) {
54496 atomic_inc(&rp_num_ports_open);
54497
54498 #ifdef ROCKET_DEBUG_OPEN
54499@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
54500 #endif
54501 }
54502 #ifdef ROCKET_DEBUG_OPEN
54503- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
54504+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
54505 #endif
54506
54507 /*
54508@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
54509 spin_unlock_irqrestore(&info->port.lock, flags);
54510 return;
54511 }
54512- if (info->port.count)
54513+ if (atomic_read(&info->port.count))
54514 atomic_dec(&rp_num_ports_open);
54515 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
54516 spin_unlock_irqrestore(&info->port.lock, flags);
54517diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
54518index 4506e40..ac0b470 100644
54519--- a/drivers/tty/serial/8250/8250_core.c
54520+++ b/drivers/tty/serial/8250/8250_core.c
54521@@ -3241,9 +3241,9 @@ static void univ8250_release_port(struct uart_port *port)
54522
54523 static void univ8250_rsa_support(struct uart_ops *ops)
54524 {
54525- ops->config_port = univ8250_config_port;
54526- ops->request_port = univ8250_request_port;
54527- ops->release_port = univ8250_release_port;
54528+ *(void **)&ops->config_port = univ8250_config_port;
54529+ *(void **)&ops->request_port = univ8250_request_port;
54530+ *(void **)&ops->release_port = univ8250_release_port;
54531 }
54532
54533 #else
54534@@ -3286,8 +3286,10 @@ static void __init serial8250_isa_init_ports(void)
54535 }
54536
54537 /* chain base port ops to support Remote Supervisor Adapter */
54538- univ8250_port_ops = *base_ops;
54539+ pax_open_kernel();
54540+ memcpy((void *)&univ8250_port_ops, base_ops, sizeof univ8250_port_ops);
54541 univ8250_rsa_support(&univ8250_port_ops);
54542+ pax_close_kernel();
54543
54544 if (share_irqs)
54545 irqflag = IRQF_SHARED;
54546diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
54547index aa28209..e08fb85 100644
54548--- a/drivers/tty/serial/ioc4_serial.c
54549+++ b/drivers/tty/serial/ioc4_serial.c
54550@@ -437,7 +437,7 @@ struct ioc4_soft {
54551 } is_intr_info[MAX_IOC4_INTR_ENTS];
54552
54553 /* Number of entries active in the above array */
54554- atomic_t is_num_intrs;
54555+ atomic_unchecked_t is_num_intrs;
54556 } is_intr_type[IOC4_NUM_INTR_TYPES];
54557
54558 /* is_ir_lock must be held while
54559@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
54560 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
54561 || (type == IOC4_OTHER_INTR_TYPE)));
54562
54563- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
54564+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
54565 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
54566
54567 /* Save off the lower level interrupt handler */
54568@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
54569
54570 soft = arg;
54571 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
54572- num_intrs = (int)atomic_read(
54573+ num_intrs = (int)atomic_read_unchecked(
54574 &soft->is_intr_type[intr_type].is_num_intrs);
54575
54576 this_mir = this_ir = pending_intrs(soft, intr_type);
54577diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
54578index 129dc5b..1da5bb8 100644
54579--- a/drivers/tty/serial/kgdb_nmi.c
54580+++ b/drivers/tty/serial/kgdb_nmi.c
54581@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
54582 * I/O utilities that messages sent to the console will automatically
54583 * be displayed on the dbg_io.
54584 */
54585- dbg_io_ops->is_console = true;
54586+ pax_open_kernel();
54587+ *(int *)&dbg_io_ops->is_console = true;
54588+ pax_close_kernel();
54589
54590 return 0;
54591 }
54592diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
54593index a260cde..6b2b5ce 100644
54594--- a/drivers/tty/serial/kgdboc.c
54595+++ b/drivers/tty/serial/kgdboc.c
54596@@ -24,8 +24,9 @@
54597 #define MAX_CONFIG_LEN 40
54598
54599 static struct kgdb_io kgdboc_io_ops;
54600+static struct kgdb_io kgdboc_io_ops_console;
54601
54602-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
54603+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
54604 static int configured = -1;
54605
54606 static char config[MAX_CONFIG_LEN];
54607@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
54608 kgdboc_unregister_kbd();
54609 if (configured == 1)
54610 kgdb_unregister_io_module(&kgdboc_io_ops);
54611+ else if (configured == 2)
54612+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
54613 }
54614
54615 static int configure_kgdboc(void)
54616@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
54617 int err;
54618 char *cptr = config;
54619 struct console *cons;
54620+ int is_console = 0;
54621
54622 err = kgdboc_option_setup(config);
54623 if (err || !strlen(config) || isspace(config[0]))
54624 goto noconfig;
54625
54626 err = -ENODEV;
54627- kgdboc_io_ops.is_console = 0;
54628 kgdb_tty_driver = NULL;
54629
54630 kgdboc_use_kms = 0;
54631@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
54632 int idx;
54633 if (cons->device && cons->device(cons, &idx) == p &&
54634 idx == tty_line) {
54635- kgdboc_io_ops.is_console = 1;
54636+ is_console = 1;
54637 break;
54638 }
54639 cons = cons->next;
54640@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
54641 kgdb_tty_line = tty_line;
54642
54643 do_register:
54644- err = kgdb_register_io_module(&kgdboc_io_ops);
54645+ if (is_console) {
54646+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
54647+ configured = 2;
54648+ } else {
54649+ err = kgdb_register_io_module(&kgdboc_io_ops);
54650+ configured = 1;
54651+ }
54652 if (err)
54653 goto noconfig;
54654
54655@@ -205,8 +214,6 @@ do_register:
54656 if (err)
54657 goto nmi_con_failed;
54658
54659- configured = 1;
54660-
54661 return 0;
54662
54663 nmi_con_failed:
54664@@ -223,7 +230,7 @@ noconfig:
54665 static int __init init_kgdboc(void)
54666 {
54667 /* Already configured? */
54668- if (configured == 1)
54669+ if (configured >= 1)
54670 return 0;
54671
54672 return configure_kgdboc();
54673@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
54674 if (config[len - 1] == '\n')
54675 config[len - 1] = '\0';
54676
54677- if (configured == 1)
54678+ if (configured >= 1)
54679 cleanup_kgdboc();
54680
54681 /* Go and configure with the new params. */
54682@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
54683 .post_exception = kgdboc_post_exp_handler,
54684 };
54685
54686+static struct kgdb_io kgdboc_io_ops_console = {
54687+ .name = "kgdboc",
54688+ .read_char = kgdboc_get_char,
54689+ .write_char = kgdboc_put_char,
54690+ .pre_exception = kgdboc_pre_exp_handler,
54691+ .post_exception = kgdboc_post_exp_handler,
54692+ .is_console = 1
54693+};
54694+
54695 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54696 /* This is only available if kgdboc is a built in for early debugging */
54697 static int __init kgdboc_early_init(char *opt)
54698diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54699index b73889c..9f74f0a 100644
54700--- a/drivers/tty/serial/msm_serial.c
54701+++ b/drivers/tty/serial/msm_serial.c
54702@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54703 .cons = MSM_CONSOLE,
54704 };
54705
54706-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54707+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54708
54709 static const struct of_device_id msm_uartdm_table[] = {
54710 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54711@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54712 line = pdev->id;
54713
54714 if (line < 0)
54715- line = atomic_inc_return(&msm_uart_next_id) - 1;
54716+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54717
54718 if (unlikely(line < 0 || line >= UART_NR))
54719 return -ENXIO;
54720diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54721index a0ae942..befa48d 100644
54722--- a/drivers/tty/serial/samsung.c
54723+++ b/drivers/tty/serial/samsung.c
54724@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54725 ourport->tx_in_progress = 0;
54726 }
54727
54728+static int s3c64xx_serial_startup(struct uart_port *port);
54729 static int s3c24xx_serial_startup(struct uart_port *port)
54730 {
54731 struct s3c24xx_uart_port *ourport = to_ourport(port);
54732 int ret;
54733
54734+ /* Startup sequence is different for s3c64xx and higher SoC's */
54735+ if (s3c24xx_serial_has_interrupt_mask(port))
54736+ return s3c64xx_serial_startup(port);
54737+
54738 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54739 port, (unsigned long long)port->mapbase, port->membase);
54740
54741@@ -1698,10 +1703,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54742 /* setup info for port */
54743 port->dev = &platdev->dev;
54744
54745- /* Startup sequence is different for s3c64xx and higher SoC's */
54746- if (s3c24xx_serial_has_interrupt_mask(port))
54747- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54748-
54749 port->uartclk = 1;
54750
54751 if (cfg->uart_flags & UPF_CONS_FLOW) {
54752diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54753index ec54044..fc93d3f 100644
54754--- a/drivers/tty/serial/serial_core.c
54755+++ b/drivers/tty/serial/serial_core.c
54756@@ -1376,7 +1376,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54757 state = drv->state + tty->index;
54758 port = &state->port;
54759 spin_lock_irq(&port->lock);
54760- --port->count;
54761+ atomic_dec(&port->count);
54762 spin_unlock_irq(&port->lock);
54763 return;
54764 }
54765@@ -1386,7 +1386,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54766
54767 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54768
54769- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54770+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54771 return;
54772
54773 /*
54774@@ -1511,7 +1511,7 @@ static void uart_hangup(struct tty_struct *tty)
54775 uart_flush_buffer(tty);
54776 uart_shutdown(tty, state);
54777 spin_lock_irqsave(&port->lock, flags);
54778- port->count = 0;
54779+ atomic_set(&port->count, 0);
54780 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54781 spin_unlock_irqrestore(&port->lock, flags);
54782 tty_port_tty_set(port, NULL);
54783@@ -1598,7 +1598,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54784 pr_debug("uart_open(%d) called\n", line);
54785
54786 spin_lock_irq(&port->lock);
54787- ++port->count;
54788+ atomic_inc(&port->count);
54789 spin_unlock_irq(&port->lock);
54790
54791 /*
54792diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
54793index b1c6bd3..5f038e2 100644
54794--- a/drivers/tty/serial/uartlite.c
54795+++ b/drivers/tty/serial/uartlite.c
54796@@ -341,13 +341,13 @@ static int ulite_request_port(struct uart_port *port)
54797 return -EBUSY;
54798 }
54799
54800- port->private_data = &uartlite_be;
54801+ port->private_data = (void *)&uartlite_be;
54802 ret = uart_in32(ULITE_CONTROL, port);
54803 uart_out32(ULITE_CONTROL_RST_TX, ULITE_CONTROL, port);
54804 ret = uart_in32(ULITE_STATUS, port);
54805 /* Endianess detection */
54806 if ((ret & ULITE_STATUS_TXEMPTY) != ULITE_STATUS_TXEMPTY)
54807- port->private_data = &uartlite_le;
54808+ port->private_data = (void *)&uartlite_le;
54809
54810 return 0;
54811 }
54812diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
54813index b799170..87dafd5 100644
54814--- a/drivers/tty/synclink.c
54815+++ b/drivers/tty/synclink.c
54816@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54817
54818 if (debug_level >= DEBUG_LEVEL_INFO)
54819 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
54820- __FILE__,__LINE__, info->device_name, info->port.count);
54821+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54822
54823 if (tty_port_close_start(&info->port, tty, filp) == 0)
54824 goto cleanup;
54825@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54826 cleanup:
54827 if (debug_level >= DEBUG_LEVEL_INFO)
54828 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
54829- tty->driver->name, info->port.count);
54830+ tty->driver->name, atomic_read(&info->port.count));
54831
54832 } /* end of mgsl_close() */
54833
54834@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
54835
54836 mgsl_flush_buffer(tty);
54837 shutdown(info);
54838-
54839- info->port.count = 0;
54840+
54841+ atomic_set(&info->port.count, 0);
54842 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54843 info->port.tty = NULL;
54844
54845@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54846
54847 if (debug_level >= DEBUG_LEVEL_INFO)
54848 printk("%s(%d):block_til_ready before block on %s count=%d\n",
54849- __FILE__,__LINE__, tty->driver->name, port->count );
54850+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54851
54852 spin_lock_irqsave(&info->irq_spinlock, flags);
54853- port->count--;
54854+ atomic_dec(&port->count);
54855 spin_unlock_irqrestore(&info->irq_spinlock, flags);
54856 port->blocked_open++;
54857
54858@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54859
54860 if (debug_level >= DEBUG_LEVEL_INFO)
54861 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
54862- __FILE__,__LINE__, tty->driver->name, port->count );
54863+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54864
54865 tty_unlock(tty);
54866 schedule();
54867@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54868
54869 /* FIXME: Racy on hangup during close wait */
54870 if (!tty_hung_up_p(filp))
54871- port->count++;
54872+ atomic_inc(&port->count);
54873 port->blocked_open--;
54874
54875 if (debug_level >= DEBUG_LEVEL_INFO)
54876 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
54877- __FILE__,__LINE__, tty->driver->name, port->count );
54878+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54879
54880 if (!retval)
54881 port->flags |= ASYNC_NORMAL_ACTIVE;
54882@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54883
54884 if (debug_level >= DEBUG_LEVEL_INFO)
54885 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
54886- __FILE__,__LINE__,tty->driver->name, info->port.count);
54887+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54888
54889 /* If port is closing, signal caller to try again */
54890 if (info->port.flags & ASYNC_CLOSING){
54891@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54892 spin_unlock_irqrestore(&info->netlock, flags);
54893 goto cleanup;
54894 }
54895- info->port.count++;
54896+ atomic_inc(&info->port.count);
54897 spin_unlock_irqrestore(&info->netlock, flags);
54898
54899- if (info->port.count == 1) {
54900+ if (atomic_read(&info->port.count) == 1) {
54901 /* 1st open on this device, init hardware */
54902 retval = startup(info);
54903 if (retval < 0)
54904@@ -3442,8 +3442,8 @@ cleanup:
54905 if (retval) {
54906 if (tty->count == 1)
54907 info->port.tty = NULL; /* tty layer will release tty struct */
54908- if(info->port.count)
54909- info->port.count--;
54910+ if (atomic_read(&info->port.count))
54911+ atomic_dec(&info->port.count);
54912 }
54913
54914 return retval;
54915@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54916 unsigned short new_crctype;
54917
54918 /* return error if TTY interface open */
54919- if (info->port.count)
54920+ if (atomic_read(&info->port.count))
54921 return -EBUSY;
54922
54923 switch (encoding)
54924@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
54925
54926 /* arbitrate between network and tty opens */
54927 spin_lock_irqsave(&info->netlock, flags);
54928- if (info->port.count != 0 || info->netcount != 0) {
54929+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54930 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54931 spin_unlock_irqrestore(&info->netlock, flags);
54932 return -EBUSY;
54933@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54934 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54935
54936 /* return error if TTY interface open */
54937- if (info->port.count)
54938+ if (atomic_read(&info->port.count))
54939 return -EBUSY;
54940
54941 if (cmd != SIOCWANDEV)
54942diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
54943index 0e8c39b..e0cb171 100644
54944--- a/drivers/tty/synclink_gt.c
54945+++ b/drivers/tty/synclink_gt.c
54946@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54947 tty->driver_data = info;
54948 info->port.tty = tty;
54949
54950- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
54951+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
54952
54953 /* If port is closing, signal caller to try again */
54954 if (info->port.flags & ASYNC_CLOSING){
54955@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54956 mutex_unlock(&info->port.mutex);
54957 goto cleanup;
54958 }
54959- info->port.count++;
54960+ atomic_inc(&info->port.count);
54961 spin_unlock_irqrestore(&info->netlock, flags);
54962
54963- if (info->port.count == 1) {
54964+ if (atomic_read(&info->port.count) == 1) {
54965 /* 1st open on this device, init hardware */
54966 retval = startup(info);
54967 if (retval < 0) {
54968@@ -715,8 +715,8 @@ cleanup:
54969 if (retval) {
54970 if (tty->count == 1)
54971 info->port.tty = NULL; /* tty layer will release tty struct */
54972- if(info->port.count)
54973- info->port.count--;
54974+ if(atomic_read(&info->port.count))
54975+ atomic_dec(&info->port.count);
54976 }
54977
54978 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
54979@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54980
54981 if (sanity_check(info, tty->name, "close"))
54982 return;
54983- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
54984+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
54985
54986 if (tty_port_close_start(&info->port, tty, filp) == 0)
54987 goto cleanup;
54988@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54989 tty_port_close_end(&info->port, tty);
54990 info->port.tty = NULL;
54991 cleanup:
54992- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
54993+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
54994 }
54995
54996 static void hangup(struct tty_struct *tty)
54997@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
54998 shutdown(info);
54999
55000 spin_lock_irqsave(&info->port.lock, flags);
55001- info->port.count = 0;
55002+ atomic_set(&info->port.count, 0);
55003 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55004 info->port.tty = NULL;
55005 spin_unlock_irqrestore(&info->port.lock, flags);
55006@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55007 unsigned short new_crctype;
55008
55009 /* return error if TTY interface open */
55010- if (info->port.count)
55011+ if (atomic_read(&info->port.count))
55012 return -EBUSY;
55013
55014 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
55015@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
55016
55017 /* arbitrate between network and tty opens */
55018 spin_lock_irqsave(&info->netlock, flags);
55019- if (info->port.count != 0 || info->netcount != 0) {
55020+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55021 DBGINFO(("%s hdlc_open busy\n", dev->name));
55022 spin_unlock_irqrestore(&info->netlock, flags);
55023 return -EBUSY;
55024@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55025 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
55026
55027 /* return error if TTY interface open */
55028- if (info->port.count)
55029+ if (atomic_read(&info->port.count))
55030 return -EBUSY;
55031
55032 if (cmd != SIOCWANDEV)
55033@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
55034 if (port == NULL)
55035 continue;
55036 spin_lock(&port->lock);
55037- if ((port->port.count || port->netcount) &&
55038+ if ((atomic_read(&port->port.count) || port->netcount) &&
55039 port->pending_bh && !port->bh_running &&
55040 !port->bh_requested) {
55041 DBGISR(("%s bh queued\n", port->device_name));
55042@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55043 add_wait_queue(&port->open_wait, &wait);
55044
55045 spin_lock_irqsave(&info->lock, flags);
55046- port->count--;
55047+ atomic_dec(&port->count);
55048 spin_unlock_irqrestore(&info->lock, flags);
55049 port->blocked_open++;
55050
55051@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55052 remove_wait_queue(&port->open_wait, &wait);
55053
55054 if (!tty_hung_up_p(filp))
55055- port->count++;
55056+ atomic_inc(&port->count);
55057 port->blocked_open--;
55058
55059 if (!retval)
55060diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
55061index c3f9091..abe4601 100644
55062--- a/drivers/tty/synclinkmp.c
55063+++ b/drivers/tty/synclinkmp.c
55064@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
55065
55066 if (debug_level >= DEBUG_LEVEL_INFO)
55067 printk("%s(%d):%s open(), old ref count = %d\n",
55068- __FILE__,__LINE__,tty->driver->name, info->port.count);
55069+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
55070
55071 /* If port is closing, signal caller to try again */
55072 if (info->port.flags & ASYNC_CLOSING){
55073@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
55074 spin_unlock_irqrestore(&info->netlock, flags);
55075 goto cleanup;
55076 }
55077- info->port.count++;
55078+ atomic_inc(&info->port.count);
55079 spin_unlock_irqrestore(&info->netlock, flags);
55080
55081- if (info->port.count == 1) {
55082+ if (atomic_read(&info->port.count) == 1) {
55083 /* 1st open on this device, init hardware */
55084 retval = startup(info);
55085 if (retval < 0)
55086@@ -796,8 +796,8 @@ cleanup:
55087 if (retval) {
55088 if (tty->count == 1)
55089 info->port.tty = NULL; /* tty layer will release tty struct */
55090- if(info->port.count)
55091- info->port.count--;
55092+ if(atomic_read(&info->port.count))
55093+ atomic_dec(&info->port.count);
55094 }
55095
55096 return retval;
55097@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55098
55099 if (debug_level >= DEBUG_LEVEL_INFO)
55100 printk("%s(%d):%s close() entry, count=%d\n",
55101- __FILE__,__LINE__, info->device_name, info->port.count);
55102+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
55103
55104 if (tty_port_close_start(&info->port, tty, filp) == 0)
55105 goto cleanup;
55106@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
55107 cleanup:
55108 if (debug_level >= DEBUG_LEVEL_INFO)
55109 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
55110- tty->driver->name, info->port.count);
55111+ tty->driver->name, atomic_read(&info->port.count));
55112 }
55113
55114 /* Called by tty_hangup() when a hangup is signaled.
55115@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
55116 shutdown(info);
55117
55118 spin_lock_irqsave(&info->port.lock, flags);
55119- info->port.count = 0;
55120+ atomic_set(&info->port.count, 0);
55121 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
55122 info->port.tty = NULL;
55123 spin_unlock_irqrestore(&info->port.lock, flags);
55124@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
55125 unsigned short new_crctype;
55126
55127 /* return error if TTY interface open */
55128- if (info->port.count)
55129+ if (atomic_read(&info->port.count))
55130 return -EBUSY;
55131
55132 switch (encoding)
55133@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
55134
55135 /* arbitrate between network and tty opens */
55136 spin_lock_irqsave(&info->netlock, flags);
55137- if (info->port.count != 0 || info->netcount != 0) {
55138+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
55139 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
55140 spin_unlock_irqrestore(&info->netlock, flags);
55141 return -EBUSY;
55142@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
55143 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
55144
55145 /* return error if TTY interface open */
55146- if (info->port.count)
55147+ if (atomic_read(&info->port.count))
55148 return -EBUSY;
55149
55150 if (cmd != SIOCWANDEV)
55151@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
55152 * do not request bottom half processing if the
55153 * device is not open in a normal mode.
55154 */
55155- if ( port && (port->port.count || port->netcount) &&
55156+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
55157 port->pending_bh && !port->bh_running &&
55158 !port->bh_requested ) {
55159 if ( debug_level >= DEBUG_LEVEL_ISR )
55160@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55161
55162 if (debug_level >= DEBUG_LEVEL_INFO)
55163 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
55164- __FILE__,__LINE__, tty->driver->name, port->count );
55165+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55166
55167 spin_lock_irqsave(&info->lock, flags);
55168- port->count--;
55169+ atomic_dec(&port->count);
55170 spin_unlock_irqrestore(&info->lock, flags);
55171 port->blocked_open++;
55172
55173@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55174
55175 if (debug_level >= DEBUG_LEVEL_INFO)
55176 printk("%s(%d):%s block_til_ready() count=%d\n",
55177- __FILE__,__LINE__, tty->driver->name, port->count );
55178+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55179
55180 tty_unlock(tty);
55181 schedule();
55182@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
55183 set_current_state(TASK_RUNNING);
55184 remove_wait_queue(&port->open_wait, &wait);
55185 if (!tty_hung_up_p(filp))
55186- port->count++;
55187+ atomic_inc(&port->count);
55188 port->blocked_open--;
55189
55190 if (debug_level >= DEBUG_LEVEL_INFO)
55191 printk("%s(%d):%s block_til_ready() after, count=%d\n",
55192- __FILE__,__LINE__, tty->driver->name, port->count );
55193+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
55194
55195 if (!retval)
55196 port->flags |= ASYNC_NORMAL_ACTIVE;
55197diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
55198index 9ffdfcf..fd81170 100644
55199--- a/drivers/tty/sysrq.c
55200+++ b/drivers/tty/sysrq.c
55201@@ -1069,7 +1069,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
55202 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
55203 size_t count, loff_t *ppos)
55204 {
55205- if (count) {
55206+ if (count && capable(CAP_SYS_ADMIN)) {
55207 char c;
55208
55209 if (get_user(c, buf))
55210diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
55211index e569546..fbce20c 100644
55212--- a/drivers/tty/tty_io.c
55213+++ b/drivers/tty/tty_io.c
55214@@ -3509,7 +3509,7 @@ EXPORT_SYMBOL(tty_devnum);
55215
55216 void tty_default_fops(struct file_operations *fops)
55217 {
55218- *fops = tty_fops;
55219+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
55220 }
55221
55222 /*
55223diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
55224index 3737f55..7cef448 100644
55225--- a/drivers/tty/tty_ldisc.c
55226+++ b/drivers/tty/tty_ldisc.c
55227@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
55228 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55229 tty_ldiscs[disc] = new_ldisc;
55230 new_ldisc->num = disc;
55231- new_ldisc->refcount = 0;
55232+ atomic_set(&new_ldisc->refcount, 0);
55233 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55234
55235 return ret;
55236@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
55237 return -EINVAL;
55238
55239 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55240- if (tty_ldiscs[disc]->refcount)
55241+ if (atomic_read(&tty_ldiscs[disc]->refcount))
55242 ret = -EBUSY;
55243 else
55244 tty_ldiscs[disc] = NULL;
55245@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
55246 if (ldops) {
55247 ret = ERR_PTR(-EAGAIN);
55248 if (try_module_get(ldops->owner)) {
55249- ldops->refcount++;
55250+ atomic_inc(&ldops->refcount);
55251 ret = ldops;
55252 }
55253 }
55254@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
55255 unsigned long flags;
55256
55257 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
55258- ldops->refcount--;
55259+ atomic_dec(&ldops->refcount);
55260 module_put(ldops->owner);
55261 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
55262 }
55263diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
55264index 40b31835..94d92ae 100644
55265--- a/drivers/tty/tty_port.c
55266+++ b/drivers/tty/tty_port.c
55267@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
55268 unsigned long flags;
55269
55270 spin_lock_irqsave(&port->lock, flags);
55271- port->count = 0;
55272+ atomic_set(&port->count, 0);
55273 port->flags &= ~ASYNC_NORMAL_ACTIVE;
55274 tty = port->tty;
55275 if (tty)
55276@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55277
55278 /* The port lock protects the port counts */
55279 spin_lock_irqsave(&port->lock, flags);
55280- port->count--;
55281+ atomic_dec(&port->count);
55282 port->blocked_open++;
55283 spin_unlock_irqrestore(&port->lock, flags);
55284
55285@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
55286 we must not mess that up further */
55287 spin_lock_irqsave(&port->lock, flags);
55288 if (!tty_hung_up_p(filp))
55289- port->count++;
55290+ atomic_inc(&port->count);
55291 port->blocked_open--;
55292 if (retval == 0)
55293 port->flags |= ASYNC_NORMAL_ACTIVE;
55294@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
55295 return 0;
55296
55297 spin_lock_irqsave(&port->lock, flags);
55298- if (tty->count == 1 && port->count != 1) {
55299+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
55300 printk(KERN_WARNING
55301 "tty_port_close_start: tty->count = 1 port count = %d.\n",
55302- port->count);
55303- port->count = 1;
55304+ atomic_read(&port->count));
55305+ atomic_set(&port->count, 1);
55306 }
55307- if (--port->count < 0) {
55308+ if (atomic_dec_return(&port->count) < 0) {
55309 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
55310- port->count);
55311- port->count = 0;
55312+ atomic_read(&port->count));
55313+ atomic_set(&port->count, 0);
55314 }
55315
55316- if (port->count) {
55317+ if (atomic_read(&port->count)) {
55318 spin_unlock_irqrestore(&port->lock, flags);
55319 return 0;
55320 }
55321@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
55322 struct file *filp)
55323 {
55324 spin_lock_irq(&port->lock);
55325- ++port->count;
55326+ atomic_inc(&port->count);
55327 spin_unlock_irq(&port->lock);
55328 tty_port_tty_set(port, tty);
55329
55330diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
55331index 8a89f6e..50b32af 100644
55332--- a/drivers/tty/vt/keyboard.c
55333+++ b/drivers/tty/vt/keyboard.c
55334@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
55335 kbd->kbdmode == VC_OFF) &&
55336 value != KVAL(K_SAK))
55337 return; /* SAK is allowed even in raw mode */
55338+
55339+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
55340+ {
55341+ void *func = fn_handler[value];
55342+ if (func == fn_show_state || func == fn_show_ptregs ||
55343+ func == fn_show_mem)
55344+ return;
55345+ }
55346+#endif
55347+
55348 fn_handler[value](vc);
55349 }
55350
55351@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55352 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
55353 return -EFAULT;
55354
55355- if (!capable(CAP_SYS_TTY_CONFIG))
55356- perm = 0;
55357-
55358 switch (cmd) {
55359 case KDGKBENT:
55360 /* Ensure another thread doesn't free it under us */
55361@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
55362 spin_unlock_irqrestore(&kbd_event_lock, flags);
55363 return put_user(val, &user_kbe->kb_value);
55364 case KDSKBENT:
55365+ if (!capable(CAP_SYS_TTY_CONFIG))
55366+ perm = 0;
55367+
55368 if (!perm)
55369 return -EPERM;
55370 if (!i && v == K_NOSUCHMAP) {
55371@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55372 int i, j, k;
55373 int ret;
55374
55375- if (!capable(CAP_SYS_TTY_CONFIG))
55376- perm = 0;
55377-
55378 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
55379 if (!kbs) {
55380 ret = -ENOMEM;
55381@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
55382 kfree(kbs);
55383 return ((p && *p) ? -EOVERFLOW : 0);
55384 case KDSKBSENT:
55385+ if (!capable(CAP_SYS_TTY_CONFIG))
55386+ perm = 0;
55387+
55388 if (!perm) {
55389 ret = -EPERM;
55390 goto reterr;
55391diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
55392index 65bf067..b3b2e13 100644
55393--- a/drivers/uio/uio.c
55394+++ b/drivers/uio/uio.c
55395@@ -25,6 +25,7 @@
55396 #include <linux/kobject.h>
55397 #include <linux/cdev.h>
55398 #include <linux/uio_driver.h>
55399+#include <asm/local.h>
55400
55401 #define UIO_MAX_DEVICES (1U << MINORBITS)
55402
55403@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
55404 struct device_attribute *attr, char *buf)
55405 {
55406 struct uio_device *idev = dev_get_drvdata(dev);
55407- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
55408+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
55409 }
55410 static DEVICE_ATTR_RO(event);
55411
55412@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
55413 {
55414 struct uio_device *idev = info->uio_dev;
55415
55416- atomic_inc(&idev->event);
55417+ atomic_inc_unchecked(&idev->event);
55418 wake_up_interruptible(&idev->wait);
55419 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
55420 }
55421@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
55422 }
55423
55424 listener->dev = idev;
55425- listener->event_count = atomic_read(&idev->event);
55426+ listener->event_count = atomic_read_unchecked(&idev->event);
55427 filep->private_data = listener;
55428
55429 if (idev->info->open) {
55430@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
55431 return -EIO;
55432
55433 poll_wait(filep, &idev->wait, wait);
55434- if (listener->event_count != atomic_read(&idev->event))
55435+ if (listener->event_count != atomic_read_unchecked(&idev->event))
55436 return POLLIN | POLLRDNORM;
55437 return 0;
55438 }
55439@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
55440 do {
55441 set_current_state(TASK_INTERRUPTIBLE);
55442
55443- event_count = atomic_read(&idev->event);
55444+ event_count = atomic_read_unchecked(&idev->event);
55445 if (event_count != listener->event_count) {
55446 if (copy_to_user(buf, &event_count, count))
55447 retval = -EFAULT;
55448@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
55449 static int uio_find_mem_index(struct vm_area_struct *vma)
55450 {
55451 struct uio_device *idev = vma->vm_private_data;
55452+ unsigned long size;
55453
55454 if (vma->vm_pgoff < MAX_UIO_MAPS) {
55455- if (idev->info->mem[vma->vm_pgoff].size == 0)
55456+ size = idev->info->mem[vma->vm_pgoff].size;
55457+ if (size == 0)
55458+ return -1;
55459+ if (vma->vm_end - vma->vm_start > size)
55460 return -1;
55461 return (int)vma->vm_pgoff;
55462 }
55463@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
55464 idev->owner = owner;
55465 idev->info = info;
55466 init_waitqueue_head(&idev->wait);
55467- atomic_set(&idev->event, 0);
55468+ atomic_set_unchecked(&idev->event, 0);
55469
55470 ret = uio_get_minor(idev);
55471 if (ret)
55472diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
55473index 813d4d3..a71934f 100644
55474--- a/drivers/usb/atm/cxacru.c
55475+++ b/drivers/usb/atm/cxacru.c
55476@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
55477 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
55478 if (ret < 2)
55479 return -EINVAL;
55480- if (index < 0 || index > 0x7f)
55481+ if (index > 0x7f)
55482 return -EINVAL;
55483 pos += tmp;
55484
55485diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
55486index dada014..1d0d517 100644
55487--- a/drivers/usb/atm/usbatm.c
55488+++ b/drivers/usb/atm/usbatm.c
55489@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55490 if (printk_ratelimit())
55491 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
55492 __func__, vpi, vci);
55493- atomic_inc(&vcc->stats->rx_err);
55494+ atomic_inc_unchecked(&vcc->stats->rx_err);
55495 return;
55496 }
55497
55498@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55499 if (length > ATM_MAX_AAL5_PDU) {
55500 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
55501 __func__, length, vcc);
55502- atomic_inc(&vcc->stats->rx_err);
55503+ atomic_inc_unchecked(&vcc->stats->rx_err);
55504 goto out;
55505 }
55506
55507@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55508 if (sarb->len < pdu_length) {
55509 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
55510 __func__, pdu_length, sarb->len, vcc);
55511- atomic_inc(&vcc->stats->rx_err);
55512+ atomic_inc_unchecked(&vcc->stats->rx_err);
55513 goto out;
55514 }
55515
55516 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
55517 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
55518 __func__, vcc);
55519- atomic_inc(&vcc->stats->rx_err);
55520+ atomic_inc_unchecked(&vcc->stats->rx_err);
55521 goto out;
55522 }
55523
55524@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55525 if (printk_ratelimit())
55526 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
55527 __func__, length);
55528- atomic_inc(&vcc->stats->rx_drop);
55529+ atomic_inc_unchecked(&vcc->stats->rx_drop);
55530 goto out;
55531 }
55532
55533@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
55534
55535 vcc->push(vcc, skb);
55536
55537- atomic_inc(&vcc->stats->rx);
55538+ atomic_inc_unchecked(&vcc->stats->rx);
55539 out:
55540 skb_trim(sarb, 0);
55541 }
55542@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
55543 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
55544
55545 usbatm_pop(vcc, skb);
55546- atomic_inc(&vcc->stats->tx);
55547+ atomic_inc_unchecked(&vcc->stats->tx);
55548
55549 skb = skb_dequeue(&instance->sndqueue);
55550 }
55551@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
55552 if (!left--)
55553 return sprintf(page,
55554 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
55555- atomic_read(&atm_dev->stats.aal5.tx),
55556- atomic_read(&atm_dev->stats.aal5.tx_err),
55557- atomic_read(&atm_dev->stats.aal5.rx),
55558- atomic_read(&atm_dev->stats.aal5.rx_err),
55559- atomic_read(&atm_dev->stats.aal5.rx_drop));
55560+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
55561+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
55562+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
55563+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
55564+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
55565
55566 if (!left--) {
55567 if (instance->disconnected)
55568diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
55569index 2a3bbdf..91d72cf 100644
55570--- a/drivers/usb/core/devices.c
55571+++ b/drivers/usb/core/devices.c
55572@@ -126,7 +126,7 @@ static const char format_endpt[] =
55573 * time it gets called.
55574 */
55575 static struct device_connect_event {
55576- atomic_t count;
55577+ atomic_unchecked_t count;
55578 wait_queue_head_t wait;
55579 } device_event = {
55580 .count = ATOMIC_INIT(1),
55581@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
55582
55583 void usbfs_conn_disc_event(void)
55584 {
55585- atomic_add(2, &device_event.count);
55586+ atomic_add_unchecked(2, &device_event.count);
55587 wake_up(&device_event.wait);
55588 }
55589
55590@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
55591
55592 poll_wait(file, &device_event.wait, wait);
55593
55594- event_count = atomic_read(&device_event.count);
55595+ event_count = atomic_read_unchecked(&device_event.count);
55596 if (file->f_version != event_count) {
55597 file->f_version = event_count;
55598 return POLLIN | POLLRDNORM;
55599diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
55600index 986abde..80e8279 100644
55601--- a/drivers/usb/core/devio.c
55602+++ b/drivers/usb/core/devio.c
55603@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55604 struct usb_dev_state *ps = file->private_data;
55605 struct usb_device *dev = ps->dev;
55606 ssize_t ret = 0;
55607- unsigned len;
55608+ size_t len;
55609 loff_t pos;
55610 int i;
55611
55612@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
55613 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
55614 struct usb_config_descriptor *config =
55615 (struct usb_config_descriptor *)dev->rawdescriptors[i];
55616- unsigned int length = le16_to_cpu(config->wTotalLength);
55617+ size_t length = le16_to_cpu(config->wTotalLength);
55618
55619 if (*ppos < pos + length) {
55620
55621 /* The descriptor may claim to be longer than it
55622 * really is. Here is the actual allocated length. */
55623- unsigned alloclen =
55624+ size_t alloclen =
55625 le16_to_cpu(dev->config[i].desc.wTotalLength);
55626
55627- len = length - (*ppos - pos);
55628+ len = length + pos - *ppos;
55629 if (len > nbytes)
55630 len = nbytes;
55631
55632 /* Simply don't write (skip over) unallocated parts */
55633 if (alloclen > (*ppos - pos)) {
55634- alloclen -= (*ppos - pos);
55635+ alloclen = alloclen + pos - *ppos;
55636 if (copy_to_user(buf,
55637 dev->rawdescriptors[i] + (*ppos - pos),
55638 min(len, alloclen))) {
55639diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
55640index 1c1385e..18400ff 100644
55641--- a/drivers/usb/core/hcd.c
55642+++ b/drivers/usb/core/hcd.c
55643@@ -1554,7 +1554,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55644 */
55645 usb_get_urb(urb);
55646 atomic_inc(&urb->use_count);
55647- atomic_inc(&urb->dev->urbnum);
55648+ atomic_inc_unchecked(&urb->dev->urbnum);
55649 usbmon_urb_submit(&hcd->self, urb);
55650
55651 /* NOTE requirements on root-hub callers (usbfs and the hub
55652@@ -1581,7 +1581,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
55653 urb->hcpriv = NULL;
55654 INIT_LIST_HEAD(&urb->urb_list);
55655 atomic_dec(&urb->use_count);
55656- atomic_dec(&urb->dev->urbnum);
55657+ atomic_dec_unchecked(&urb->dev->urbnum);
55658 if (atomic_read(&urb->reject))
55659 wake_up(&usb_kill_urb_queue);
55660 usb_put_urb(urb);
55661diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
55662index 1e9a8c9..b4248b7 100644
55663--- a/drivers/usb/core/hub.c
55664+++ b/drivers/usb/core/hub.c
55665@@ -26,6 +26,7 @@
55666 #include <linux/mutex.h>
55667 #include <linux/random.h>
55668 #include <linux/pm_qos.h>
55669+#include <linux/grsecurity.h>
55670
55671 #include <asm/uaccess.h>
55672 #include <asm/byteorder.h>
55673@@ -4649,6 +4650,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
55674 goto done;
55675 return;
55676 }
55677+
55678+ if (gr_handle_new_usb())
55679+ goto done;
55680+
55681 if (hub_is_superspeed(hub->hdev))
55682 unit_load = 150;
55683 else
55684diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
55685index f368d20..0c30ac5 100644
55686--- a/drivers/usb/core/message.c
55687+++ b/drivers/usb/core/message.c
55688@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
55689 * Return: If successful, the number of bytes transferred. Otherwise, a negative
55690 * error number.
55691 */
55692-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55693+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
55694 __u8 requesttype, __u16 value, __u16 index, void *data,
55695 __u16 size, int timeout)
55696 {
55697@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
55698 * If successful, 0. Otherwise a negative error number. The number of actual
55699 * bytes transferred will be stored in the @actual_length parameter.
55700 */
55701-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55702+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
55703 void *data, int len, int *actual_length, int timeout)
55704 {
55705 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
55706@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
55707 * bytes transferred will be stored in the @actual_length parameter.
55708 *
55709 */
55710-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55711+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
55712 void *data, int len, int *actual_length, int timeout)
55713 {
55714 struct urb *urb;
55715diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55716index d269738..7340cd7 100644
55717--- a/drivers/usb/core/sysfs.c
55718+++ b/drivers/usb/core/sysfs.c
55719@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55720 struct usb_device *udev;
55721
55722 udev = to_usb_device(dev);
55723- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55724+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55725 }
55726 static DEVICE_ATTR_RO(urbnum);
55727
55728diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55729index 8d5b2f4..3896940 100644
55730--- a/drivers/usb/core/usb.c
55731+++ b/drivers/usb/core/usb.c
55732@@ -447,7 +447,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55733 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55734 dev->state = USB_STATE_ATTACHED;
55735 dev->lpm_disable_count = 1;
55736- atomic_set(&dev->urbnum, 0);
55737+ atomic_set_unchecked(&dev->urbnum, 0);
55738
55739 INIT_LIST_HEAD(&dev->ep0.urb_list);
55740 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55741diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55742index 8cfc319..4868255 100644
55743--- a/drivers/usb/early/ehci-dbgp.c
55744+++ b/drivers/usb/early/ehci-dbgp.c
55745@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55746
55747 #ifdef CONFIG_KGDB
55748 static struct kgdb_io kgdbdbgp_io_ops;
55749-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55750+static struct kgdb_io kgdbdbgp_io_ops_console;
55751+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55752 #else
55753 #define dbgp_kgdb_mode (0)
55754 #endif
55755@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55756 .write_char = kgdbdbgp_write_char,
55757 };
55758
55759+static struct kgdb_io kgdbdbgp_io_ops_console = {
55760+ .name = "kgdbdbgp",
55761+ .read_char = kgdbdbgp_read_char,
55762+ .write_char = kgdbdbgp_write_char,
55763+ .is_console = 1
55764+};
55765+
55766 static int kgdbdbgp_wait_time;
55767
55768 static int __init kgdbdbgp_parse_config(char *str)
55769@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55770 ptr++;
55771 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55772 }
55773- kgdb_register_io_module(&kgdbdbgp_io_ops);
55774- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55775+ if (early_dbgp_console.index != -1)
55776+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55777+ else
55778+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55779
55780 return 0;
55781 }
55782diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
55783index 0495c94..289e201 100644
55784--- a/drivers/usb/gadget/configfs.c
55785+++ b/drivers/usb/gadget/configfs.c
55786@@ -571,7 +571,7 @@ static struct config_group *function_make(
55787 if (IS_ERR(fi))
55788 return ERR_CAST(fi);
55789
55790- ret = config_item_set_name(&fi->group.cg_item, name);
55791+ ret = config_item_set_name(&fi->group.cg_item, "%s", name);
55792 if (ret) {
55793 usb_put_function_instance(fi);
55794 return ERR_PTR(ret);
55795diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
55796index 7856b33..8b7fe09 100644
55797--- a/drivers/usb/gadget/function/f_uac1.c
55798+++ b/drivers/usb/gadget/function/f_uac1.c
55799@@ -14,6 +14,7 @@
55800 #include <linux/module.h>
55801 #include <linux/device.h>
55802 #include <linux/atomic.h>
55803+#include <linux/module.h>
55804
55805 #include "u_uac1.h"
55806
55807diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
55808index 7ee05793..2e31e99 100644
55809--- a/drivers/usb/gadget/function/u_serial.c
55810+++ b/drivers/usb/gadget/function/u_serial.c
55811@@ -732,9 +732,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55812 spin_lock_irq(&port->port_lock);
55813
55814 /* already open? Great. */
55815- if (port->port.count) {
55816+ if (atomic_read(&port->port.count)) {
55817 status = 0;
55818- port->port.count++;
55819+ atomic_inc(&port->port.count);
55820
55821 /* currently opening/closing? wait ... */
55822 } else if (port->openclose) {
55823@@ -793,7 +793,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55824 tty->driver_data = port;
55825 port->port.tty = tty;
55826
55827- port->port.count = 1;
55828+ atomic_set(&port->port.count, 1);
55829 port->openclose = false;
55830
55831 /* if connected, start the I/O stream */
55832@@ -835,11 +835,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55833
55834 spin_lock_irq(&port->port_lock);
55835
55836- if (port->port.count != 1) {
55837- if (port->port.count == 0)
55838+ if (atomic_read(&port->port.count) != 1) {
55839+ if (atomic_read(&port->port.count) == 0)
55840 WARN_ON(1);
55841 else
55842- --port->port.count;
55843+ atomic_dec(&port->port.count);
55844 goto exit;
55845 }
55846
55847@@ -849,7 +849,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55848 * and sleep if necessary
55849 */
55850 port->openclose = true;
55851- port->port.count = 0;
55852+ atomic_set(&port->port.count, 0);
55853
55854 gser = port->port_usb;
55855 if (gser && gser->disconnect)
55856@@ -1065,7 +1065,7 @@ static int gs_closed(struct gs_port *port)
55857 int cond;
55858
55859 spin_lock_irq(&port->port_lock);
55860- cond = (port->port.count == 0) && !port->openclose;
55861+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
55862 spin_unlock_irq(&port->port_lock);
55863 return cond;
55864 }
55865@@ -1208,7 +1208,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
55866 /* if it's already open, start I/O ... and notify the serial
55867 * protocol about open/close status (connect/disconnect).
55868 */
55869- if (port->port.count) {
55870+ if (atomic_read(&port->port.count)) {
55871 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
55872 gs_start_io(port);
55873 if (gser->connect)
55874@@ -1255,7 +1255,7 @@ void gserial_disconnect(struct gserial *gser)
55875
55876 port->port_usb = NULL;
55877 gser->ioport = NULL;
55878- if (port->port.count > 0 || port->openclose) {
55879+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
55880 wake_up_interruptible(&port->drain_wait);
55881 if (port->port.tty)
55882 tty_hangup(port->port.tty);
55883@@ -1271,7 +1271,7 @@ void gserial_disconnect(struct gserial *gser)
55884
55885 /* finally, free any unused/unusable I/O buffers */
55886 spin_lock_irqsave(&port->port_lock, flags);
55887- if (port->port.count == 0 && !port->openclose)
55888+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
55889 gs_buf_free(&port->port_write_buf);
55890 gs_free_requests(gser->out, &port->read_pool, NULL);
55891 gs_free_requests(gser->out, &port->read_queue, NULL);
55892diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
55893index c78c841..48fd281 100644
55894--- a/drivers/usb/gadget/function/u_uac1.c
55895+++ b/drivers/usb/gadget/function/u_uac1.c
55896@@ -17,6 +17,7 @@
55897 #include <linux/ctype.h>
55898 #include <linux/random.h>
55899 #include <linux/syscalls.h>
55900+#include <linux/module.h>
55901
55902 #include "u_uac1.h"
55903
55904diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
55905index 6920844..480bb7e 100644
55906--- a/drivers/usb/host/ehci-hub.c
55907+++ b/drivers/usb/host/ehci-hub.c
55908@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
55909 urb->transfer_flags = URB_DIR_IN;
55910 usb_get_urb(urb);
55911 atomic_inc(&urb->use_count);
55912- atomic_inc(&urb->dev->urbnum);
55913+ atomic_inc_unchecked(&urb->dev->urbnum);
55914 urb->setup_dma = dma_map_single(
55915 hcd->self.controller,
55916 urb->setup_packet,
55917@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
55918 urb->status = -EINPROGRESS;
55919 usb_get_urb(urb);
55920 atomic_inc(&urb->use_count);
55921- atomic_inc(&urb->dev->urbnum);
55922+ atomic_inc_unchecked(&urb->dev->urbnum);
55923 retval = submit_single_step_set_feature(hcd, urb, 0);
55924 if (!retval && !wait_for_completion_timeout(&done,
55925 msecs_to_jiffies(2000))) {
55926diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
55927index 1db0626..4948782 100644
55928--- a/drivers/usb/host/hwa-hc.c
55929+++ b/drivers/usb/host/hwa-hc.c
55930@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55931 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
55932 struct wahc *wa = &hwahc->wa;
55933 struct device *dev = &wa->usb_iface->dev;
55934- u8 mas_le[UWB_NUM_MAS/8];
55935+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
55936+
55937+ if (mas_le == NULL)
55938+ return -ENOMEM;
55939
55940 /* Set the stream index */
55941 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
55942@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55943 WUSB_REQ_SET_WUSB_MAS,
55944 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
55945 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
55946- mas_le, 32, USB_CTRL_SET_TIMEOUT);
55947+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
55948 if (result < 0)
55949 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
55950 out:
55951+ kfree(mas_le);
55952+
55953 return result;
55954 }
55955
55956diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
55957index a0a3827..d7ec10b 100644
55958--- a/drivers/usb/misc/appledisplay.c
55959+++ b/drivers/usb/misc/appledisplay.c
55960@@ -84,7 +84,7 @@ struct appledisplay {
55961 struct mutex sysfslock; /* concurrent read and write */
55962 };
55963
55964-static atomic_t count_displays = ATOMIC_INIT(0);
55965+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
55966 static struct workqueue_struct *wq;
55967
55968 static void appledisplay_complete(struct urb *urb)
55969@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
55970
55971 /* Register backlight device */
55972 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
55973- atomic_inc_return(&count_displays) - 1);
55974+ atomic_inc_return_unchecked(&count_displays) - 1);
55975 memset(&props, 0, sizeof(struct backlight_properties));
55976 props.type = BACKLIGHT_RAW;
55977 props.max_brightness = 0xff;
55978diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
55979index 3806e70..55c508b 100644
55980--- a/drivers/usb/serial/console.c
55981+++ b/drivers/usb/serial/console.c
55982@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
55983
55984 info->port = port;
55985
55986- ++port->port.count;
55987+ atomic_inc(&port->port.count);
55988 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
55989 if (serial->type->set_termios) {
55990 /*
55991@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
55992 }
55993 /* Now that any required fake tty operations are completed restore
55994 * the tty port count */
55995- --port->port.count;
55996+ atomic_dec(&port->port.count);
55997 /* The console is special in terms of closing the device so
55998 * indicate this port is now acting as a system console. */
55999 port->port.console = 1;
56000@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
56001 put_tty:
56002 tty_kref_put(tty);
56003 reset_open_count:
56004- port->port.count = 0;
56005+ atomic_set(&port->port.count, 0);
56006 usb_autopm_put_interface(serial->interface);
56007 error_get_interface:
56008 usb_serial_put(serial);
56009@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
56010 static void usb_console_write(struct console *co,
56011 const char *buf, unsigned count)
56012 {
56013- static struct usbcons_info *info = &usbcons_info;
56014+ struct usbcons_info *info = &usbcons_info;
56015 struct usb_serial_port *port = info->port;
56016 struct usb_serial *serial;
56017 int retval = -ENODEV;
56018diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
56019index 307e339..6aa97cb 100644
56020--- a/drivers/usb/storage/usb.h
56021+++ b/drivers/usb/storage/usb.h
56022@@ -63,7 +63,7 @@ struct us_unusual_dev {
56023 __u8 useProtocol;
56024 __u8 useTransport;
56025 int (*initFunction)(struct us_data *);
56026-};
56027+} __do_const;
56028
56029
56030 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
56031diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
56032index a863a98..d272795 100644
56033--- a/drivers/usb/usbip/vhci.h
56034+++ b/drivers/usb/usbip/vhci.h
56035@@ -83,7 +83,7 @@ struct vhci_hcd {
56036 unsigned resuming:1;
56037 unsigned long re_timeout;
56038
56039- atomic_t seqnum;
56040+ atomic_unchecked_t seqnum;
56041
56042 /*
56043 * NOTE:
56044diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
56045index e9ef1ec..c3a0b04 100644
56046--- a/drivers/usb/usbip/vhci_hcd.c
56047+++ b/drivers/usb/usbip/vhci_hcd.c
56048@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
56049
56050 spin_lock(&vdev->priv_lock);
56051
56052- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
56053+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
56054 if (priv->seqnum == 0xffff)
56055 dev_info(&urb->dev->dev, "seqnum max\n");
56056
56057@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
56058 return -ENOMEM;
56059 }
56060
56061- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
56062+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
56063 if (unlink->seqnum == 0xffff)
56064 pr_info("seqnum max\n");
56065
56066@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
56067 vdev->rhport = rhport;
56068 }
56069
56070- atomic_set(&vhci->seqnum, 0);
56071+ atomic_set_unchecked(&vhci->seqnum, 0);
56072 spin_lock_init(&vhci->lock);
56073
56074 hcd->power_budget = 0; /* no limit */
56075diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
56076index 00e4a54..d676f85 100644
56077--- a/drivers/usb/usbip/vhci_rx.c
56078+++ b/drivers/usb/usbip/vhci_rx.c
56079@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
56080 if (!urb) {
56081 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
56082 pr_info("max seqnum %d\n",
56083- atomic_read(&the_controller->seqnum));
56084+ atomic_read_unchecked(&the_controller->seqnum));
56085 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
56086 return;
56087 }
56088diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
56089index edc7267..9f65ce2 100644
56090--- a/drivers/usb/wusbcore/wa-hc.h
56091+++ b/drivers/usb/wusbcore/wa-hc.h
56092@@ -240,7 +240,7 @@ struct wahc {
56093 spinlock_t xfer_list_lock;
56094 struct work_struct xfer_enqueue_work;
56095 struct work_struct xfer_error_work;
56096- atomic_t xfer_id_count;
56097+ atomic_unchecked_t xfer_id_count;
56098
56099 kernel_ulong_t quirks;
56100 };
56101@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
56102 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
56103 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
56104 wa->dto_in_use = 0;
56105- atomic_set(&wa->xfer_id_count, 1);
56106+ atomic_set_unchecked(&wa->xfer_id_count, 1);
56107 /* init the buf in URBs */
56108 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
56109 usb_init_urb(&(wa->buf_in_urbs[index]));
56110diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
56111index 69af4fd..da390d7 100644
56112--- a/drivers/usb/wusbcore/wa-xfer.c
56113+++ b/drivers/usb/wusbcore/wa-xfer.c
56114@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
56115 */
56116 static void wa_xfer_id_init(struct wa_xfer *xfer)
56117 {
56118- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
56119+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
56120 }
56121
56122 /* Return the xfer's ID. */
56123diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
56124index e1278fe..7fdeac4 100644
56125--- a/drivers/vfio/vfio.c
56126+++ b/drivers/vfio/vfio.c
56127@@ -517,7 +517,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
56128 return 0;
56129
56130 /* TODO Prevent device auto probing */
56131- WARN("Device %s added to live group %d!\n", dev_name(dev),
56132+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
56133 iommu_group_id(group->iommu_group));
56134
56135 return 0;
56136diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
56137index 3bb02c6..a01ff38 100644
56138--- a/drivers/vhost/vringh.c
56139+++ b/drivers/vhost/vringh.c
56140@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
56141 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
56142 {
56143 __virtio16 v = 0;
56144- int rc = get_user(v, (__force __virtio16 __user *)p);
56145+ int rc = get_user(v, (__force_user __virtio16 *)p);
56146 *val = vringh16_to_cpu(vrh, v);
56147 return rc;
56148 }
56149@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
56150 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
56151 {
56152 __virtio16 v = cpu_to_vringh16(vrh, val);
56153- return put_user(v, (__force __virtio16 __user *)p);
56154+ return put_user(v, (__force_user __virtio16 *)p);
56155 }
56156
56157 static inline int copydesc_user(void *dst, const void *src, size_t len)
56158 {
56159- return copy_from_user(dst, (__force void __user *)src, len) ?
56160+ return copy_from_user(dst, (void __force_user *)src, len) ?
56161 -EFAULT : 0;
56162 }
56163
56164@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
56165 const struct vring_used_elem *src,
56166 unsigned int num)
56167 {
56168- return copy_to_user((__force void __user *)dst, src,
56169+ return copy_to_user((void __force_user *)dst, src,
56170 sizeof(*dst) * num) ? -EFAULT : 0;
56171 }
56172
56173 static inline int xfer_from_user(void *src, void *dst, size_t len)
56174 {
56175- return copy_from_user(dst, (__force void __user *)src, len) ?
56176+ return copy_from_user(dst, (void __force_user *)src, len) ?
56177 -EFAULT : 0;
56178 }
56179
56180 static inline int xfer_to_user(void *dst, void *src, size_t len)
56181 {
56182- return copy_to_user((__force void __user *)dst, src, len) ?
56183+ return copy_to_user((void __force_user *)dst, src, len) ?
56184 -EFAULT : 0;
56185 }
56186
56187@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
56188 vrh->last_used_idx = 0;
56189 vrh->vring.num = num;
56190 /* vring expects kernel addresses, but only used via accessors. */
56191- vrh->vring.desc = (__force struct vring_desc *)desc;
56192- vrh->vring.avail = (__force struct vring_avail *)avail;
56193- vrh->vring.used = (__force struct vring_used *)used;
56194+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
56195+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
56196+ vrh->vring.used = (__force_kernel struct vring_used *)used;
56197 return 0;
56198 }
56199 EXPORT_SYMBOL(vringh_init_user);
56200@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
56201
56202 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
56203 {
56204- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
56205+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
56206 return 0;
56207 }
56208
56209diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
56210index 84a110a..96312c3 100644
56211--- a/drivers/video/backlight/kb3886_bl.c
56212+++ b/drivers/video/backlight/kb3886_bl.c
56213@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
56214 static unsigned long kb3886bl_flags;
56215 #define KB3886BL_SUSPENDED 0x01
56216
56217-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
56218+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
56219 {
56220 .ident = "Sahara Touch-iT",
56221 .matches = {
56222diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
56223index 1b0b233..6f34c2c 100644
56224--- a/drivers/video/fbdev/arcfb.c
56225+++ b/drivers/video/fbdev/arcfb.c
56226@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
56227 return -ENOSPC;
56228
56229 err = 0;
56230- if ((count + p) > fbmemlength) {
56231+ if (count > (fbmemlength - p)) {
56232 count = fbmemlength - p;
56233 err = -ENOSPC;
56234 }
56235diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
56236index 0156954..c07d4e0 100644
56237--- a/drivers/video/fbdev/aty/aty128fb.c
56238+++ b/drivers/video/fbdev/aty/aty128fb.c
56239@@ -149,7 +149,7 @@ enum {
56240 };
56241
56242 /* Must match above enum */
56243-static char * const r128_family[] = {
56244+static const char * const r128_family[] = {
56245 "AGP",
56246 "PCI",
56247 "PRO AGP",
56248diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
56249index 8789e48..698fe4c 100644
56250--- a/drivers/video/fbdev/aty/atyfb_base.c
56251+++ b/drivers/video/fbdev/aty/atyfb_base.c
56252@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
56253 par->accel_flags = var->accel_flags; /* hack */
56254
56255 if (var->accel_flags) {
56256- info->fbops->fb_sync = atyfb_sync;
56257+ pax_open_kernel();
56258+ *(void **)&info->fbops->fb_sync = atyfb_sync;
56259+ pax_close_kernel();
56260 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56261 } else {
56262- info->fbops->fb_sync = NULL;
56263+ pax_open_kernel();
56264+ *(void **)&info->fbops->fb_sync = NULL;
56265+ pax_close_kernel();
56266 info->flags |= FBINFO_HWACCEL_DISABLED;
56267 }
56268
56269diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
56270index 2fa0317..4983f2a 100644
56271--- a/drivers/video/fbdev/aty/mach64_cursor.c
56272+++ b/drivers/video/fbdev/aty/mach64_cursor.c
56273@@ -8,6 +8,7 @@
56274 #include "../core/fb_draw.h"
56275
56276 #include <asm/io.h>
56277+#include <asm/pgtable.h>
56278
56279 #ifdef __sparc__
56280 #include <asm/fbio.h>
56281@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
56282 info->sprite.buf_align = 16; /* and 64 lines tall. */
56283 info->sprite.flags = FB_PIXMAP_IO;
56284
56285- info->fbops->fb_cursor = atyfb_cursor;
56286+ pax_open_kernel();
56287+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
56288+ pax_close_kernel();
56289
56290 return 0;
56291 }
56292diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
56293index d6cab1f..112f680 100644
56294--- a/drivers/video/fbdev/core/fb_defio.c
56295+++ b/drivers/video/fbdev/core/fb_defio.c
56296@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
56297
56298 BUG_ON(!fbdefio);
56299 mutex_init(&fbdefio->lock);
56300- info->fbops->fb_mmap = fb_deferred_io_mmap;
56301+ pax_open_kernel();
56302+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
56303+ pax_close_kernel();
56304 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
56305 INIT_LIST_HEAD(&fbdefio->pagelist);
56306 if (fbdefio->delay == 0) /* set a default of 1 s */
56307@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
56308 page->mapping = NULL;
56309 }
56310
56311- info->fbops->fb_mmap = NULL;
56312+ *(void **)&info->fbops->fb_mmap = NULL;
56313 mutex_destroy(&fbdefio->lock);
56314 }
56315 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
56316diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
56317index 0705d88..d9429bf 100644
56318--- a/drivers/video/fbdev/core/fbmem.c
56319+++ b/drivers/video/fbdev/core/fbmem.c
56320@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
56321 __u32 data;
56322 int err;
56323
56324- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
56325+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
56326
56327 data = (__u32) (unsigned long) fix->smem_start;
56328 err |= put_user(data, &fix32->smem_start);
56329diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
56330index 807ee22..7814cd6 100644
56331--- a/drivers/video/fbdev/hyperv_fb.c
56332+++ b/drivers/video/fbdev/hyperv_fb.c
56333@@ -240,7 +240,7 @@ static uint screen_fb_size;
56334 static inline int synthvid_send(struct hv_device *hdev,
56335 struct synthvid_msg *msg)
56336 {
56337- static atomic64_t request_id = ATOMIC64_INIT(0);
56338+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
56339 int ret;
56340
56341 msg->pipe_hdr.type = PIPE_MSG_DATA;
56342@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
56343
56344 ret = vmbus_sendpacket(hdev->channel, msg,
56345 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
56346- atomic64_inc_return(&request_id),
56347+ atomic64_inc_return_unchecked(&request_id),
56348 VM_PKT_DATA_INBAND, 0);
56349
56350 if (ret)
56351diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
56352index 7672d2e..b56437f 100644
56353--- a/drivers/video/fbdev/i810/i810_accel.c
56354+++ b/drivers/video/fbdev/i810/i810_accel.c
56355@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
56356 }
56357 }
56358 printk("ringbuffer lockup!!!\n");
56359+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
56360 i810_report_error(mmio);
56361 par->dev_flags |= LOCKUP;
56362 info->pixmap.scan_align = 1;
56363diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56364index a01147f..5d896f8 100644
56365--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56366+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
56367@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
56368
56369 #ifdef CONFIG_FB_MATROX_MYSTIQUE
56370 struct matrox_switch matrox_mystique = {
56371- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
56372+ .preinit = MGA1064_preinit,
56373+ .reset = MGA1064_reset,
56374+ .init = MGA1064_init,
56375+ .restore = MGA1064_restore,
56376 };
56377 EXPORT_SYMBOL(matrox_mystique);
56378 #endif
56379
56380 #ifdef CONFIG_FB_MATROX_G
56381 struct matrox_switch matrox_G100 = {
56382- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
56383+ .preinit = MGAG100_preinit,
56384+ .reset = MGAG100_reset,
56385+ .init = MGAG100_init,
56386+ .restore = MGAG100_restore,
56387 };
56388 EXPORT_SYMBOL(matrox_G100);
56389 #endif
56390diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56391index 195ad7c..09743fc 100644
56392--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56393+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
56394@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
56395 }
56396
56397 struct matrox_switch matrox_millennium = {
56398- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
56399+ .preinit = Ti3026_preinit,
56400+ .reset = Ti3026_reset,
56401+ .init = Ti3026_init,
56402+ .restore = Ti3026_restore
56403 };
56404 EXPORT_SYMBOL(matrox_millennium);
56405 #endif
56406diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56407index fe92eed..106e085 100644
56408--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56409+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
56410@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
56411 struct mb862xxfb_par *par = info->par;
56412
56413 if (info->var.bits_per_pixel == 32) {
56414- info->fbops->fb_fillrect = cfb_fillrect;
56415- info->fbops->fb_copyarea = cfb_copyarea;
56416- info->fbops->fb_imageblit = cfb_imageblit;
56417+ pax_open_kernel();
56418+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56419+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56420+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56421+ pax_close_kernel();
56422 } else {
56423 outreg(disp, GC_L0EM, 3);
56424- info->fbops->fb_fillrect = mb86290fb_fillrect;
56425- info->fbops->fb_copyarea = mb86290fb_copyarea;
56426- info->fbops->fb_imageblit = mb86290fb_imageblit;
56427+ pax_open_kernel();
56428+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
56429+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
56430+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
56431+ pax_close_kernel();
56432 }
56433 outreg(draw, GDC_REG_DRAW_BASE, 0);
56434 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
56435diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
56436index 4273c6e..b413013 100644
56437--- a/drivers/video/fbdev/nvidia/nvidia.c
56438+++ b/drivers/video/fbdev/nvidia/nvidia.c
56439@@ -665,19 +665,23 @@ static int nvidiafb_set_par(struct fb_info *info)
56440 info->fix.line_length = (info->var.xres_virtual *
56441 info->var.bits_per_pixel) >> 3;
56442 if (info->var.accel_flags) {
56443- info->fbops->fb_imageblit = nvidiafb_imageblit;
56444- info->fbops->fb_fillrect = nvidiafb_fillrect;
56445- info->fbops->fb_copyarea = nvidiafb_copyarea;
56446- info->fbops->fb_sync = nvidiafb_sync;
56447+ pax_open_kernel();
56448+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
56449+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
56450+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
56451+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
56452+ pax_close_kernel();
56453 info->pixmap.scan_align = 4;
56454 info->flags &= ~FBINFO_HWACCEL_DISABLED;
56455 info->flags |= FBINFO_READS_FAST;
56456 NVResetGraphics(info);
56457 } else {
56458- info->fbops->fb_imageblit = cfb_imageblit;
56459- info->fbops->fb_fillrect = cfb_fillrect;
56460- info->fbops->fb_copyarea = cfb_copyarea;
56461- info->fbops->fb_sync = NULL;
56462+ pax_open_kernel();
56463+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
56464+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
56465+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
56466+ *(void **)&info->fbops->fb_sync = NULL;
56467+ pax_close_kernel();
56468 info->pixmap.scan_align = 1;
56469 info->flags |= FBINFO_HWACCEL_DISABLED;
56470 info->flags &= ~FBINFO_READS_FAST;
56471@@ -1169,8 +1173,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
56472 info->pixmap.size = 8 * 1024;
56473 info->pixmap.flags = FB_PIXMAP_SYSTEM;
56474
56475- if (!hwcur)
56476- info->fbops->fb_cursor = NULL;
56477+ if (!hwcur) {
56478+ pax_open_kernel();
56479+ *(void **)&info->fbops->fb_cursor = NULL;
56480+ pax_close_kernel();
56481+ }
56482
56483 info->var.accel_flags = (!noaccel);
56484
56485diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
56486index ef5b902..47cf7f5 100644
56487--- a/drivers/video/fbdev/omap2/dss/display.c
56488+++ b/drivers/video/fbdev/omap2/dss/display.c
56489@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
56490 if (dssdev->name == NULL)
56491 dssdev->name = dssdev->alias;
56492
56493+ pax_open_kernel();
56494 if (drv && drv->get_resolution == NULL)
56495- drv->get_resolution = omapdss_default_get_resolution;
56496+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
56497 if (drv && drv->get_recommended_bpp == NULL)
56498- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56499+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
56500 if (drv && drv->get_timings == NULL)
56501- drv->get_timings = omapdss_default_get_timings;
56502+ *(void **)&drv->get_timings = omapdss_default_get_timings;
56503+ pax_close_kernel();
56504
56505 mutex_lock(&panel_list_mutex);
56506 list_add_tail(&dssdev->panel_list, &panel_list);
56507diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
56508index 83433cb..71e9b98 100644
56509--- a/drivers/video/fbdev/s1d13xxxfb.c
56510+++ b/drivers/video/fbdev/s1d13xxxfb.c
56511@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
56512
56513 switch(prod_id) {
56514 case S1D13506_PROD_ID: /* activate acceleration */
56515- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56516- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56517+ pax_open_kernel();
56518+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
56519+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
56520+ pax_close_kernel();
56521 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
56522 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
56523 break;
56524diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56525index 82c0a8c..42499a1 100644
56526--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
56527+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
56528@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
56529 }
56530
56531 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
56532- lcdc_sys_write_index,
56533- lcdc_sys_write_data,
56534- lcdc_sys_read_data,
56535+ .write_index = lcdc_sys_write_index,
56536+ .write_data = lcdc_sys_write_data,
56537+ .read_data = lcdc_sys_read_data,
56538 };
56539
56540 static int sh_mobile_lcdc_sginit(struct fb_info *info,
56541diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
56542index 9279e5f..d5f5276 100644
56543--- a/drivers/video/fbdev/smscufx.c
56544+++ b/drivers/video/fbdev/smscufx.c
56545@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
56546 fb_deferred_io_cleanup(info);
56547 kfree(info->fbdefio);
56548 info->fbdefio = NULL;
56549- info->fbops->fb_mmap = ufx_ops_mmap;
56550+ pax_open_kernel();
56551+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
56552+ pax_close_kernel();
56553 }
56554
56555 pr_debug("released /dev/fb%d user=%d count=%d",
56556diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
56557index ff2b873..626a8d5 100644
56558--- a/drivers/video/fbdev/udlfb.c
56559+++ b/drivers/video/fbdev/udlfb.c
56560@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
56561 dlfb_urb_completion(urb);
56562
56563 error:
56564- atomic_add(bytes_sent, &dev->bytes_sent);
56565- atomic_add(bytes_identical, &dev->bytes_identical);
56566- atomic_add(width*height*2, &dev->bytes_rendered);
56567+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56568+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56569+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
56570 end_cycles = get_cycles();
56571- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56572+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56573 >> 10)), /* Kcycles */
56574 &dev->cpu_kcycles_used);
56575
56576@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
56577 dlfb_urb_completion(urb);
56578
56579 error:
56580- atomic_add(bytes_sent, &dev->bytes_sent);
56581- atomic_add(bytes_identical, &dev->bytes_identical);
56582- atomic_add(bytes_rendered, &dev->bytes_rendered);
56583+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
56584+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
56585+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
56586 end_cycles = get_cycles();
56587- atomic_add(((unsigned int) ((end_cycles - start_cycles)
56588+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
56589 >> 10)), /* Kcycles */
56590 &dev->cpu_kcycles_used);
56591 }
56592@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
56593 fb_deferred_io_cleanup(info);
56594 kfree(info->fbdefio);
56595 info->fbdefio = NULL;
56596- info->fbops->fb_mmap = dlfb_ops_mmap;
56597+ pax_open_kernel();
56598+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
56599+ pax_close_kernel();
56600 }
56601
56602 pr_warn("released /dev/fb%d user=%d count=%d\n",
56603@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
56604 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56605 struct dlfb_data *dev = fb_info->par;
56606 return snprintf(buf, PAGE_SIZE, "%u\n",
56607- atomic_read(&dev->bytes_rendered));
56608+ atomic_read_unchecked(&dev->bytes_rendered));
56609 }
56610
56611 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56612@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
56613 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56614 struct dlfb_data *dev = fb_info->par;
56615 return snprintf(buf, PAGE_SIZE, "%u\n",
56616- atomic_read(&dev->bytes_identical));
56617+ atomic_read_unchecked(&dev->bytes_identical));
56618 }
56619
56620 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56621@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
56622 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56623 struct dlfb_data *dev = fb_info->par;
56624 return snprintf(buf, PAGE_SIZE, "%u\n",
56625- atomic_read(&dev->bytes_sent));
56626+ atomic_read_unchecked(&dev->bytes_sent));
56627 }
56628
56629 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56630@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
56631 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56632 struct dlfb_data *dev = fb_info->par;
56633 return snprintf(buf, PAGE_SIZE, "%u\n",
56634- atomic_read(&dev->cpu_kcycles_used));
56635+ atomic_read_unchecked(&dev->cpu_kcycles_used));
56636 }
56637
56638 static ssize_t edid_show(
56639@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
56640 struct fb_info *fb_info = dev_get_drvdata(fbdev);
56641 struct dlfb_data *dev = fb_info->par;
56642
56643- atomic_set(&dev->bytes_rendered, 0);
56644- atomic_set(&dev->bytes_identical, 0);
56645- atomic_set(&dev->bytes_sent, 0);
56646- atomic_set(&dev->cpu_kcycles_used, 0);
56647+ atomic_set_unchecked(&dev->bytes_rendered, 0);
56648+ atomic_set_unchecked(&dev->bytes_identical, 0);
56649+ atomic_set_unchecked(&dev->bytes_sent, 0);
56650+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
56651
56652 return count;
56653 }
56654diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
56655index d32d1c4..46722e6 100644
56656--- a/drivers/video/fbdev/uvesafb.c
56657+++ b/drivers/video/fbdev/uvesafb.c
56658@@ -19,6 +19,7 @@
56659 #include <linux/io.h>
56660 #include <linux/mutex.h>
56661 #include <linux/slab.h>
56662+#include <linux/moduleloader.h>
56663 #include <video/edid.h>
56664 #include <video/uvesafb.h>
56665 #ifdef CONFIG_X86
56666@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
56667 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
56668 par->pmi_setpal = par->ypan = 0;
56669 } else {
56670+
56671+#ifdef CONFIG_PAX_KERNEXEC
56672+#ifdef CONFIG_MODULES
56673+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
56674+#endif
56675+ if (!par->pmi_code) {
56676+ par->pmi_setpal = par->ypan = 0;
56677+ return 0;
56678+ }
56679+#endif
56680+
56681 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
56682 + task->t.regs.edi);
56683+
56684+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56685+ pax_open_kernel();
56686+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
56687+ pax_close_kernel();
56688+
56689+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
56690+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
56691+#else
56692 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
56693 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
56694+#endif
56695+
56696 printk(KERN_INFO "uvesafb: protected mode interface info at "
56697 "%04x:%04x\n",
56698 (u16)task->t.regs.es, (u16)task->t.regs.edi);
56699@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
56700 par->ypan = ypan;
56701
56702 if (par->pmi_setpal || par->ypan) {
56703+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
56704 if (__supported_pte_mask & _PAGE_NX) {
56705 par->pmi_setpal = par->ypan = 0;
56706 printk(KERN_WARNING "uvesafb: NX protection is active, "
56707 "better not use the PMI.\n");
56708- } else {
56709+ } else
56710+#endif
56711 uvesafb_vbe_getpmi(task, par);
56712- }
56713 }
56714 #else
56715 /* The protected mode interface is not available on non-x86. */
56716@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56717 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
56718
56719 /* Disable blanking if the user requested so. */
56720- if (!blank)
56721- info->fbops->fb_blank = NULL;
56722+ if (!blank) {
56723+ pax_open_kernel();
56724+ *(void **)&info->fbops->fb_blank = NULL;
56725+ pax_close_kernel();
56726+ }
56727
56728 /*
56729 * Find out how much IO memory is required for the mode with
56730@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56731 info->flags = FBINFO_FLAG_DEFAULT |
56732 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56733
56734- if (!par->ypan)
56735- info->fbops->fb_pan_display = NULL;
56736+ if (!par->ypan) {
56737+ pax_open_kernel();
56738+ *(void **)&info->fbops->fb_pan_display = NULL;
56739+ pax_close_kernel();
56740+ }
56741 }
56742
56743 static void uvesafb_init_mtrr(struct fb_info *info)
56744@@ -1786,6 +1816,11 @@ out_mode:
56745 out:
56746 kfree(par->vbe_modes);
56747
56748+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56749+ if (par->pmi_code)
56750+ module_memfree_exec(par->pmi_code);
56751+#endif
56752+
56753 framebuffer_release(info);
56754 return err;
56755 }
56756@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56757 kfree(par->vbe_state_orig);
56758 kfree(par->vbe_state_saved);
56759
56760+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56761+ if (par->pmi_code)
56762+ module_memfree_exec(par->pmi_code);
56763+#endif
56764+
56765 framebuffer_release(info);
56766 }
56767 return 0;
56768diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56769index d79a0ac..2d0c3d4 100644
56770--- a/drivers/video/fbdev/vesafb.c
56771+++ b/drivers/video/fbdev/vesafb.c
56772@@ -9,6 +9,7 @@
56773 */
56774
56775 #include <linux/module.h>
56776+#include <linux/moduleloader.h>
56777 #include <linux/kernel.h>
56778 #include <linux/errno.h>
56779 #include <linux/string.h>
56780@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56781 static int vram_total; /* Set total amount of memory */
56782 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56783 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56784-static void (*pmi_start)(void) __read_mostly;
56785-static void (*pmi_pal) (void) __read_mostly;
56786+static void (*pmi_start)(void) __read_only;
56787+static void (*pmi_pal) (void) __read_only;
56788 static int depth __read_mostly;
56789 static int vga_compat __read_mostly;
56790 /* --------------------------------------------------------------------- */
56791@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
56792 unsigned int size_remap;
56793 unsigned int size_total;
56794 char *option = NULL;
56795+ void *pmi_code = NULL;
56796
56797 /* ignore error return of fb_get_options */
56798 fb_get_options("vesafb", &option);
56799@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
56800 size_remap = size_total;
56801 vesafb_fix.smem_len = size_remap;
56802
56803-#ifndef __i386__
56804- screen_info.vesapm_seg = 0;
56805-#endif
56806-
56807 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
56808 printk(KERN_WARNING
56809 "vesafb: cannot reserve video memory at 0x%lx\n",
56810@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
56811 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
56812 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
56813
56814+#ifdef __i386__
56815+
56816+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56817+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
56818+ if (!pmi_code)
56819+#elif !defined(CONFIG_PAX_KERNEXEC)
56820+ if (0)
56821+#endif
56822+
56823+#endif
56824+ screen_info.vesapm_seg = 0;
56825+
56826 if (screen_info.vesapm_seg) {
56827- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
56828- screen_info.vesapm_seg,screen_info.vesapm_off);
56829+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
56830+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
56831 }
56832
56833 if (screen_info.vesapm_seg < 0xc000)
56834@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
56835
56836 if (ypan || pmi_setpal) {
56837 unsigned short *pmi_base;
56838+
56839 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
56840- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
56841- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
56842+
56843+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56844+ pax_open_kernel();
56845+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
56846+#else
56847+ pmi_code = pmi_base;
56848+#endif
56849+
56850+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
56851+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
56852+
56853+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56854+ pmi_start = ktva_ktla(pmi_start);
56855+ pmi_pal = ktva_ktla(pmi_pal);
56856+ pax_close_kernel();
56857+#endif
56858+
56859 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
56860 if (pmi_base[3]) {
56861 printk(KERN_INFO "vesafb: pmi: ports = ");
56862@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
56863 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
56864 (ypan ? FBINFO_HWACCEL_YPAN : 0);
56865
56866- if (!ypan)
56867- info->fbops->fb_pan_display = NULL;
56868+ if (!ypan) {
56869+ pax_open_kernel();
56870+ *(void **)&info->fbops->fb_pan_display = NULL;
56871+ pax_close_kernel();
56872+ }
56873
56874 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
56875 err = -ENOMEM;
56876@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
56877 fb_info(info, "%s frame buffer device\n", info->fix.id);
56878 return 0;
56879 err:
56880+
56881+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56882+ module_memfree_exec(pmi_code);
56883+#endif
56884+
56885 if (info->screen_base)
56886 iounmap(info->screen_base);
56887 framebuffer_release(info);
56888diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
56889index 88714ae..16c2e11 100644
56890--- a/drivers/video/fbdev/via/via_clock.h
56891+++ b/drivers/video/fbdev/via/via_clock.h
56892@@ -56,7 +56,7 @@ struct via_clock {
56893
56894 void (*set_engine_pll_state)(u8 state);
56895 void (*set_engine_pll)(struct via_pll_config config);
56896-};
56897+} __no_const;
56898
56899
56900 static inline u32 get_pll_internal_frequency(u32 ref_freq,
56901diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
56902index 3c14e43..2630570 100644
56903--- a/drivers/video/logo/logo_linux_clut224.ppm
56904+++ b/drivers/video/logo/logo_linux_clut224.ppm
56905@@ -2,1603 +2,1123 @@ P3
56906 # Standard 224-color Linux logo
56907 80 80
56908 255
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- 6 6 6 6 6 6 10 10 10 10 10 10
56919- 10 10 10 6 6 6 6 6 6 6 6 6
56920- 0 0 0 0 0 0 0 0 0 0 0 0
56921- 0 0 0 0 0 0 0 0 0 0 0 0
56922- 0 0 0 0 0 0 0 0 0 0 0 0
56923- 0 0 0 0 0 0 0 0 0 0 0 0
56924- 0 0 0 0 0 0 0 0 0 0 0 0
56925- 0 0 0 0 0 0 0 0 0 0 0 0
56926- 0 0 0 0 0 0 0 0 0 0 0 0
56927- 0 0 0 0 0 0 0 0 0 0 0 0
56928- 0 0 0 0 0 0 0 0 0 0 0 0
56929- 0 0 0 0 0 0 0 0 0 0 0 0
56930- 0 0 0 0 0 0 0 0 0 0 0 0
56931- 0 0 0 0 0 0 0 0 0 0 0 0
56932- 0 0 0 0 0 0 0 0 0 0 0 0
56933- 0 0 0 0 0 0 0 0 0 0 0 0
56934- 0 0 0 0 0 0 0 0 0 0 0 0
56935- 0 0 0 0 0 0 0 0 0 0 0 0
56936- 0 0 0 0 0 0 0 0 0 0 0 0
56937- 0 0 0 6 6 6 10 10 10 14 14 14
56938- 22 22 22 26 26 26 30 30 30 34 34 34
56939- 30 30 30 30 30 30 26 26 26 18 18 18
56940- 14 14 14 10 10 10 6 6 6 0 0 0
56941- 0 0 0 0 0 0 0 0 0 0 0 0
56942- 0 0 0 0 0 0 0 0 0 0 0 0
56943- 0 0 0 0 0 0 0 0 0 0 0 0
56944- 0 0 0 0 0 0 0 0 0 0 0 0
56945- 0 0 0 0 0 0 0 0 0 0 0 0
56946- 0 0 0 0 0 0 0 0 0 0 0 0
56947- 0 0 0 0 0 0 0 0 0 0 0 0
56948- 0 0 0 0 0 0 0 0 0 0 0 0
56949- 0 0 0 0 0 0 0 0 0 0 0 0
56950- 0 0 0 0 0 1 0 0 1 0 0 0
56951- 0 0 0 0 0 0 0 0 0 0 0 0
56952- 0 0 0 0 0 0 0 0 0 0 0 0
56953- 0 0 0 0 0 0 0 0 0 0 0 0
56954- 0 0 0 0 0 0 0 0 0 0 0 0
56955- 0 0 0 0 0 0 0 0 0 0 0 0
56956- 0 0 0 0 0 0 0 0 0 0 0 0
56957- 6 6 6 14 14 14 26 26 26 42 42 42
56958- 54 54 54 66 66 66 78 78 78 78 78 78
56959- 78 78 78 74 74 74 66 66 66 54 54 54
56960- 42 42 42 26 26 26 18 18 18 10 10 10
56961- 6 6 6 0 0 0 0 0 0 0 0 0
56962- 0 0 0 0 0 0 0 0 0 0 0 0
56963- 0 0 0 0 0 0 0 0 0 0 0 0
56964- 0 0 0 0 0 0 0 0 0 0 0 0
56965- 0 0 0 0 0 0 0 0 0 0 0 0
56966- 0 0 0 0 0 0 0 0 0 0 0 0
56967- 0 0 0 0 0 0 0 0 0 0 0 0
56968- 0 0 0 0 0 0 0 0 0 0 0 0
56969- 0 0 0 0 0 0 0 0 0 0 0 0
56970- 0 0 1 0 0 0 0 0 0 0 0 0
56971- 0 0 0 0 0 0 0 0 0 0 0 0
56972- 0 0 0 0 0 0 0 0 0 0 0 0
56973- 0 0 0 0 0 0 0 0 0 0 0 0
56974- 0 0 0 0 0 0 0 0 0 0 0 0
56975- 0 0 0 0 0 0 0 0 0 0 0 0
56976- 0 0 0 0 0 0 0 0 0 10 10 10
56977- 22 22 22 42 42 42 66 66 66 86 86 86
56978- 66 66 66 38 38 38 38 38 38 22 22 22
56979- 26 26 26 34 34 34 54 54 54 66 66 66
56980- 86 86 86 70 70 70 46 46 46 26 26 26
56981- 14 14 14 6 6 6 0 0 0 0 0 0
56982- 0 0 0 0 0 0 0 0 0 0 0 0
56983- 0 0 0 0 0 0 0 0 0 0 0 0
56984- 0 0 0 0 0 0 0 0 0 0 0 0
56985- 0 0 0 0 0 0 0 0 0 0 0 0
56986- 0 0 0 0 0 0 0 0 0 0 0 0
56987- 0 0 0 0 0 0 0 0 0 0 0 0
56988- 0 0 0 0 0 0 0 0 0 0 0 0
56989- 0 0 0 0 0 0 0 0 0 0 0 0
56990- 0 0 1 0 0 1 0 0 1 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 10 10 10 26 26 26
56997- 50 50 50 82 82 82 58 58 58 6 6 6
56998- 2 2 6 2 2 6 2 2 6 2 2 6
56999- 2 2 6 2 2 6 2 2 6 2 2 6
57000- 6 6 6 54 54 54 86 86 86 66 66 66
57001- 38 38 38 18 18 18 6 6 6 0 0 0
57002- 0 0 0 0 0 0 0 0 0 0 0 0
57003- 0 0 0 0 0 0 0 0 0 0 0 0
57004- 0 0 0 0 0 0 0 0 0 0 0 0
57005- 0 0 0 0 0 0 0 0 0 0 0 0
57006- 0 0 0 0 0 0 0 0 0 0 0 0
57007- 0 0 0 0 0 0 0 0 0 0 0 0
57008- 0 0 0 0 0 0 0 0 0 0 0 0
57009- 0 0 0 0 0 0 0 0 0 0 0 0
57010- 0 0 0 0 0 0 0 0 0 0 0 0
57011- 0 0 0 0 0 0 0 0 0 0 0 0
57012- 0 0 0 0 0 0 0 0 0 0 0 0
57013- 0 0 0 0 0 0 0 0 0 0 0 0
57014- 0 0 0 0 0 0 0 0 0 0 0 0
57015- 0 0 0 0 0 0 0 0 0 0 0 0
57016- 0 0 0 6 6 6 22 22 22 50 50 50
57017- 78 78 78 34 34 34 2 2 6 2 2 6
57018- 2 2 6 2 2 6 2 2 6 2 2 6
57019- 2 2 6 2 2 6 2 2 6 2 2 6
57020- 2 2 6 2 2 6 6 6 6 70 70 70
57021- 78 78 78 46 46 46 22 22 22 6 6 6
57022- 0 0 0 0 0 0 0 0 0 0 0 0
57023- 0 0 0 0 0 0 0 0 0 0 0 0
57024- 0 0 0 0 0 0 0 0 0 0 0 0
57025- 0 0 0 0 0 0 0 0 0 0 0 0
57026- 0 0 0 0 0 0 0 0 0 0 0 0
57027- 0 0 0 0 0 0 0 0 0 0 0 0
57028- 0 0 0 0 0 0 0 0 0 0 0 0
57029- 0 0 0 0 0 0 0 0 0 0 0 0
57030- 0 0 1 0 0 1 0 0 1 0 0 0
57031- 0 0 0 0 0 0 0 0 0 0 0 0
57032- 0 0 0 0 0 0 0 0 0 0 0 0
57033- 0 0 0 0 0 0 0 0 0 0 0 0
57034- 0 0 0 0 0 0 0 0 0 0 0 0
57035- 0 0 0 0 0 0 0 0 0 0 0 0
57036- 6 6 6 18 18 18 42 42 42 82 82 82
57037- 26 26 26 2 2 6 2 2 6 2 2 6
57038- 2 2 6 2 2 6 2 2 6 2 2 6
57039- 2 2 6 2 2 6 2 2 6 14 14 14
57040- 46 46 46 34 34 34 6 6 6 2 2 6
57041- 42 42 42 78 78 78 42 42 42 18 18 18
57042- 6 6 6 0 0 0 0 0 0 0 0 0
57043- 0 0 0 0 0 0 0 0 0 0 0 0
57044- 0 0 0 0 0 0 0 0 0 0 0 0
57045- 0 0 0 0 0 0 0 0 0 0 0 0
57046- 0 0 0 0 0 0 0 0 0 0 0 0
57047- 0 0 0 0 0 0 0 0 0 0 0 0
57048- 0 0 0 0 0 0 0 0 0 0 0 0
57049- 0 0 0 0 0 0 0 0 0 0 0 0
57050- 0 0 1 0 0 0 0 0 1 0 0 0
57051- 0 0 0 0 0 0 0 0 0 0 0 0
57052- 0 0 0 0 0 0 0 0 0 0 0 0
57053- 0 0 0 0 0 0 0 0 0 0 0 0
57054- 0 0 0 0 0 0 0 0 0 0 0 0
57055- 0 0 0 0 0 0 0 0 0 0 0 0
57056- 10 10 10 30 30 30 66 66 66 58 58 58
57057- 2 2 6 2 2 6 2 2 6 2 2 6
57058- 2 2 6 2 2 6 2 2 6 2 2 6
57059- 2 2 6 2 2 6 2 2 6 26 26 26
57060- 86 86 86 101 101 101 46 46 46 10 10 10
57061- 2 2 6 58 58 58 70 70 70 34 34 34
57062- 10 10 10 0 0 0 0 0 0 0 0 0
57063- 0 0 0 0 0 0 0 0 0 0 0 0
57064- 0 0 0 0 0 0 0 0 0 0 0 0
57065- 0 0 0 0 0 0 0 0 0 0 0 0
57066- 0 0 0 0 0 0 0 0 0 0 0 0
57067- 0 0 0 0 0 0 0 0 0 0 0 0
57068- 0 0 0 0 0 0 0 0 0 0 0 0
57069- 0 0 0 0 0 0 0 0 0 0 0 0
57070- 0 0 1 0 0 1 0 0 1 0 0 0
57071- 0 0 0 0 0 0 0 0 0 0 0 0
57072- 0 0 0 0 0 0 0 0 0 0 0 0
57073- 0 0 0 0 0 0 0 0 0 0 0 0
57074- 0 0 0 0 0 0 0 0 0 0 0 0
57075- 0 0 0 0 0 0 0 0 0 0 0 0
57076- 14 14 14 42 42 42 86 86 86 10 10 10
57077- 2 2 6 2 2 6 2 2 6 2 2 6
57078- 2 2 6 2 2 6 2 2 6 2 2 6
57079- 2 2 6 2 2 6 2 2 6 30 30 30
57080- 94 94 94 94 94 94 58 58 58 26 26 26
57081- 2 2 6 6 6 6 78 78 78 54 54 54
57082- 22 22 22 6 6 6 0 0 0 0 0 0
57083- 0 0 0 0 0 0 0 0 0 0 0 0
57084- 0 0 0 0 0 0 0 0 0 0 0 0
57085- 0 0 0 0 0 0 0 0 0 0 0 0
57086- 0 0 0 0 0 0 0 0 0 0 0 0
57087- 0 0 0 0 0 0 0 0 0 0 0 0
57088- 0 0 0 0 0 0 0 0 0 0 0 0
57089- 0 0 0 0 0 0 0 0 0 0 0 0
57090- 0 0 0 0 0 0 0 0 0 0 0 0
57091- 0 0 0 0 0 0 0 0 0 0 0 0
57092- 0 0 0 0 0 0 0 0 0 0 0 0
57093- 0 0 0 0 0 0 0 0 0 0 0 0
57094- 0 0 0 0 0 0 0 0 0 0 0 0
57095- 0 0 0 0 0 0 0 0 0 6 6 6
57096- 22 22 22 62 62 62 62 62 62 2 2 6
57097- 2 2 6 2 2 6 2 2 6 2 2 6
57098- 2 2 6 2 2 6 2 2 6 2 2 6
57099- 2 2 6 2 2 6 2 2 6 26 26 26
57100- 54 54 54 38 38 38 18 18 18 10 10 10
57101- 2 2 6 2 2 6 34 34 34 82 82 82
57102- 38 38 38 14 14 14 0 0 0 0 0 0
57103- 0 0 0 0 0 0 0 0 0 0 0 0
57104- 0 0 0 0 0 0 0 0 0 0 0 0
57105- 0 0 0 0 0 0 0 0 0 0 0 0
57106- 0 0 0 0 0 0 0 0 0 0 0 0
57107- 0 0 0 0 0 0 0 0 0 0 0 0
57108- 0 0 0 0 0 0 0 0 0 0 0 0
57109- 0 0 0 0 0 0 0 0 0 0 0 0
57110- 0 0 0 0 0 1 0 0 1 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 6 6 6
57116- 30 30 30 78 78 78 30 30 30 2 2 6
57117- 2 2 6 2 2 6 2 2 6 2 2 6
57118- 2 2 6 2 2 6 2 2 6 2 2 6
57119- 2 2 6 2 2 6 2 2 6 10 10 10
57120- 10 10 10 2 2 6 2 2 6 2 2 6
57121- 2 2 6 2 2 6 2 2 6 78 78 78
57122- 50 50 50 18 18 18 6 6 6 0 0 0
57123- 0 0 0 0 0 0 0 0 0 0 0 0
57124- 0 0 0 0 0 0 0 0 0 0 0 0
57125- 0 0 0 0 0 0 0 0 0 0 0 0
57126- 0 0 0 0 0 0 0 0 0 0 0 0
57127- 0 0 0 0 0 0 0 0 0 0 0 0
57128- 0 0 0 0 0 0 0 0 0 0 0 0
57129- 0 0 0 0 0 0 0 0 0 0 0 0
57130- 0 0 1 0 0 0 0 0 0 0 0 0
57131- 0 0 0 0 0 0 0 0 0 0 0 0
57132- 0 0 0 0 0 0 0 0 0 0 0 0
57133- 0 0 0 0 0 0 0 0 0 0 0 0
57134- 0 0 0 0 0 0 0 0 0 0 0 0
57135- 0 0 0 0 0 0 0 0 0 10 10 10
57136- 38 38 38 86 86 86 14 14 14 2 2 6
57137- 2 2 6 2 2 6 2 2 6 2 2 6
57138- 2 2 6 2 2 6 2 2 6 2 2 6
57139- 2 2 6 2 2 6 2 2 6 2 2 6
57140- 2 2 6 2 2 6 2 2 6 2 2 6
57141- 2 2 6 2 2 6 2 2 6 54 54 54
57142- 66 66 66 26 26 26 6 6 6 0 0 0
57143- 0 0 0 0 0 0 0 0 0 0 0 0
57144- 0 0 0 0 0 0 0 0 0 0 0 0
57145- 0 0 0 0 0 0 0 0 0 0 0 0
57146- 0 0 0 0 0 0 0 0 0 0 0 0
57147- 0 0 0 0 0 0 0 0 0 0 0 0
57148- 0 0 0 0 0 0 0 0 0 0 0 0
57149- 0 0 0 0 0 0 0 0 0 0 0 0
57150- 0 0 0 0 0 1 0 0 1 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 14 14 14
57156- 42 42 42 82 82 82 2 2 6 2 2 6
57157- 2 2 6 6 6 6 10 10 10 2 2 6
57158- 2 2 6 2 2 6 2 2 6 2 2 6
57159- 2 2 6 2 2 6 2 2 6 6 6 6
57160- 14 14 14 10 10 10 2 2 6 2 2 6
57161- 2 2 6 2 2 6 2 2 6 18 18 18
57162- 82 82 82 34 34 34 10 10 10 0 0 0
57163- 0 0 0 0 0 0 0 0 0 0 0 0
57164- 0 0 0 0 0 0 0 0 0 0 0 0
57165- 0 0 0 0 0 0 0 0 0 0 0 0
57166- 0 0 0 0 0 0 0 0 0 0 0 0
57167- 0 0 0 0 0 0 0 0 0 0 0 0
57168- 0 0 0 0 0 0 0 0 0 0 0 0
57169- 0 0 0 0 0 0 0 0 0 0 0 0
57170- 0 0 1 0 0 0 0 0 0 0 0 0
57171- 0 0 0 0 0 0 0 0 0 0 0 0
57172- 0 0 0 0 0 0 0 0 0 0 0 0
57173- 0 0 0 0 0 0 0 0 0 0 0 0
57174- 0 0 0 0 0 0 0 0 0 0 0 0
57175- 0 0 0 0 0 0 0 0 0 14 14 14
57176- 46 46 46 86 86 86 2 2 6 2 2 6
57177- 6 6 6 6 6 6 22 22 22 34 34 34
57178- 6 6 6 2 2 6 2 2 6 2 2 6
57179- 2 2 6 2 2 6 18 18 18 34 34 34
57180- 10 10 10 50 50 50 22 22 22 2 2 6
57181- 2 2 6 2 2 6 2 2 6 10 10 10
57182- 86 86 86 42 42 42 14 14 14 0 0 0
57183- 0 0 0 0 0 0 0 0 0 0 0 0
57184- 0 0 0 0 0 0 0 0 0 0 0 0
57185- 0 0 0 0 0 0 0 0 0 0 0 0
57186- 0 0 0 0 0 0 0 0 0 0 0 0
57187- 0 0 0 0 0 0 0 0 0 0 0 0
57188- 0 0 0 0 0 0 0 0 0 0 0 0
57189- 0 0 0 0 0 0 0 0 0 0 0 0
57190- 0 0 1 0 0 1 0 0 1 0 0 0
57191- 0 0 0 0 0 0 0 0 0 0 0 0
57192- 0 0 0 0 0 0 0 0 0 0 0 0
57193- 0 0 0 0 0 0 0 0 0 0 0 0
57194- 0 0 0 0 0 0 0 0 0 0 0 0
57195- 0 0 0 0 0 0 0 0 0 14 14 14
57196- 46 46 46 86 86 86 2 2 6 2 2 6
57197- 38 38 38 116 116 116 94 94 94 22 22 22
57198- 22 22 22 2 2 6 2 2 6 2 2 6
57199- 14 14 14 86 86 86 138 138 138 162 162 162
57200-154 154 154 38 38 38 26 26 26 6 6 6
57201- 2 2 6 2 2 6 2 2 6 2 2 6
57202- 86 86 86 46 46 46 14 14 14 0 0 0
57203- 0 0 0 0 0 0 0 0 0 0 0 0
57204- 0 0 0 0 0 0 0 0 0 0 0 0
57205- 0 0 0 0 0 0 0 0 0 0 0 0
57206- 0 0 0 0 0 0 0 0 0 0 0 0
57207- 0 0 0 0 0 0 0 0 0 0 0 0
57208- 0 0 0 0 0 0 0 0 0 0 0 0
57209- 0 0 0 0 0 0 0 0 0 0 0 0
57210- 0 0 0 0 0 0 0 0 0 0 0 0
57211- 0 0 0 0 0 0 0 0 0 0 0 0
57212- 0 0 0 0 0 0 0 0 0 0 0 0
57213- 0 0 0 0 0 0 0 0 0 0 0 0
57214- 0 0 0 0 0 0 0 0 0 0 0 0
57215- 0 0 0 0 0 0 0 0 0 14 14 14
57216- 46 46 46 86 86 86 2 2 6 14 14 14
57217-134 134 134 198 198 198 195 195 195 116 116 116
57218- 10 10 10 2 2 6 2 2 6 6 6 6
57219-101 98 89 187 187 187 210 210 210 218 218 218
57220-214 214 214 134 134 134 14 14 14 6 6 6
57221- 2 2 6 2 2 6 2 2 6 2 2 6
57222- 86 86 86 50 50 50 18 18 18 6 6 6
57223- 0 0 0 0 0 0 0 0 0 0 0 0
57224- 0 0 0 0 0 0 0 0 0 0 0 0
57225- 0 0 0 0 0 0 0 0 0 0 0 0
57226- 0 0 0 0 0 0 0 0 0 0 0 0
57227- 0 0 0 0 0 0 0 0 0 0 0 0
57228- 0 0 0 0 0 0 0 0 0 0 0 0
57229- 0 0 0 0 0 0 0 0 1 0 0 0
57230- 0 0 1 0 0 1 0 0 1 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 14 14 14
57236- 46 46 46 86 86 86 2 2 6 54 54 54
57237-218 218 218 195 195 195 226 226 226 246 246 246
57238- 58 58 58 2 2 6 2 2 6 30 30 30
57239-210 210 210 253 253 253 174 174 174 123 123 123
57240-221 221 221 234 234 234 74 74 74 2 2 6
57241- 2 2 6 2 2 6 2 2 6 2 2 6
57242- 70 70 70 58 58 58 22 22 22 6 6 6
57243- 0 0 0 0 0 0 0 0 0 0 0 0
57244- 0 0 0 0 0 0 0 0 0 0 0 0
57245- 0 0 0 0 0 0 0 0 0 0 0 0
57246- 0 0 0 0 0 0 0 0 0 0 0 0
57247- 0 0 0 0 0 0 0 0 0 0 0 0
57248- 0 0 0 0 0 0 0 0 0 0 0 0
57249- 0 0 0 0 0 0 0 0 0 0 0 0
57250- 0 0 0 0 0 0 0 0 0 0 0 0
57251- 0 0 0 0 0 0 0 0 0 0 0 0
57252- 0 0 0 0 0 0 0 0 0 0 0 0
57253- 0 0 0 0 0 0 0 0 0 0 0 0
57254- 0 0 0 0 0 0 0 0 0 0 0 0
57255- 0 0 0 0 0 0 0 0 0 14 14 14
57256- 46 46 46 82 82 82 2 2 6 106 106 106
57257-170 170 170 26 26 26 86 86 86 226 226 226
57258-123 123 123 10 10 10 14 14 14 46 46 46
57259-231 231 231 190 190 190 6 6 6 70 70 70
57260- 90 90 90 238 238 238 158 158 158 2 2 6
57261- 2 2 6 2 2 6 2 2 6 2 2 6
57262- 70 70 70 58 58 58 22 22 22 6 6 6
57263- 0 0 0 0 0 0 0 0 0 0 0 0
57264- 0 0 0 0 0 0 0 0 0 0 0 0
57265- 0 0 0 0 0 0 0 0 0 0 0 0
57266- 0 0 0 0 0 0 0 0 0 0 0 0
57267- 0 0 0 0 0 0 0 0 0 0 0 0
57268- 0 0 0 0 0 0 0 0 0 0 0 0
57269- 0 0 0 0 0 0 0 0 1 0 0 0
57270- 0 0 1 0 0 1 0 0 1 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 14 14 14
57276- 42 42 42 86 86 86 6 6 6 116 116 116
57277-106 106 106 6 6 6 70 70 70 149 149 149
57278-128 128 128 18 18 18 38 38 38 54 54 54
57279-221 221 221 106 106 106 2 2 6 14 14 14
57280- 46 46 46 190 190 190 198 198 198 2 2 6
57281- 2 2 6 2 2 6 2 2 6 2 2 6
57282- 74 74 74 62 62 62 22 22 22 6 6 6
57283- 0 0 0 0 0 0 0 0 0 0 0 0
57284- 0 0 0 0 0 0 0 0 0 0 0 0
57285- 0 0 0 0 0 0 0 0 0 0 0 0
57286- 0 0 0 0 0 0 0 0 0 0 0 0
57287- 0 0 0 0 0 0 0 0 0 0 0 0
57288- 0 0 0 0 0 0 0 0 0 0 0 0
57289- 0 0 0 0 0 0 0 0 1 0 0 0
57290- 0 0 1 0 0 0 0 0 1 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 14 14 14
57296- 42 42 42 94 94 94 14 14 14 101 101 101
57297-128 128 128 2 2 6 18 18 18 116 116 116
57298-118 98 46 121 92 8 121 92 8 98 78 10
57299-162 162 162 106 106 106 2 2 6 2 2 6
57300- 2 2 6 195 195 195 195 195 195 6 6 6
57301- 2 2 6 2 2 6 2 2 6 2 2 6
57302- 74 74 74 62 62 62 22 22 22 6 6 6
57303- 0 0 0 0 0 0 0 0 0 0 0 0
57304- 0 0 0 0 0 0 0 0 0 0 0 0
57305- 0 0 0 0 0 0 0 0 0 0 0 0
57306- 0 0 0 0 0 0 0 0 0 0 0 0
57307- 0 0 0 0 0 0 0 0 0 0 0 0
57308- 0 0 0 0 0 0 0 0 0 0 0 0
57309- 0 0 0 0 0 0 0 0 1 0 0 1
57310- 0 0 1 0 0 0 0 0 1 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 10 10 10
57316- 38 38 38 90 90 90 14 14 14 58 58 58
57317-210 210 210 26 26 26 54 38 6 154 114 10
57318-226 170 11 236 186 11 225 175 15 184 144 12
57319-215 174 15 175 146 61 37 26 9 2 2 6
57320- 70 70 70 246 246 246 138 138 138 2 2 6
57321- 2 2 6 2 2 6 2 2 6 2 2 6
57322- 70 70 70 66 66 66 26 26 26 6 6 6
57323- 0 0 0 0 0 0 0 0 0 0 0 0
57324- 0 0 0 0 0 0 0 0 0 0 0 0
57325- 0 0 0 0 0 0 0 0 0 0 0 0
57326- 0 0 0 0 0 0 0 0 0 0 0 0
57327- 0 0 0 0 0 0 0 0 0 0 0 0
57328- 0 0 0 0 0 0 0 0 0 0 0 0
57329- 0 0 0 0 0 0 0 0 0 0 0 0
57330- 0 0 0 0 0 0 0 0 0 0 0 0
57331- 0 0 0 0 0 0 0 0 0 0 0 0
57332- 0 0 0 0 0 0 0 0 0 0 0 0
57333- 0 0 0 0 0 0 0 0 0 0 0 0
57334- 0 0 0 0 0 0 0 0 0 0 0 0
57335- 0 0 0 0 0 0 0 0 0 10 10 10
57336- 38 38 38 86 86 86 14 14 14 10 10 10
57337-195 195 195 188 164 115 192 133 9 225 175 15
57338-239 182 13 234 190 10 232 195 16 232 200 30
57339-245 207 45 241 208 19 232 195 16 184 144 12
57340-218 194 134 211 206 186 42 42 42 2 2 6
57341- 2 2 6 2 2 6 2 2 6 2 2 6
57342- 50 50 50 74 74 74 30 30 30 6 6 6
57343- 0 0 0 0 0 0 0 0 0 0 0 0
57344- 0 0 0 0 0 0 0 0 0 0 0 0
57345- 0 0 0 0 0 0 0 0 0 0 0 0
57346- 0 0 0 0 0 0 0 0 0 0 0 0
57347- 0 0 0 0 0 0 0 0 0 0 0 0
57348- 0 0 0 0 0 0 0 0 0 0 0 0
57349- 0 0 0 0 0 0 0 0 0 0 0 0
57350- 0 0 0 0 0 0 0 0 0 0 0 0
57351- 0 0 0 0 0 0 0 0 0 0 0 0
57352- 0 0 0 0 0 0 0 0 0 0 0 0
57353- 0 0 0 0 0 0 0 0 0 0 0 0
57354- 0 0 0 0 0 0 0 0 0 0 0 0
57355- 0 0 0 0 0 0 0 0 0 10 10 10
57356- 34 34 34 86 86 86 14 14 14 2 2 6
57357-121 87 25 192 133 9 219 162 10 239 182 13
57358-236 186 11 232 195 16 241 208 19 244 214 54
57359-246 218 60 246 218 38 246 215 20 241 208 19
57360-241 208 19 226 184 13 121 87 25 2 2 6
57361- 2 2 6 2 2 6 2 2 6 2 2 6
57362- 50 50 50 82 82 82 34 34 34 10 10 10
57363- 0 0 0 0 0 0 0 0 0 0 0 0
57364- 0 0 0 0 0 0 0 0 0 0 0 0
57365- 0 0 0 0 0 0 0 0 0 0 0 0
57366- 0 0 0 0 0 0 0 0 0 0 0 0
57367- 0 0 0 0 0 0 0 0 0 0 0 0
57368- 0 0 0 0 0 0 0 0 0 0 0 0
57369- 0 0 0 0 0 0 0 0 0 0 0 0
57370- 0 0 0 0 0 0 0 0 0 0 0 0
57371- 0 0 0 0 0 0 0 0 0 0 0 0
57372- 0 0 0 0 0 0 0 0 0 0 0 0
57373- 0 0 0 0 0 0 0 0 0 0 0 0
57374- 0 0 0 0 0 0 0 0 0 0 0 0
57375- 0 0 0 0 0 0 0 0 0 10 10 10
57376- 34 34 34 82 82 82 30 30 30 61 42 6
57377-180 123 7 206 145 10 230 174 11 239 182 13
57378-234 190 10 238 202 15 241 208 19 246 218 74
57379-246 218 38 246 215 20 246 215 20 246 215 20
57380-226 184 13 215 174 15 184 144 12 6 6 6
57381- 2 2 6 2 2 6 2 2 6 2 2 6
57382- 26 26 26 94 94 94 42 42 42 14 14 14
57383- 0 0 0 0 0 0 0 0 0 0 0 0
57384- 0 0 0 0 0 0 0 0 0 0 0 0
57385- 0 0 0 0 0 0 0 0 0 0 0 0
57386- 0 0 0 0 0 0 0 0 0 0 0 0
57387- 0 0 0 0 0 0 0 0 0 0 0 0
57388- 0 0 0 0 0 0 0 0 0 0 0 0
57389- 0 0 0 0 0 0 0 0 0 0 0 0
57390- 0 0 0 0 0 0 0 0 0 0 0 0
57391- 0 0 0 0 0 0 0 0 0 0 0 0
57392- 0 0 0 0 0 0 0 0 0 0 0 0
57393- 0 0 0 0 0 0 0 0 0 0 0 0
57394- 0 0 0 0 0 0 0 0 0 0 0 0
57395- 0 0 0 0 0 0 0 0 0 10 10 10
57396- 30 30 30 78 78 78 50 50 50 104 69 6
57397-192 133 9 216 158 10 236 178 12 236 186 11
57398-232 195 16 241 208 19 244 214 54 245 215 43
57399-246 215 20 246 215 20 241 208 19 198 155 10
57400-200 144 11 216 158 10 156 118 10 2 2 6
57401- 2 2 6 2 2 6 2 2 6 2 2 6
57402- 6 6 6 90 90 90 54 54 54 18 18 18
57403- 6 6 6 0 0 0 0 0 0 0 0 0
57404- 0 0 0 0 0 0 0 0 0 0 0 0
57405- 0 0 0 0 0 0 0 0 0 0 0 0
57406- 0 0 0 0 0 0 0 0 0 0 0 0
57407- 0 0 0 0 0 0 0 0 0 0 0 0
57408- 0 0 0 0 0 0 0 0 0 0 0 0
57409- 0 0 0 0 0 0 0 0 0 0 0 0
57410- 0 0 0 0 0 0 0 0 0 0 0 0
57411- 0 0 0 0 0 0 0 0 0 0 0 0
57412- 0 0 0 0 0 0 0 0 0 0 0 0
57413- 0 0 0 0 0 0 0 0 0 0 0 0
57414- 0 0 0 0 0 0 0 0 0 0 0 0
57415- 0 0 0 0 0 0 0 0 0 10 10 10
57416- 30 30 30 78 78 78 46 46 46 22 22 22
57417-137 92 6 210 162 10 239 182 13 238 190 10
57418-238 202 15 241 208 19 246 215 20 246 215 20
57419-241 208 19 203 166 17 185 133 11 210 150 10
57420-216 158 10 210 150 10 102 78 10 2 2 6
57421- 6 6 6 54 54 54 14 14 14 2 2 6
57422- 2 2 6 62 62 62 74 74 74 30 30 30
57423- 10 10 10 0 0 0 0 0 0 0 0 0
57424- 0 0 0 0 0 0 0 0 0 0 0 0
57425- 0 0 0 0 0 0 0 0 0 0 0 0
57426- 0 0 0 0 0 0 0 0 0 0 0 0
57427- 0 0 0 0 0 0 0 0 0 0 0 0
57428- 0 0 0 0 0 0 0 0 0 0 0 0
57429- 0 0 0 0 0 0 0 0 0 0 0 0
57430- 0 0 0 0 0 0 0 0 0 0 0 0
57431- 0 0 0 0 0 0 0 0 0 0 0 0
57432- 0 0 0 0 0 0 0 0 0 0 0 0
57433- 0 0 0 0 0 0 0 0 0 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 10 10 10
57436- 34 34 34 78 78 78 50 50 50 6 6 6
57437- 94 70 30 139 102 15 190 146 13 226 184 13
57438-232 200 30 232 195 16 215 174 15 190 146 13
57439-168 122 10 192 133 9 210 150 10 213 154 11
57440-202 150 34 182 157 106 101 98 89 2 2 6
57441- 2 2 6 78 78 78 116 116 116 58 58 58
57442- 2 2 6 22 22 22 90 90 90 46 46 46
57443- 18 18 18 6 6 6 0 0 0 0 0 0
57444- 0 0 0 0 0 0 0 0 0 0 0 0
57445- 0 0 0 0 0 0 0 0 0 0 0 0
57446- 0 0 0 0 0 0 0 0 0 0 0 0
57447- 0 0 0 0 0 0 0 0 0 0 0 0
57448- 0 0 0 0 0 0 0 0 0 0 0 0
57449- 0 0 0 0 0 0 0 0 0 0 0 0
57450- 0 0 0 0 0 0 0 0 0 0 0 0
57451- 0 0 0 0 0 0 0 0 0 0 0 0
57452- 0 0 0 0 0 0 0 0 0 0 0 0
57453- 0 0 0 0 0 0 0 0 0 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 10 10 10
57456- 38 38 38 86 86 86 50 50 50 6 6 6
57457-128 128 128 174 154 114 156 107 11 168 122 10
57458-198 155 10 184 144 12 197 138 11 200 144 11
57459-206 145 10 206 145 10 197 138 11 188 164 115
57460-195 195 195 198 198 198 174 174 174 14 14 14
57461- 2 2 6 22 22 22 116 116 116 116 116 116
57462- 22 22 22 2 2 6 74 74 74 70 70 70
57463- 30 30 30 10 10 10 0 0 0 0 0 0
57464- 0 0 0 0 0 0 0 0 0 0 0 0
57465- 0 0 0 0 0 0 0 0 0 0 0 0
57466- 0 0 0 0 0 0 0 0 0 0 0 0
57467- 0 0 0 0 0 0 0 0 0 0 0 0
57468- 0 0 0 0 0 0 0 0 0 0 0 0
57469- 0 0 0 0 0 0 0 0 0 0 0 0
57470- 0 0 0 0 0 0 0 0 0 0 0 0
57471- 0 0 0 0 0 0 0 0 0 0 0 0
57472- 0 0 0 0 0 0 0 0 0 0 0 0
57473- 0 0 0 0 0 0 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 6 6 6 18 18 18
57476- 50 50 50 101 101 101 26 26 26 10 10 10
57477-138 138 138 190 190 190 174 154 114 156 107 11
57478-197 138 11 200 144 11 197 138 11 192 133 9
57479-180 123 7 190 142 34 190 178 144 187 187 187
57480-202 202 202 221 221 221 214 214 214 66 66 66
57481- 2 2 6 2 2 6 50 50 50 62 62 62
57482- 6 6 6 2 2 6 10 10 10 90 90 90
57483- 50 50 50 18 18 18 6 6 6 0 0 0
57484- 0 0 0 0 0 0 0 0 0 0 0 0
57485- 0 0 0 0 0 0 0 0 0 0 0 0
57486- 0 0 0 0 0 0 0 0 0 0 0 0
57487- 0 0 0 0 0 0 0 0 0 0 0 0
57488- 0 0 0 0 0 0 0 0 0 0 0 0
57489- 0 0 0 0 0 0 0 0 0 0 0 0
57490- 0 0 0 0 0 0 0 0 0 0 0 0
57491- 0 0 0 0 0 0 0 0 0 0 0 0
57492- 0 0 0 0 0 0 0 0 0 0 0 0
57493- 0 0 0 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 10 10 10 34 34 34
57496- 74 74 74 74 74 74 2 2 6 6 6 6
57497-144 144 144 198 198 198 190 190 190 178 166 146
57498-154 121 60 156 107 11 156 107 11 168 124 44
57499-174 154 114 187 187 187 190 190 190 210 210 210
57500-246 246 246 253 253 253 253 253 253 182 182 182
57501- 6 6 6 2 2 6 2 2 6 2 2 6
57502- 2 2 6 2 2 6 2 2 6 62 62 62
57503- 74 74 74 34 34 34 14 14 14 0 0 0
57504- 0 0 0 0 0 0 0 0 0 0 0 0
57505- 0 0 0 0 0 0 0 0 0 0 0 0
57506- 0 0 0 0 0 0 0 0 0 0 0 0
57507- 0 0 0 0 0 0 0 0 0 0 0 0
57508- 0 0 0 0 0 0 0 0 0 0 0 0
57509- 0 0 0 0 0 0 0 0 0 0 0 0
57510- 0 0 0 0 0 0 0 0 0 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 10 10 10 22 22 22 54 54 54
57516- 94 94 94 18 18 18 2 2 6 46 46 46
57517-234 234 234 221 221 221 190 190 190 190 190 190
57518-190 190 190 187 187 187 187 187 187 190 190 190
57519-190 190 190 195 195 195 214 214 214 242 242 242
57520-253 253 253 253 253 253 253 253 253 253 253 253
57521- 82 82 82 2 2 6 2 2 6 2 2 6
57522- 2 2 6 2 2 6 2 2 6 14 14 14
57523- 86 86 86 54 54 54 22 22 22 6 6 6
57524- 0 0 0 0 0 0 0 0 0 0 0 0
57525- 0 0 0 0 0 0 0 0 0 0 0 0
57526- 0 0 0 0 0 0 0 0 0 0 0 0
57527- 0 0 0 0 0 0 0 0 0 0 0 0
57528- 0 0 0 0 0 0 0 0 0 0 0 0
57529- 0 0 0 0 0 0 0 0 0 0 0 0
57530- 0 0 0 0 0 0 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- 6 6 6 18 18 18 46 46 46 90 90 90
57536- 46 46 46 18 18 18 6 6 6 182 182 182
57537-253 253 253 246 246 246 206 206 206 190 190 190
57538-190 190 190 190 190 190 190 190 190 190 190 190
57539-206 206 206 231 231 231 250 250 250 253 253 253
57540-253 253 253 253 253 253 253 253 253 253 253 253
57541-202 202 202 14 14 14 2 2 6 2 2 6
57542- 2 2 6 2 2 6 2 2 6 2 2 6
57543- 42 42 42 86 86 86 42 42 42 18 18 18
57544- 6 6 6 0 0 0 0 0 0 0 0 0
57545- 0 0 0 0 0 0 0 0 0 0 0 0
57546- 0 0 0 0 0 0 0 0 0 0 0 0
57547- 0 0 0 0 0 0 0 0 0 0 0 0
57548- 0 0 0 0 0 0 0 0 0 0 0 0
57549- 0 0 0 0 0 0 0 0 0 0 0 0
57550- 0 0 0 0 0 0 0 0 0 0 0 0
57551- 0 0 0 0 0 0 0 0 0 0 0 0
57552- 0 0 0 0 0 0 0 0 0 0 0 0
57553- 0 0 0 0 0 0 0 0 0 0 0 0
57554- 0 0 0 0 0 0 0 0 0 6 6 6
57555- 14 14 14 38 38 38 74 74 74 66 66 66
57556- 2 2 6 6 6 6 90 90 90 250 250 250
57557-253 253 253 253 253 253 238 238 238 198 198 198
57558-190 190 190 190 190 190 195 195 195 221 221 221
57559-246 246 246 253 253 253 253 253 253 253 253 253
57560-253 253 253 253 253 253 253 253 253 253 253 253
57561-253 253 253 82 82 82 2 2 6 2 2 6
57562- 2 2 6 2 2 6 2 2 6 2 2 6
57563- 2 2 6 78 78 78 70 70 70 34 34 34
57564- 14 14 14 6 6 6 0 0 0 0 0 0
57565- 0 0 0 0 0 0 0 0 0 0 0 0
57566- 0 0 0 0 0 0 0 0 0 0 0 0
57567- 0 0 0 0 0 0 0 0 0 0 0 0
57568- 0 0 0 0 0 0 0 0 0 0 0 0
57569- 0 0 0 0 0 0 0 0 0 0 0 0
57570- 0 0 0 0 0 0 0 0 0 0 0 0
57571- 0 0 0 0 0 0 0 0 0 0 0 0
57572- 0 0 0 0 0 0 0 0 0 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 14 14 14
57575- 34 34 34 66 66 66 78 78 78 6 6 6
57576- 2 2 6 18 18 18 218 218 218 253 253 253
57577-253 253 253 253 253 253 253 253 253 246 246 246
57578-226 226 226 231 231 231 246 246 246 253 253 253
57579-253 253 253 253 253 253 253 253 253 253 253 253
57580-253 253 253 253 253 253 253 253 253 253 253 253
57581-253 253 253 178 178 178 2 2 6 2 2 6
57582- 2 2 6 2 2 6 2 2 6 2 2 6
57583- 2 2 6 18 18 18 90 90 90 62 62 62
57584- 30 30 30 10 10 10 0 0 0 0 0 0
57585- 0 0 0 0 0 0 0 0 0 0 0 0
57586- 0 0 0 0 0 0 0 0 0 0 0 0
57587- 0 0 0 0 0 0 0 0 0 0 0 0
57588- 0 0 0 0 0 0 0 0 0 0 0 0
57589- 0 0 0 0 0 0 0 0 0 0 0 0
57590- 0 0 0 0 0 0 0 0 0 0 0 0
57591- 0 0 0 0 0 0 0 0 0 0 0 0
57592- 0 0 0 0 0 0 0 0 0 0 0 0
57593- 0 0 0 0 0 0 0 0 0 0 0 0
57594- 0 0 0 0 0 0 10 10 10 26 26 26
57595- 58 58 58 90 90 90 18 18 18 2 2 6
57596- 2 2 6 110 110 110 253 253 253 253 253 253
57597-253 253 253 253 253 253 253 253 253 253 253 253
57598-250 250 250 253 253 253 253 253 253 253 253 253
57599-253 253 253 253 253 253 253 253 253 253 253 253
57600-253 253 253 253 253 253 253 253 253 253 253 253
57601-253 253 253 231 231 231 18 18 18 2 2 6
57602- 2 2 6 2 2 6 2 2 6 2 2 6
57603- 2 2 6 2 2 6 18 18 18 94 94 94
57604- 54 54 54 26 26 26 10 10 10 0 0 0
57605- 0 0 0 0 0 0 0 0 0 0 0 0
57606- 0 0 0 0 0 0 0 0 0 0 0 0
57607- 0 0 0 0 0 0 0 0 0 0 0 0
57608- 0 0 0 0 0 0 0 0 0 0 0 0
57609- 0 0 0 0 0 0 0 0 0 0 0 0
57610- 0 0 0 0 0 0 0 0 0 0 0 0
57611- 0 0 0 0 0 0 0 0 0 0 0 0
57612- 0 0 0 0 0 0 0 0 0 0 0 0
57613- 0 0 0 0 0 0 0 0 0 0 0 0
57614- 0 0 0 6 6 6 22 22 22 50 50 50
57615- 90 90 90 26 26 26 2 2 6 2 2 6
57616- 14 14 14 195 195 195 250 250 250 253 253 253
57617-253 253 253 253 253 253 253 253 253 253 253 253
57618-253 253 253 253 253 253 253 253 253 253 253 253
57619-253 253 253 253 253 253 253 253 253 253 253 253
57620-253 253 253 253 253 253 253 253 253 253 253 253
57621-250 250 250 242 242 242 54 54 54 2 2 6
57622- 2 2 6 2 2 6 2 2 6 2 2 6
57623- 2 2 6 2 2 6 2 2 6 38 38 38
57624- 86 86 86 50 50 50 22 22 22 6 6 6
57625- 0 0 0 0 0 0 0 0 0 0 0 0
57626- 0 0 0 0 0 0 0 0 0 0 0 0
57627- 0 0 0 0 0 0 0 0 0 0 0 0
57628- 0 0 0 0 0 0 0 0 0 0 0 0
57629- 0 0 0 0 0 0 0 0 0 0 0 0
57630- 0 0 0 0 0 0 0 0 0 0 0 0
57631- 0 0 0 0 0 0 0 0 0 0 0 0
57632- 0 0 0 0 0 0 0 0 0 0 0 0
57633- 0 0 0 0 0 0 0 0 0 0 0 0
57634- 6 6 6 14 14 14 38 38 38 82 82 82
57635- 34 34 34 2 2 6 2 2 6 2 2 6
57636- 42 42 42 195 195 195 246 246 246 253 253 253
57637-253 253 253 253 253 253 253 253 253 250 250 250
57638-242 242 242 242 242 242 250 250 250 253 253 253
57639-253 253 253 253 253 253 253 253 253 253 253 253
57640-253 253 253 250 250 250 246 246 246 238 238 238
57641-226 226 226 231 231 231 101 101 101 6 6 6
57642- 2 2 6 2 2 6 2 2 6 2 2 6
57643- 2 2 6 2 2 6 2 2 6 2 2 6
57644- 38 38 38 82 82 82 42 42 42 14 14 14
57645- 6 6 6 0 0 0 0 0 0 0 0 0
57646- 0 0 0 0 0 0 0 0 0 0 0 0
57647- 0 0 0 0 0 0 0 0 0 0 0 0
57648- 0 0 0 0 0 0 0 0 0 0 0 0
57649- 0 0 0 0 0 0 0 0 0 0 0 0
57650- 0 0 0 0 0 0 0 0 0 0 0 0
57651- 0 0 0 0 0 0 0 0 0 0 0 0
57652- 0 0 0 0 0 0 0 0 0 0 0 0
57653- 0 0 0 0 0 0 0 0 0 0 0 0
57654- 10 10 10 26 26 26 62 62 62 66 66 66
57655- 2 2 6 2 2 6 2 2 6 6 6 6
57656- 70 70 70 170 170 170 206 206 206 234 234 234
57657-246 246 246 250 250 250 250 250 250 238 238 238
57658-226 226 226 231 231 231 238 238 238 250 250 250
57659-250 250 250 250 250 250 246 246 246 231 231 231
57660-214 214 214 206 206 206 202 202 202 202 202 202
57661-198 198 198 202 202 202 182 182 182 18 18 18
57662- 2 2 6 2 2 6 2 2 6 2 2 6
57663- 2 2 6 2 2 6 2 2 6 2 2 6
57664- 2 2 6 62 62 62 66 66 66 30 30 30
57665- 10 10 10 0 0 0 0 0 0 0 0 0
57666- 0 0 0 0 0 0 0 0 0 0 0 0
57667- 0 0 0 0 0 0 0 0 0 0 0 0
57668- 0 0 0 0 0 0 0 0 0 0 0 0
57669- 0 0 0 0 0 0 0 0 0 0 0 0
57670- 0 0 0 0 0 0 0 0 0 0 0 0
57671- 0 0 0 0 0 0 0 0 0 0 0 0
57672- 0 0 0 0 0 0 0 0 0 0 0 0
57673- 0 0 0 0 0 0 0 0 0 0 0 0
57674- 14 14 14 42 42 42 82 82 82 18 18 18
57675- 2 2 6 2 2 6 2 2 6 10 10 10
57676- 94 94 94 182 182 182 218 218 218 242 242 242
57677-250 250 250 253 253 253 253 253 253 250 250 250
57678-234 234 234 253 253 253 253 253 253 253 253 253
57679-253 253 253 253 253 253 253 253 253 246 246 246
57680-238 238 238 226 226 226 210 210 210 202 202 202
57681-195 195 195 195 195 195 210 210 210 158 158 158
57682- 6 6 6 14 14 14 50 50 50 14 14 14
57683- 2 2 6 2 2 6 2 2 6 2 2 6
57684- 2 2 6 6 6 6 86 86 86 46 46 46
57685- 18 18 18 6 6 6 0 0 0 0 0 0
57686- 0 0 0 0 0 0 0 0 0 0 0 0
57687- 0 0 0 0 0 0 0 0 0 0 0 0
57688- 0 0 0 0 0 0 0 0 0 0 0 0
57689- 0 0 0 0 0 0 0 0 0 0 0 0
57690- 0 0 0 0 0 0 0 0 0 0 0 0
57691- 0 0 0 0 0 0 0 0 0 0 0 0
57692- 0 0 0 0 0 0 0 0 0 0 0 0
57693- 0 0 0 0 0 0 0 0 0 6 6 6
57694- 22 22 22 54 54 54 70 70 70 2 2 6
57695- 2 2 6 10 10 10 2 2 6 22 22 22
57696-166 166 166 231 231 231 250 250 250 253 253 253
57697-253 253 253 253 253 253 253 253 253 250 250 250
57698-242 242 242 253 253 253 253 253 253 253 253 253
57699-253 253 253 253 253 253 253 253 253 253 253 253
57700-253 253 253 253 253 253 253 253 253 246 246 246
57701-231 231 231 206 206 206 198 198 198 226 226 226
57702- 94 94 94 2 2 6 6 6 6 38 38 38
57703- 30 30 30 2 2 6 2 2 6 2 2 6
57704- 2 2 6 2 2 6 62 62 62 66 66 66
57705- 26 26 26 10 10 10 0 0 0 0 0 0
57706- 0 0 0 0 0 0 0 0 0 0 0 0
57707- 0 0 0 0 0 0 0 0 0 0 0 0
57708- 0 0 0 0 0 0 0 0 0 0 0 0
57709- 0 0 0 0 0 0 0 0 0 0 0 0
57710- 0 0 0 0 0 0 0 0 0 0 0 0
57711- 0 0 0 0 0 0 0 0 0 0 0 0
57712- 0 0 0 0 0 0 0 0 0 0 0 0
57713- 0 0 0 0 0 0 0 0 0 10 10 10
57714- 30 30 30 74 74 74 50 50 50 2 2 6
57715- 26 26 26 26 26 26 2 2 6 106 106 106
57716-238 238 238 253 253 253 253 253 253 253 253 253
57717-253 253 253 253 253 253 253 253 253 253 253 253
57718-253 253 253 253 253 253 253 253 253 253 253 253
57719-253 253 253 253 253 253 253 253 253 253 253 253
57720-253 253 253 253 253 253 253 253 253 253 253 253
57721-253 253 253 246 246 246 218 218 218 202 202 202
57722-210 210 210 14 14 14 2 2 6 2 2 6
57723- 30 30 30 22 22 22 2 2 6 2 2 6
57724- 2 2 6 2 2 6 18 18 18 86 86 86
57725- 42 42 42 14 14 14 0 0 0 0 0 0
57726- 0 0 0 0 0 0 0 0 0 0 0 0
57727- 0 0 0 0 0 0 0 0 0 0 0 0
57728- 0 0 0 0 0 0 0 0 0 0 0 0
57729- 0 0 0 0 0 0 0 0 0 0 0 0
57730- 0 0 0 0 0 0 0 0 0 0 0 0
57731- 0 0 0 0 0 0 0 0 0 0 0 0
57732- 0 0 0 0 0 0 0 0 0 0 0 0
57733- 0 0 0 0 0 0 0 0 0 14 14 14
57734- 42 42 42 90 90 90 22 22 22 2 2 6
57735- 42 42 42 2 2 6 18 18 18 218 218 218
57736-253 253 253 253 253 253 253 253 253 253 253 253
57737-253 253 253 253 253 253 253 253 253 253 253 253
57738-253 253 253 253 253 253 253 253 253 253 253 253
57739-253 253 253 253 253 253 253 253 253 253 253 253
57740-253 253 253 253 253 253 253 253 253 253 253 253
57741-253 253 253 253 253 253 250 250 250 221 221 221
57742-218 218 218 101 101 101 2 2 6 14 14 14
57743- 18 18 18 38 38 38 10 10 10 2 2 6
57744- 2 2 6 2 2 6 2 2 6 78 78 78
57745- 58 58 58 22 22 22 6 6 6 0 0 0
57746- 0 0 0 0 0 0 0 0 0 0 0 0
57747- 0 0 0 0 0 0 0 0 0 0 0 0
57748- 0 0 0 0 0 0 0 0 0 0 0 0
57749- 0 0 0 0 0 0 0 0 0 0 0 0
57750- 0 0 0 0 0 0 0 0 0 0 0 0
57751- 0 0 0 0 0 0 0 0 0 0 0 0
57752- 0 0 0 0 0 0 0 0 0 0 0 0
57753- 0 0 0 0 0 0 6 6 6 18 18 18
57754- 54 54 54 82 82 82 2 2 6 26 26 26
57755- 22 22 22 2 2 6 123 123 123 253 253 253
57756-253 253 253 253 253 253 253 253 253 253 253 253
57757-253 253 253 253 253 253 253 253 253 253 253 253
57758-253 253 253 253 253 253 253 253 253 253 253 253
57759-253 253 253 253 253 253 253 253 253 253 253 253
57760-253 253 253 253 253 253 253 253 253 253 253 253
57761-253 253 253 253 253 253 253 253 253 250 250 250
57762-238 238 238 198 198 198 6 6 6 38 38 38
57763- 58 58 58 26 26 26 38 38 38 2 2 6
57764- 2 2 6 2 2 6 2 2 6 46 46 46
57765- 78 78 78 30 30 30 10 10 10 0 0 0
57766- 0 0 0 0 0 0 0 0 0 0 0 0
57767- 0 0 0 0 0 0 0 0 0 0 0 0
57768- 0 0 0 0 0 0 0 0 0 0 0 0
57769- 0 0 0 0 0 0 0 0 0 0 0 0
57770- 0 0 0 0 0 0 0 0 0 0 0 0
57771- 0 0 0 0 0 0 0 0 0 0 0 0
57772- 0 0 0 0 0 0 0 0 0 0 0 0
57773- 0 0 0 0 0 0 10 10 10 30 30 30
57774- 74 74 74 58 58 58 2 2 6 42 42 42
57775- 2 2 6 22 22 22 231 231 231 253 253 253
57776-253 253 253 253 253 253 253 253 253 253 253 253
57777-253 253 253 253 253 253 253 253 253 250 250 250
57778-253 253 253 253 253 253 253 253 253 253 253 253
57779-253 253 253 253 253 253 253 253 253 253 253 253
57780-253 253 253 253 253 253 253 253 253 253 253 253
57781-253 253 253 253 253 253 253 253 253 253 253 253
57782-253 253 253 246 246 246 46 46 46 38 38 38
57783- 42 42 42 14 14 14 38 38 38 14 14 14
57784- 2 2 6 2 2 6 2 2 6 6 6 6
57785- 86 86 86 46 46 46 14 14 14 0 0 0
57786- 0 0 0 0 0 0 0 0 0 0 0 0
57787- 0 0 0 0 0 0 0 0 0 0 0 0
57788- 0 0 0 0 0 0 0 0 0 0 0 0
57789- 0 0 0 0 0 0 0 0 0 0 0 0
57790- 0 0 0 0 0 0 0 0 0 0 0 0
57791- 0 0 0 0 0 0 0 0 0 0 0 0
57792- 0 0 0 0 0 0 0 0 0 0 0 0
57793- 0 0 0 6 6 6 14 14 14 42 42 42
57794- 90 90 90 18 18 18 18 18 18 26 26 26
57795- 2 2 6 116 116 116 253 253 253 253 253 253
57796-253 253 253 253 253 253 253 253 253 253 253 253
57797-253 253 253 253 253 253 250 250 250 238 238 238
57798-253 253 253 253 253 253 253 253 253 253 253 253
57799-253 253 253 253 253 253 253 253 253 253 253 253
57800-253 253 253 253 253 253 253 253 253 253 253 253
57801-253 253 253 253 253 253 253 253 253 253 253 253
57802-253 253 253 253 253 253 94 94 94 6 6 6
57803- 2 2 6 2 2 6 10 10 10 34 34 34
57804- 2 2 6 2 2 6 2 2 6 2 2 6
57805- 74 74 74 58 58 58 22 22 22 6 6 6
57806- 0 0 0 0 0 0 0 0 0 0 0 0
57807- 0 0 0 0 0 0 0 0 0 0 0 0
57808- 0 0 0 0 0 0 0 0 0 0 0 0
57809- 0 0 0 0 0 0 0 0 0 0 0 0
57810- 0 0 0 0 0 0 0 0 0 0 0 0
57811- 0 0 0 0 0 0 0 0 0 0 0 0
57812- 0 0 0 0 0 0 0 0 0 0 0 0
57813- 0 0 0 10 10 10 26 26 26 66 66 66
57814- 82 82 82 2 2 6 38 38 38 6 6 6
57815- 14 14 14 210 210 210 253 253 253 253 253 253
57816-253 253 253 253 253 253 253 253 253 253 253 253
57817-253 253 253 253 253 253 246 246 246 242 242 242
57818-253 253 253 253 253 253 253 253 253 253 253 253
57819-253 253 253 253 253 253 253 253 253 253 253 253
57820-253 253 253 253 253 253 253 253 253 253 253 253
57821-253 253 253 253 253 253 253 253 253 253 253 253
57822-253 253 253 253 253 253 144 144 144 2 2 6
57823- 2 2 6 2 2 6 2 2 6 46 46 46
57824- 2 2 6 2 2 6 2 2 6 2 2 6
57825- 42 42 42 74 74 74 30 30 30 10 10 10
57826- 0 0 0 0 0 0 0 0 0 0 0 0
57827- 0 0 0 0 0 0 0 0 0 0 0 0
57828- 0 0 0 0 0 0 0 0 0 0 0 0
57829- 0 0 0 0 0 0 0 0 0 0 0 0
57830- 0 0 0 0 0 0 0 0 0 0 0 0
57831- 0 0 0 0 0 0 0 0 0 0 0 0
57832- 0 0 0 0 0 0 0 0 0 0 0 0
57833- 6 6 6 14 14 14 42 42 42 90 90 90
57834- 26 26 26 6 6 6 42 42 42 2 2 6
57835- 74 74 74 250 250 250 253 253 253 253 253 253
57836-253 253 253 253 253 253 253 253 253 253 253 253
57837-253 253 253 253 253 253 242 242 242 242 242 242
57838-253 253 253 253 253 253 253 253 253 253 253 253
57839-253 253 253 253 253 253 253 253 253 253 253 253
57840-253 253 253 253 253 253 253 253 253 253 253 253
57841-253 253 253 253 253 253 253 253 253 253 253 253
57842-253 253 253 253 253 253 182 182 182 2 2 6
57843- 2 2 6 2 2 6 2 2 6 46 46 46
57844- 2 2 6 2 2 6 2 2 6 2 2 6
57845- 10 10 10 86 86 86 38 38 38 10 10 10
57846- 0 0 0 0 0 0 0 0 0 0 0 0
57847- 0 0 0 0 0 0 0 0 0 0 0 0
57848- 0 0 0 0 0 0 0 0 0 0 0 0
57849- 0 0 0 0 0 0 0 0 0 0 0 0
57850- 0 0 0 0 0 0 0 0 0 0 0 0
57851- 0 0 0 0 0 0 0 0 0 0 0 0
57852- 0 0 0 0 0 0 0 0 0 0 0 0
57853- 10 10 10 26 26 26 66 66 66 82 82 82
57854- 2 2 6 22 22 22 18 18 18 2 2 6
57855-149 149 149 253 253 253 253 253 253 253 253 253
57856-253 253 253 253 253 253 253 253 253 253 253 253
57857-253 253 253 253 253 253 234 234 234 242 242 242
57858-253 253 253 253 253 253 253 253 253 253 253 253
57859-253 253 253 253 253 253 253 253 253 253 253 253
57860-253 253 253 253 253 253 253 253 253 253 253 253
57861-253 253 253 253 253 253 253 253 253 253 253 253
57862-253 253 253 253 253 253 206 206 206 2 2 6
57863- 2 2 6 2 2 6 2 2 6 38 38 38
57864- 2 2 6 2 2 6 2 2 6 2 2 6
57865- 6 6 6 86 86 86 46 46 46 14 14 14
57866- 0 0 0 0 0 0 0 0 0 0 0 0
57867- 0 0 0 0 0 0 0 0 0 0 0 0
57868- 0 0 0 0 0 0 0 0 0 0 0 0
57869- 0 0 0 0 0 0 0 0 0 0 0 0
57870- 0 0 0 0 0 0 0 0 0 0 0 0
57871- 0 0 0 0 0 0 0 0 0 0 0 0
57872- 0 0 0 0 0 0 0 0 0 6 6 6
57873- 18 18 18 46 46 46 86 86 86 18 18 18
57874- 2 2 6 34 34 34 10 10 10 6 6 6
57875-210 210 210 253 253 253 253 253 253 253 253 253
57876-253 253 253 253 253 253 253 253 253 253 253 253
57877-253 253 253 253 253 253 234 234 234 242 242 242
57878-253 253 253 253 253 253 253 253 253 253 253 253
57879-253 253 253 253 253 253 253 253 253 253 253 253
57880-253 253 253 253 253 253 253 253 253 253 253 253
57881-253 253 253 253 253 253 253 253 253 253 253 253
57882-253 253 253 253 253 253 221 221 221 6 6 6
57883- 2 2 6 2 2 6 6 6 6 30 30 30
57884- 2 2 6 2 2 6 2 2 6 2 2 6
57885- 2 2 6 82 82 82 54 54 54 18 18 18
57886- 6 6 6 0 0 0 0 0 0 0 0 0
57887- 0 0 0 0 0 0 0 0 0 0 0 0
57888- 0 0 0 0 0 0 0 0 0 0 0 0
57889- 0 0 0 0 0 0 0 0 0 0 0 0
57890- 0 0 0 0 0 0 0 0 0 0 0 0
57891- 0 0 0 0 0 0 0 0 0 0 0 0
57892- 0 0 0 0 0 0 0 0 0 10 10 10
57893- 26 26 26 66 66 66 62 62 62 2 2 6
57894- 2 2 6 38 38 38 10 10 10 26 26 26
57895-238 238 238 253 253 253 253 253 253 253 253 253
57896-253 253 253 253 253 253 253 253 253 253 253 253
57897-253 253 253 253 253 253 231 231 231 238 238 238
57898-253 253 253 253 253 253 253 253 253 253 253 253
57899-253 253 253 253 253 253 253 253 253 253 253 253
57900-253 253 253 253 253 253 253 253 253 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 6 6 6
57903- 2 2 6 2 2 6 10 10 10 30 30 30
57904- 2 2 6 2 2 6 2 2 6 2 2 6
57905- 2 2 6 66 66 66 58 58 58 22 22 22
57906- 6 6 6 0 0 0 0 0 0 0 0 0
57907- 0 0 0 0 0 0 0 0 0 0 0 0
57908- 0 0 0 0 0 0 0 0 0 0 0 0
57909- 0 0 0 0 0 0 0 0 0 0 0 0
57910- 0 0 0 0 0 0 0 0 0 0 0 0
57911- 0 0 0 0 0 0 0 0 0 0 0 0
57912- 0 0 0 0 0 0 0 0 0 10 10 10
57913- 38 38 38 78 78 78 6 6 6 2 2 6
57914- 2 2 6 46 46 46 14 14 14 42 42 42
57915-246 246 246 253 253 253 253 253 253 253 253 253
57916-253 253 253 253 253 253 253 253 253 253 253 253
57917-253 253 253 253 253 253 231 231 231 242 242 242
57918-253 253 253 253 253 253 253 253 253 253 253 253
57919-253 253 253 253 253 253 253 253 253 253 253 253
57920-253 253 253 253 253 253 253 253 253 253 253 253
57921-253 253 253 253 253 253 253 253 253 253 253 253
57922-253 253 253 253 253 253 234 234 234 10 10 10
57923- 2 2 6 2 2 6 22 22 22 14 14 14
57924- 2 2 6 2 2 6 2 2 6 2 2 6
57925- 2 2 6 66 66 66 62 62 62 22 22 22
57926- 6 6 6 0 0 0 0 0 0 0 0 0
57927- 0 0 0 0 0 0 0 0 0 0 0 0
57928- 0 0 0 0 0 0 0 0 0 0 0 0
57929- 0 0 0 0 0 0 0 0 0 0 0 0
57930- 0 0 0 0 0 0 0 0 0 0 0 0
57931- 0 0 0 0 0 0 0 0 0 0 0 0
57932- 0 0 0 0 0 0 6 6 6 18 18 18
57933- 50 50 50 74 74 74 2 2 6 2 2 6
57934- 14 14 14 70 70 70 34 34 34 62 62 62
57935-250 250 250 253 253 253 253 253 253 253 253 253
57936-253 253 253 253 253 253 253 253 253 253 253 253
57937-253 253 253 253 253 253 231 231 231 246 246 246
57938-253 253 253 253 253 253 253 253 253 253 253 253
57939-253 253 253 253 253 253 253 253 253 253 253 253
57940-253 253 253 253 253 253 253 253 253 253 253 253
57941-253 253 253 253 253 253 253 253 253 253 253 253
57942-253 253 253 253 253 253 234 234 234 14 14 14
57943- 2 2 6 2 2 6 30 30 30 2 2 6
57944- 2 2 6 2 2 6 2 2 6 2 2 6
57945- 2 2 6 66 66 66 62 62 62 22 22 22
57946- 6 6 6 0 0 0 0 0 0 0 0 0
57947- 0 0 0 0 0 0 0 0 0 0 0 0
57948- 0 0 0 0 0 0 0 0 0 0 0 0
57949- 0 0 0 0 0 0 0 0 0 0 0 0
57950- 0 0 0 0 0 0 0 0 0 0 0 0
57951- 0 0 0 0 0 0 0 0 0 0 0 0
57952- 0 0 0 0 0 0 6 6 6 18 18 18
57953- 54 54 54 62 62 62 2 2 6 2 2 6
57954- 2 2 6 30 30 30 46 46 46 70 70 70
57955-250 250 250 253 253 253 253 253 253 253 253 253
57956-253 253 253 253 253 253 253 253 253 253 253 253
57957-253 253 253 253 253 253 231 231 231 246 246 246
57958-253 253 253 253 253 253 253 253 253 253 253 253
57959-253 253 253 253 253 253 253 253 253 253 253 253
57960-253 253 253 253 253 253 253 253 253 253 253 253
57961-253 253 253 253 253 253 253 253 253 253 253 253
57962-253 253 253 253 253 253 226 226 226 10 10 10
57963- 2 2 6 6 6 6 30 30 30 2 2 6
57964- 2 2 6 2 2 6 2 2 6 2 2 6
57965- 2 2 6 66 66 66 58 58 58 22 22 22
57966- 6 6 6 0 0 0 0 0 0 0 0 0
57967- 0 0 0 0 0 0 0 0 0 0 0 0
57968- 0 0 0 0 0 0 0 0 0 0 0 0
57969- 0 0 0 0 0 0 0 0 0 0 0 0
57970- 0 0 0 0 0 0 0 0 0 0 0 0
57971- 0 0 0 0 0 0 0 0 0 0 0 0
57972- 0 0 0 0 0 0 6 6 6 22 22 22
57973- 58 58 58 62 62 62 2 2 6 2 2 6
57974- 2 2 6 2 2 6 30 30 30 78 78 78
57975-250 250 250 253 253 253 253 253 253 253 253 253
57976-253 253 253 253 253 253 253 253 253 253 253 253
57977-253 253 253 253 253 253 231 231 231 246 246 246
57978-253 253 253 253 253 253 253 253 253 253 253 253
57979-253 253 253 253 253 253 253 253 253 253 253 253
57980-253 253 253 253 253 253 253 253 253 253 253 253
57981-253 253 253 253 253 253 253 253 253 253 253 253
57982-253 253 253 253 253 253 206 206 206 2 2 6
57983- 22 22 22 34 34 34 18 14 6 22 22 22
57984- 26 26 26 18 18 18 6 6 6 2 2 6
57985- 2 2 6 82 82 82 54 54 54 18 18 18
57986- 6 6 6 0 0 0 0 0 0 0 0 0
57987- 0 0 0 0 0 0 0 0 0 0 0 0
57988- 0 0 0 0 0 0 0 0 0 0 0 0
57989- 0 0 0 0 0 0 0 0 0 0 0 0
57990- 0 0 0 0 0 0 0 0 0 0 0 0
57991- 0 0 0 0 0 0 0 0 0 0 0 0
57992- 0 0 0 0 0 0 6 6 6 26 26 26
57993- 62 62 62 106 106 106 74 54 14 185 133 11
57994-210 162 10 121 92 8 6 6 6 62 62 62
57995-238 238 238 253 253 253 253 253 253 253 253 253
57996-253 253 253 253 253 253 253 253 253 253 253 253
57997-253 253 253 253 253 253 231 231 231 246 246 246
57998-253 253 253 253 253 253 253 253 253 253 253 253
57999-253 253 253 253 253 253 253 253 253 253 253 253
58000-253 253 253 253 253 253 253 253 253 253 253 253
58001-253 253 253 253 253 253 253 253 253 253 253 253
58002-253 253 253 253 253 253 158 158 158 18 18 18
58003- 14 14 14 2 2 6 2 2 6 2 2 6
58004- 6 6 6 18 18 18 66 66 66 38 38 38
58005- 6 6 6 94 94 94 50 50 50 18 18 18
58006- 6 6 6 0 0 0 0 0 0 0 0 0
58007- 0 0 0 0 0 0 0 0 0 0 0 0
58008- 0 0 0 0 0 0 0 0 0 0 0 0
58009- 0 0 0 0 0 0 0 0 0 0 0 0
58010- 0 0 0 0 0 0 0 0 0 0 0 0
58011- 0 0 0 0 0 0 0 0 0 6 6 6
58012- 10 10 10 10 10 10 18 18 18 38 38 38
58013- 78 78 78 142 134 106 216 158 10 242 186 14
58014-246 190 14 246 190 14 156 118 10 10 10 10
58015- 90 90 90 238 238 238 253 253 253 253 253 253
58016-253 253 253 253 253 253 253 253 253 253 253 253
58017-253 253 253 253 253 253 231 231 231 250 250 250
58018-253 253 253 253 253 253 253 253 253 253 253 253
58019-253 253 253 253 253 253 253 253 253 253 253 253
58020-253 253 253 253 253 253 253 253 253 253 253 253
58021-253 253 253 253 253 253 253 253 253 246 230 190
58022-238 204 91 238 204 91 181 142 44 37 26 9
58023- 2 2 6 2 2 6 2 2 6 2 2 6
58024- 2 2 6 2 2 6 38 38 38 46 46 46
58025- 26 26 26 106 106 106 54 54 54 18 18 18
58026- 6 6 6 0 0 0 0 0 0 0 0 0
58027- 0 0 0 0 0 0 0 0 0 0 0 0
58028- 0 0 0 0 0 0 0 0 0 0 0 0
58029- 0 0 0 0 0 0 0 0 0 0 0 0
58030- 0 0 0 0 0 0 0 0 0 0 0 0
58031- 0 0 0 6 6 6 14 14 14 22 22 22
58032- 30 30 30 38 38 38 50 50 50 70 70 70
58033-106 106 106 190 142 34 226 170 11 242 186 14
58034-246 190 14 246 190 14 246 190 14 154 114 10
58035- 6 6 6 74 74 74 226 226 226 253 253 253
58036-253 253 253 253 253 253 253 253 253 253 253 253
58037-253 253 253 253 253 253 231 231 231 250 250 250
58038-253 253 253 253 253 253 253 253 253 253 253 253
58039-253 253 253 253 253 253 253 253 253 253 253 253
58040-253 253 253 253 253 253 253 253 253 253 253 253
58041-253 253 253 253 253 253 253 253 253 228 184 62
58042-241 196 14 241 208 19 232 195 16 38 30 10
58043- 2 2 6 2 2 6 2 2 6 2 2 6
58044- 2 2 6 6 6 6 30 30 30 26 26 26
58045-203 166 17 154 142 90 66 66 66 26 26 26
58046- 6 6 6 0 0 0 0 0 0 0 0 0
58047- 0 0 0 0 0 0 0 0 0 0 0 0
58048- 0 0 0 0 0 0 0 0 0 0 0 0
58049- 0 0 0 0 0 0 0 0 0 0 0 0
58050- 0 0 0 0 0 0 0 0 0 0 0 0
58051- 6 6 6 18 18 18 38 38 38 58 58 58
58052- 78 78 78 86 86 86 101 101 101 123 123 123
58053-175 146 61 210 150 10 234 174 13 246 186 14
58054-246 190 14 246 190 14 246 190 14 238 190 10
58055-102 78 10 2 2 6 46 46 46 198 198 198
58056-253 253 253 253 253 253 253 253 253 253 253 253
58057-253 253 253 253 253 253 234 234 234 242 242 242
58058-253 253 253 253 253 253 253 253 253 253 253 253
58059-253 253 253 253 253 253 253 253 253 253 253 253
58060-253 253 253 253 253 253 253 253 253 253 253 253
58061-253 253 253 253 253 253 253 253 253 224 178 62
58062-242 186 14 241 196 14 210 166 10 22 18 6
58063- 2 2 6 2 2 6 2 2 6 2 2 6
58064- 2 2 6 2 2 6 6 6 6 121 92 8
58065-238 202 15 232 195 16 82 82 82 34 34 34
58066- 10 10 10 0 0 0 0 0 0 0 0 0
58067- 0 0 0 0 0 0 0 0 0 0 0 0
58068- 0 0 0 0 0 0 0 0 0 0 0 0
58069- 0 0 0 0 0 0 0 0 0 0 0 0
58070- 0 0 0 0 0 0 0 0 0 0 0 0
58071- 14 14 14 38 38 38 70 70 70 154 122 46
58072-190 142 34 200 144 11 197 138 11 197 138 11
58073-213 154 11 226 170 11 242 186 14 246 190 14
58074-246 190 14 246 190 14 246 190 14 246 190 14
58075-225 175 15 46 32 6 2 2 6 22 22 22
58076-158 158 158 250 250 250 253 253 253 253 253 253
58077-253 253 253 253 253 253 253 253 253 253 253 253
58078-253 253 253 253 253 253 253 253 253 253 253 253
58079-253 253 253 253 253 253 253 253 253 253 253 253
58080-253 253 253 253 253 253 253 253 253 253 253 253
58081-253 253 253 250 250 250 242 242 242 224 178 62
58082-239 182 13 236 186 11 213 154 11 46 32 6
58083- 2 2 6 2 2 6 2 2 6 2 2 6
58084- 2 2 6 2 2 6 61 42 6 225 175 15
58085-238 190 10 236 186 11 112 100 78 42 42 42
58086- 14 14 14 0 0 0 0 0 0 0 0 0
58087- 0 0 0 0 0 0 0 0 0 0 0 0
58088- 0 0 0 0 0 0 0 0 0 0 0 0
58089- 0 0 0 0 0 0 0 0 0 0 0 0
58090- 0 0 0 0 0 0 0 0 0 6 6 6
58091- 22 22 22 54 54 54 154 122 46 213 154 11
58092-226 170 11 230 174 11 226 170 11 226 170 11
58093-236 178 12 242 186 14 246 190 14 246 190 14
58094-246 190 14 246 190 14 246 190 14 246 190 14
58095-241 196 14 184 144 12 10 10 10 2 2 6
58096- 6 6 6 116 116 116 242 242 242 253 253 253
58097-253 253 253 253 253 253 253 253 253 253 253 253
58098-253 253 253 253 253 253 253 253 253 253 253 253
58099-253 253 253 253 253 253 253 253 253 253 253 253
58100-253 253 253 253 253 253 253 253 253 253 253 253
58101-253 253 253 231 231 231 198 198 198 214 170 54
58102-236 178 12 236 178 12 210 150 10 137 92 6
58103- 18 14 6 2 2 6 2 2 6 2 2 6
58104- 6 6 6 70 47 6 200 144 11 236 178 12
58105-239 182 13 239 182 13 124 112 88 58 58 58
58106- 22 22 22 6 6 6 0 0 0 0 0 0
58107- 0 0 0 0 0 0 0 0 0 0 0 0
58108- 0 0 0 0 0 0 0 0 0 0 0 0
58109- 0 0 0 0 0 0 0 0 0 0 0 0
58110- 0 0 0 0 0 0 0 0 0 10 10 10
58111- 30 30 30 70 70 70 180 133 36 226 170 11
58112-239 182 13 242 186 14 242 186 14 246 186 14
58113-246 190 14 246 190 14 246 190 14 246 190 14
58114-246 190 14 246 190 14 246 190 14 246 190 14
58115-246 190 14 232 195 16 98 70 6 2 2 6
58116- 2 2 6 2 2 6 66 66 66 221 221 221
58117-253 253 253 253 253 253 253 253 253 253 253 253
58118-253 253 253 253 253 253 253 253 253 253 253 253
58119-253 253 253 253 253 253 253 253 253 253 253 253
58120-253 253 253 253 253 253 253 253 253 253 253 253
58121-253 253 253 206 206 206 198 198 198 214 166 58
58122-230 174 11 230 174 11 216 158 10 192 133 9
58123-163 110 8 116 81 8 102 78 10 116 81 8
58124-167 114 7 197 138 11 226 170 11 239 182 13
58125-242 186 14 242 186 14 162 146 94 78 78 78
58126- 34 34 34 14 14 14 6 6 6 0 0 0
58127- 0 0 0 0 0 0 0 0 0 0 0 0
58128- 0 0 0 0 0 0 0 0 0 0 0 0
58129- 0 0 0 0 0 0 0 0 0 0 0 0
58130- 0 0 0 0 0 0 0 0 0 6 6 6
58131- 30 30 30 78 78 78 190 142 34 226 170 11
58132-239 182 13 246 190 14 246 190 14 246 190 14
58133-246 190 14 246 190 14 246 190 14 246 190 14
58134-246 190 14 246 190 14 246 190 14 246 190 14
58135-246 190 14 241 196 14 203 166 17 22 18 6
58136- 2 2 6 2 2 6 2 2 6 38 38 38
58137-218 218 218 253 253 253 253 253 253 253 253 253
58138-253 253 253 253 253 253 253 253 253 253 253 253
58139-253 253 253 253 253 253 253 253 253 253 253 253
58140-253 253 253 253 253 253 253 253 253 253 253 253
58141-250 250 250 206 206 206 198 198 198 202 162 69
58142-226 170 11 236 178 12 224 166 10 210 150 10
58143-200 144 11 197 138 11 192 133 9 197 138 11
58144-210 150 10 226 170 11 242 186 14 246 190 14
58145-246 190 14 246 186 14 225 175 15 124 112 88
58146- 62 62 62 30 30 30 14 14 14 6 6 6
58147- 0 0 0 0 0 0 0 0 0 0 0 0
58148- 0 0 0 0 0 0 0 0 0 0 0 0
58149- 0 0 0 0 0 0 0 0 0 0 0 0
58150- 0 0 0 0 0 0 0 0 0 10 10 10
58151- 30 30 30 78 78 78 174 135 50 224 166 10
58152-239 182 13 246 190 14 246 190 14 246 190 14
58153-246 190 14 246 190 14 246 190 14 246 190 14
58154-246 190 14 246 190 14 246 190 14 246 190 14
58155-246 190 14 246 190 14 241 196 14 139 102 15
58156- 2 2 6 2 2 6 2 2 6 2 2 6
58157- 78 78 78 250 250 250 253 253 253 253 253 253
58158-253 253 253 253 253 253 253 253 253 253 253 253
58159-253 253 253 253 253 253 253 253 253 253 253 253
58160-253 253 253 253 253 253 253 253 253 253 253 253
58161-250 250 250 214 214 214 198 198 198 190 150 46
58162-219 162 10 236 178 12 234 174 13 224 166 10
58163-216 158 10 213 154 11 213 154 11 216 158 10
58164-226 170 11 239 182 13 246 190 14 246 190 14
58165-246 190 14 246 190 14 242 186 14 206 162 42
58166-101 101 101 58 58 58 30 30 30 14 14 14
58167- 6 6 6 0 0 0 0 0 0 0 0 0
58168- 0 0 0 0 0 0 0 0 0 0 0 0
58169- 0 0 0 0 0 0 0 0 0 0 0 0
58170- 0 0 0 0 0 0 0 0 0 10 10 10
58171- 30 30 30 74 74 74 174 135 50 216 158 10
58172-236 178 12 246 190 14 246 190 14 246 190 14
58173-246 190 14 246 190 14 246 190 14 246 190 14
58174-246 190 14 246 190 14 246 190 14 246 190 14
58175-246 190 14 246 190 14 241 196 14 226 184 13
58176- 61 42 6 2 2 6 2 2 6 2 2 6
58177- 22 22 22 238 238 238 253 253 253 253 253 253
58178-253 253 253 253 253 253 253 253 253 253 253 253
58179-253 253 253 253 253 253 253 253 253 253 253 253
58180-253 253 253 253 253 253 253 253 253 253 253 253
58181-253 253 253 226 226 226 187 187 187 180 133 36
58182-216 158 10 236 178 12 239 182 13 236 178 12
58183-230 174 11 226 170 11 226 170 11 230 174 11
58184-236 178 12 242 186 14 246 190 14 246 190 14
58185-246 190 14 246 190 14 246 186 14 239 182 13
58186-206 162 42 106 106 106 66 66 66 34 34 34
58187- 14 14 14 6 6 6 0 0 0 0 0 0
58188- 0 0 0 0 0 0 0 0 0 0 0 0
58189- 0 0 0 0 0 0 0 0 0 0 0 0
58190- 0 0 0 0 0 0 0 0 0 6 6 6
58191- 26 26 26 70 70 70 163 133 67 213 154 11
58192-236 178 12 246 190 14 246 190 14 246 190 14
58193-246 190 14 246 190 14 246 190 14 246 190 14
58194-246 190 14 246 190 14 246 190 14 246 190 14
58195-246 190 14 246 190 14 246 190 14 241 196 14
58196-190 146 13 18 14 6 2 2 6 2 2 6
58197- 46 46 46 246 246 246 253 253 253 253 253 253
58198-253 253 253 253 253 253 253 253 253 253 253 253
58199-253 253 253 253 253 253 253 253 253 253 253 253
58200-253 253 253 253 253 253 253 253 253 253 253 253
58201-253 253 253 221 221 221 86 86 86 156 107 11
58202-216 158 10 236 178 12 242 186 14 246 186 14
58203-242 186 14 239 182 13 239 182 13 242 186 14
58204-242 186 14 246 186 14 246 190 14 246 190 14
58205-246 190 14 246 190 14 246 190 14 246 190 14
58206-242 186 14 225 175 15 142 122 72 66 66 66
58207- 30 30 30 10 10 10 0 0 0 0 0 0
58208- 0 0 0 0 0 0 0 0 0 0 0 0
58209- 0 0 0 0 0 0 0 0 0 0 0 0
58210- 0 0 0 0 0 0 0 0 0 6 6 6
58211- 26 26 26 70 70 70 163 133 67 210 150 10
58212-236 178 12 246 190 14 246 190 14 246 190 14
58213-246 190 14 246 190 14 246 190 14 246 190 14
58214-246 190 14 246 190 14 246 190 14 246 190 14
58215-246 190 14 246 190 14 246 190 14 246 190 14
58216-232 195 16 121 92 8 34 34 34 106 106 106
58217-221 221 221 253 253 253 253 253 253 253 253 253
58218-253 253 253 253 253 253 253 253 253 253 253 253
58219-253 253 253 253 253 253 253 253 253 253 253 253
58220-253 253 253 253 253 253 253 253 253 253 253 253
58221-242 242 242 82 82 82 18 14 6 163 110 8
58222-216 158 10 236 178 12 242 186 14 246 190 14
58223-246 190 14 246 190 14 246 190 14 246 190 14
58224-246 190 14 246 190 14 246 190 14 246 190 14
58225-246 190 14 246 190 14 246 190 14 246 190 14
58226-246 190 14 246 190 14 242 186 14 163 133 67
58227- 46 46 46 18 18 18 6 6 6 0 0 0
58228- 0 0 0 0 0 0 0 0 0 0 0 0
58229- 0 0 0 0 0 0 0 0 0 0 0 0
58230- 0 0 0 0 0 0 0 0 0 10 10 10
58231- 30 30 30 78 78 78 163 133 67 210 150 10
58232-236 178 12 246 186 14 246 190 14 246 190 14
58233-246 190 14 246 190 14 246 190 14 246 190 14
58234-246 190 14 246 190 14 246 190 14 246 190 14
58235-246 190 14 246 190 14 246 190 14 246 190 14
58236-241 196 14 215 174 15 190 178 144 253 253 253
58237-253 253 253 253 253 253 253 253 253 253 253 253
58238-253 253 253 253 253 253 253 253 253 253 253 253
58239-253 253 253 253 253 253 253 253 253 253 253 253
58240-253 253 253 253 253 253 253 253 253 218 218 218
58241- 58 58 58 2 2 6 22 18 6 167 114 7
58242-216 158 10 236 178 12 246 186 14 246 190 14
58243-246 190 14 246 190 14 246 190 14 246 190 14
58244-246 190 14 246 190 14 246 190 14 246 190 14
58245-246 190 14 246 190 14 246 190 14 246 190 14
58246-246 190 14 246 186 14 242 186 14 190 150 46
58247- 54 54 54 22 22 22 6 6 6 0 0 0
58248- 0 0 0 0 0 0 0 0 0 0 0 0
58249- 0 0 0 0 0 0 0 0 0 0 0 0
58250- 0 0 0 0 0 0 0 0 0 14 14 14
58251- 38 38 38 86 86 86 180 133 36 213 154 11
58252-236 178 12 246 186 14 246 190 14 246 190 14
58253-246 190 14 246 190 14 246 190 14 246 190 14
58254-246 190 14 246 190 14 246 190 14 246 190 14
58255-246 190 14 246 190 14 246 190 14 246 190 14
58256-246 190 14 232 195 16 190 146 13 214 214 214
58257-253 253 253 253 253 253 253 253 253 253 253 253
58258-253 253 253 253 253 253 253 253 253 253 253 253
58259-253 253 253 253 253 253 253 253 253 253 253 253
58260-253 253 253 250 250 250 170 170 170 26 26 26
58261- 2 2 6 2 2 6 37 26 9 163 110 8
58262-219 162 10 239 182 13 246 186 14 246 190 14
58263-246 190 14 246 190 14 246 190 14 246 190 14
58264-246 190 14 246 190 14 246 190 14 246 190 14
58265-246 190 14 246 190 14 246 190 14 246 190 14
58266-246 186 14 236 178 12 224 166 10 142 122 72
58267- 46 46 46 18 18 18 6 6 6 0 0 0
58268- 0 0 0 0 0 0 0 0 0 0 0 0
58269- 0 0 0 0 0 0 0 0 0 0 0 0
58270- 0 0 0 0 0 0 6 6 6 18 18 18
58271- 50 50 50 109 106 95 192 133 9 224 166 10
58272-242 186 14 246 190 14 246 190 14 246 190 14
58273-246 190 14 246 190 14 246 190 14 246 190 14
58274-246 190 14 246 190 14 246 190 14 246 190 14
58275-246 190 14 246 190 14 246 190 14 246 190 14
58276-242 186 14 226 184 13 210 162 10 142 110 46
58277-226 226 226 253 253 253 253 253 253 253 253 253
58278-253 253 253 253 253 253 253 253 253 253 253 253
58279-253 253 253 253 253 253 253 253 253 253 253 253
58280-198 198 198 66 66 66 2 2 6 2 2 6
58281- 2 2 6 2 2 6 50 34 6 156 107 11
58282-219 162 10 239 182 13 246 186 14 246 190 14
58283-246 190 14 246 190 14 246 190 14 246 190 14
58284-246 190 14 246 190 14 246 190 14 246 190 14
58285-246 190 14 246 190 14 246 190 14 242 186 14
58286-234 174 13 213 154 11 154 122 46 66 66 66
58287- 30 30 30 10 10 10 0 0 0 0 0 0
58288- 0 0 0 0 0 0 0 0 0 0 0 0
58289- 0 0 0 0 0 0 0 0 0 0 0 0
58290- 0 0 0 0 0 0 6 6 6 22 22 22
58291- 58 58 58 154 121 60 206 145 10 234 174 13
58292-242 186 14 246 186 14 246 190 14 246 190 14
58293-246 190 14 246 190 14 246 190 14 246 190 14
58294-246 190 14 246 190 14 246 190 14 246 190 14
58295-246 190 14 246 190 14 246 190 14 246 190 14
58296-246 186 14 236 178 12 210 162 10 163 110 8
58297- 61 42 6 138 138 138 218 218 218 250 250 250
58298-253 253 253 253 253 253 253 253 253 250 250 250
58299-242 242 242 210 210 210 144 144 144 66 66 66
58300- 6 6 6 2 2 6 2 2 6 2 2 6
58301- 2 2 6 2 2 6 61 42 6 163 110 8
58302-216 158 10 236 178 12 246 190 14 246 190 14
58303-246 190 14 246 190 14 246 190 14 246 190 14
58304-246 190 14 246 190 14 246 190 14 246 190 14
58305-246 190 14 239 182 13 230 174 11 216 158 10
58306-190 142 34 124 112 88 70 70 70 38 38 38
58307- 18 18 18 6 6 6 0 0 0 0 0 0
58308- 0 0 0 0 0 0 0 0 0 0 0 0
58309- 0 0 0 0 0 0 0 0 0 0 0 0
58310- 0 0 0 0 0 0 6 6 6 22 22 22
58311- 62 62 62 168 124 44 206 145 10 224 166 10
58312-236 178 12 239 182 13 242 186 14 242 186 14
58313-246 186 14 246 190 14 246 190 14 246 190 14
58314-246 190 14 246 190 14 246 190 14 246 190 14
58315-246 190 14 246 190 14 246 190 14 246 190 14
58316-246 190 14 236 178 12 216 158 10 175 118 6
58317- 80 54 7 2 2 6 6 6 6 30 30 30
58318- 54 54 54 62 62 62 50 50 50 38 38 38
58319- 14 14 14 2 2 6 2 2 6 2 2 6
58320- 2 2 6 2 2 6 2 2 6 2 2 6
58321- 2 2 6 6 6 6 80 54 7 167 114 7
58322-213 154 11 236 178 12 246 190 14 246 190 14
58323-246 190 14 246 190 14 246 190 14 246 190 14
58324-246 190 14 242 186 14 239 182 13 239 182 13
58325-230 174 11 210 150 10 174 135 50 124 112 88
58326- 82 82 82 54 54 54 34 34 34 18 18 18
58327- 6 6 6 0 0 0 0 0 0 0 0 0
58328- 0 0 0 0 0 0 0 0 0 0 0 0
58329- 0 0 0 0 0 0 0 0 0 0 0 0
58330- 0 0 0 0 0 0 6 6 6 18 18 18
58331- 50 50 50 158 118 36 192 133 9 200 144 11
58332-216 158 10 219 162 10 224 166 10 226 170 11
58333-230 174 11 236 178 12 239 182 13 239 182 13
58334-242 186 14 246 186 14 246 190 14 246 190 14
58335-246 190 14 246 190 14 246 190 14 246 190 14
58336-246 186 14 230 174 11 210 150 10 163 110 8
58337-104 69 6 10 10 10 2 2 6 2 2 6
58338- 2 2 6 2 2 6 2 2 6 2 2 6
58339- 2 2 6 2 2 6 2 2 6 2 2 6
58340- 2 2 6 2 2 6 2 2 6 2 2 6
58341- 2 2 6 6 6 6 91 60 6 167 114 7
58342-206 145 10 230 174 11 242 186 14 246 190 14
58343-246 190 14 246 190 14 246 186 14 242 186 14
58344-239 182 13 230 174 11 224 166 10 213 154 11
58345-180 133 36 124 112 88 86 86 86 58 58 58
58346- 38 38 38 22 22 22 10 10 10 6 6 6
58347- 0 0 0 0 0 0 0 0 0 0 0 0
58348- 0 0 0 0 0 0 0 0 0 0 0 0
58349- 0 0 0 0 0 0 0 0 0 0 0 0
58350- 0 0 0 0 0 0 0 0 0 14 14 14
58351- 34 34 34 70 70 70 138 110 50 158 118 36
58352-167 114 7 180 123 7 192 133 9 197 138 11
58353-200 144 11 206 145 10 213 154 11 219 162 10
58354-224 166 10 230 174 11 239 182 13 242 186 14
58355-246 186 14 246 186 14 246 186 14 246 186 14
58356-239 182 13 216 158 10 185 133 11 152 99 6
58357-104 69 6 18 14 6 2 2 6 2 2 6
58358- 2 2 6 2 2 6 2 2 6 2 2 6
58359- 2 2 6 2 2 6 2 2 6 2 2 6
58360- 2 2 6 2 2 6 2 2 6 2 2 6
58361- 2 2 6 6 6 6 80 54 7 152 99 6
58362-192 133 9 219 162 10 236 178 12 239 182 13
58363-246 186 14 242 186 14 239 182 13 236 178 12
58364-224 166 10 206 145 10 192 133 9 154 121 60
58365- 94 94 94 62 62 62 42 42 42 22 22 22
58366- 14 14 14 6 6 6 0 0 0 0 0 0
58367- 0 0 0 0 0 0 0 0 0 0 0 0
58368- 0 0 0 0 0 0 0 0 0 0 0 0
58369- 0 0 0 0 0 0 0 0 0 0 0 0
58370- 0 0 0 0 0 0 0 0 0 6 6 6
58371- 18 18 18 34 34 34 58 58 58 78 78 78
58372-101 98 89 124 112 88 142 110 46 156 107 11
58373-163 110 8 167 114 7 175 118 6 180 123 7
58374-185 133 11 197 138 11 210 150 10 219 162 10
58375-226 170 11 236 178 12 236 178 12 234 174 13
58376-219 162 10 197 138 11 163 110 8 130 83 6
58377- 91 60 6 10 10 10 2 2 6 2 2 6
58378- 18 18 18 38 38 38 38 38 38 38 38 38
58379- 38 38 38 38 38 38 38 38 38 38 38 38
58380- 38 38 38 38 38 38 26 26 26 2 2 6
58381- 2 2 6 6 6 6 70 47 6 137 92 6
58382-175 118 6 200 144 11 219 162 10 230 174 11
58383-234 174 13 230 174 11 219 162 10 210 150 10
58384-192 133 9 163 110 8 124 112 88 82 82 82
58385- 50 50 50 30 30 30 14 14 14 6 6 6
58386- 0 0 0 0 0 0 0 0 0 0 0 0
58387- 0 0 0 0 0 0 0 0 0 0 0 0
58388- 0 0 0 0 0 0 0 0 0 0 0 0
58389- 0 0 0 0 0 0 0 0 0 0 0 0
58390- 0 0 0 0 0 0 0 0 0 0 0 0
58391- 6 6 6 14 14 14 22 22 22 34 34 34
58392- 42 42 42 58 58 58 74 74 74 86 86 86
58393-101 98 89 122 102 70 130 98 46 121 87 25
58394-137 92 6 152 99 6 163 110 8 180 123 7
58395-185 133 11 197 138 11 206 145 10 200 144 11
58396-180 123 7 156 107 11 130 83 6 104 69 6
58397- 50 34 6 54 54 54 110 110 110 101 98 89
58398- 86 86 86 82 82 82 78 78 78 78 78 78
58399- 78 78 78 78 78 78 78 78 78 78 78 78
58400- 78 78 78 82 82 82 86 86 86 94 94 94
58401-106 106 106 101 101 101 86 66 34 124 80 6
58402-156 107 11 180 123 7 192 133 9 200 144 11
58403-206 145 10 200 144 11 192 133 9 175 118 6
58404-139 102 15 109 106 95 70 70 70 42 42 42
58405- 22 22 22 10 10 10 0 0 0 0 0 0
58406- 0 0 0 0 0 0 0 0 0 0 0 0
58407- 0 0 0 0 0 0 0 0 0 0 0 0
58408- 0 0 0 0 0 0 0 0 0 0 0 0
58409- 0 0 0 0 0 0 0 0 0 0 0 0
58410- 0 0 0 0 0 0 0 0 0 0 0 0
58411- 0 0 0 0 0 0 6 6 6 10 10 10
58412- 14 14 14 22 22 22 30 30 30 38 38 38
58413- 50 50 50 62 62 62 74 74 74 90 90 90
58414-101 98 89 112 100 78 121 87 25 124 80 6
58415-137 92 6 152 99 6 152 99 6 152 99 6
58416-138 86 6 124 80 6 98 70 6 86 66 30
58417-101 98 89 82 82 82 58 58 58 46 46 46
58418- 38 38 38 34 34 34 34 34 34 34 34 34
58419- 34 34 34 34 34 34 34 34 34 34 34 34
58420- 34 34 34 34 34 34 38 38 38 42 42 42
58421- 54 54 54 82 82 82 94 86 76 91 60 6
58422-134 86 6 156 107 11 167 114 7 175 118 6
58423-175 118 6 167 114 7 152 99 6 121 87 25
58424-101 98 89 62 62 62 34 34 34 18 18 18
58425- 6 6 6 0 0 0 0 0 0 0 0 0
58426- 0 0 0 0 0 0 0 0 0 0 0 0
58427- 0 0 0 0 0 0 0 0 0 0 0 0
58428- 0 0 0 0 0 0 0 0 0 0 0 0
58429- 0 0 0 0 0 0 0 0 0 0 0 0
58430- 0 0 0 0 0 0 0 0 0 0 0 0
58431- 0 0 0 0 0 0 0 0 0 0 0 0
58432- 0 0 0 6 6 6 6 6 6 10 10 10
58433- 18 18 18 22 22 22 30 30 30 42 42 42
58434- 50 50 50 66 66 66 86 86 86 101 98 89
58435-106 86 58 98 70 6 104 69 6 104 69 6
58436-104 69 6 91 60 6 82 62 34 90 90 90
58437- 62 62 62 38 38 38 22 22 22 14 14 14
58438- 10 10 10 10 10 10 10 10 10 10 10 10
58439- 10 10 10 10 10 10 6 6 6 10 10 10
58440- 10 10 10 10 10 10 10 10 10 14 14 14
58441- 22 22 22 42 42 42 70 70 70 89 81 66
58442- 80 54 7 104 69 6 124 80 6 137 92 6
58443-134 86 6 116 81 8 100 82 52 86 86 86
58444- 58 58 58 30 30 30 14 14 14 6 6 6
58445- 0 0 0 0 0 0 0 0 0 0 0 0
58446- 0 0 0 0 0 0 0 0 0 0 0 0
58447- 0 0 0 0 0 0 0 0 0 0 0 0
58448- 0 0 0 0 0 0 0 0 0 0 0 0
58449- 0 0 0 0 0 0 0 0 0 0 0 0
58450- 0 0 0 0 0 0 0 0 0 0 0 0
58451- 0 0 0 0 0 0 0 0 0 0 0 0
58452- 0 0 0 0 0 0 0 0 0 0 0 0
58453- 0 0 0 6 6 6 10 10 10 14 14 14
58454- 18 18 18 26 26 26 38 38 38 54 54 54
58455- 70 70 70 86 86 86 94 86 76 89 81 66
58456- 89 81 66 86 86 86 74 74 74 50 50 50
58457- 30 30 30 14 14 14 6 6 6 0 0 0
58458- 0 0 0 0 0 0 0 0 0 0 0 0
58459- 0 0 0 0 0 0 0 0 0 0 0 0
58460- 0 0 0 0 0 0 0 0 0 0 0 0
58461- 6 6 6 18 18 18 34 34 34 58 58 58
58462- 82 82 82 89 81 66 89 81 66 89 81 66
58463- 94 86 66 94 86 76 74 74 74 50 50 50
58464- 26 26 26 14 14 14 6 6 6 0 0 0
58465- 0 0 0 0 0 0 0 0 0 0 0 0
58466- 0 0 0 0 0 0 0 0 0 0 0 0
58467- 0 0 0 0 0 0 0 0 0 0 0 0
58468- 0 0 0 0 0 0 0 0 0 0 0 0
58469- 0 0 0 0 0 0 0 0 0 0 0 0
58470- 0 0 0 0 0 0 0 0 0 0 0 0
58471- 0 0 0 0 0 0 0 0 0 0 0 0
58472- 0 0 0 0 0 0 0 0 0 0 0 0
58473- 0 0 0 0 0 0 0 0 0 0 0 0
58474- 6 6 6 6 6 6 14 14 14 18 18 18
58475- 30 30 30 38 38 38 46 46 46 54 54 54
58476- 50 50 50 42 42 42 30 30 30 18 18 18
58477- 10 10 10 0 0 0 0 0 0 0 0 0
58478- 0 0 0 0 0 0 0 0 0 0 0 0
58479- 0 0 0 0 0 0 0 0 0 0 0 0
58480- 0 0 0 0 0 0 0 0 0 0 0 0
58481- 0 0 0 6 6 6 14 14 14 26 26 26
58482- 38 38 38 50 50 50 58 58 58 58 58 58
58483- 54 54 54 42 42 42 30 30 30 18 18 18
58484- 10 10 10 0 0 0 0 0 0 0 0 0
58485- 0 0 0 0 0 0 0 0 0 0 0 0
58486- 0 0 0 0 0 0 0 0 0 0 0 0
58487- 0 0 0 0 0 0 0 0 0 0 0 0
58488- 0 0 0 0 0 0 0 0 0 0 0 0
58489- 0 0 0 0 0 0 0 0 0 0 0 0
58490- 0 0 0 0 0 0 0 0 0 0 0 0
58491- 0 0 0 0 0 0 0 0 0 0 0 0
58492- 0 0 0 0 0 0 0 0 0 0 0 0
58493- 0 0 0 0 0 0 0 0 0 0 0 0
58494- 0 0 0 0 0 0 0 0 0 6 6 6
58495- 6 6 6 10 10 10 14 14 14 18 18 18
58496- 18 18 18 14 14 14 10 10 10 6 6 6
58497- 0 0 0 0 0 0 0 0 0 0 0 0
58498- 0 0 0 0 0 0 0 0 0 0 0 0
58499- 0 0 0 0 0 0 0 0 0 0 0 0
58500- 0 0 0 0 0 0 0 0 0 0 0 0
58501- 0 0 0 0 0 0 0 0 0 6 6 6
58502- 14 14 14 18 18 18 22 22 22 22 22 22
58503- 18 18 18 14 14 14 10 10 10 6 6 6
58504- 0 0 0 0 0 0 0 0 0 0 0 0
58505- 0 0 0 0 0 0 0 0 0 0 0 0
58506- 0 0 0 0 0 0 0 0 0 0 0 0
58507- 0 0 0 0 0 0 0 0 0 0 0 0
58508- 0 0 0 0 0 0 0 0 0 0 0 0
58509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58514+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58522+4 4 4 4 4 4
58523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58533+4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58536+4 4 4 4 4 4
58537+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58538+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58539+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58544+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58547+4 4 4 4 4 4 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 4 4 4 4 4 4
58549+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58550+4 4 4 4 4 4
58551+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58552+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58553+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58558+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58559+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58563+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58564+4 4 4 4 4 4
58565+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58566+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58567+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4
58571+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58572+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58573+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58576+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58577+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58578+4 4 4 4 4 4
58579+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58580+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58581+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4
58585+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58586+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58590+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58591+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58592+4 4 4 4 4 4
58593+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58594+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58595+4 4 4 4 4 4 4 4 4 4 4 4 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 3 3 3 0 0 0 0 0 0
58598+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
58599+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58600+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58601+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58602+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
58603+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58604+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
58605+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58606+4 4 4 4 4 4
58607+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58608+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58609+4 4 4 4 4 4 4 4 4 4 4 4 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 2 2 2 0 0 0 3 4 3 26 28 28
58612+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
58613+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58614+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58615+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58616+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
58617+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
58618+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
58619+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58620+4 4 4 4 4 4
58621+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58622+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58623+4 4 4 4 4 4 4 4 4 4 4 4 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+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
58626+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
58627+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58628+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58629+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58630+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
58631+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
58632+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
58633+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
58634+4 4 4 4 4 4
58635+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58636+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58637+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58638+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
58639+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
58640+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
58641+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
58642+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58643+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58644+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
58645+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
58646+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
58647+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
58648+4 4 4 4 4 4
58649+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58650+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58651+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58652+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
58653+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
58654+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
58655+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
58656+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58657+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
58658+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
58659+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
58660+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
58661+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
58662+4 4 4 4 4 4
58663+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58664+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58665+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58666+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
58667+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
58668+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
58669+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
58670+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58671+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
58672+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
58673+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
58674+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
58675+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
58676+4 4 4 4 4 4
58677+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58678+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58679+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
58680+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
58681+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
58682+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
58683+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
58684+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
58685+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
58686+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
58687+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
58688+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
58689+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
58690+4 4 4 4 4 4
58691+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58692+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58693+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
58694+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
58695+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
58696+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
58697+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
58698+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
58699+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
58700+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
58701+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
58702+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
58703+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
58704+4 4 4 4 4 4
58705+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58706+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58707+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
58708+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
58709+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
58710+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
58711+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
58712+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
58713+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
58714+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
58715+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
58716+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
58717+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
58718+4 4 4 4 4 4
58719+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58720+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58721+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
58722+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
58723+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
58724+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
58725+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
58726+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
58727+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
58728+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58729+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58730+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58731+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58732+4 4 4 4 4 4
58733+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58734+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58735+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58736+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58737+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58738+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58739+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58740+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58741+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58742+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58743+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58744+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58745+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58746+4 4 4 4 4 4
58747+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58748+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58749+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58750+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58751+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58752+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58753+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58754+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58755+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58756+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58757+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58758+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58759+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58760+0 0 0 4 4 4
58761+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58762+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58763+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58764+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58765+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58766+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58767+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58768+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58769+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58770+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58771+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58772+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58773+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58774+2 0 0 0 0 0
58775+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58776+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58777+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58778+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58779+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58780+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58781+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58782+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58783+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58784+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58785+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58786+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
58787+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
58788+37 38 37 0 0 0
58789+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58790+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
58791+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
58792+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
58793+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
58794+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
58795+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
58796+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
58797+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
58798+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
58799+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
58800+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
58801+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
58802+85 115 134 4 0 0
58803+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
58804+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
58805+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
58806+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
58807+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
58808+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
58809+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
58810+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
58811+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
58812+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
58813+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
58814+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
58815+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
58816+60 73 81 4 0 0
58817+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
58818+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
58819+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
58820+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
58821+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
58822+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
58823+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
58824+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
58825+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
58826+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
58827+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
58828+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
58829+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
58830+16 19 21 4 0 0
58831+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
58832+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
58833+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
58834+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
58835+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
58836+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
58837+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
58838+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
58839+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
58840+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
58841+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
58842+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
58843+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
58844+4 0 0 4 3 3
58845+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
58846+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
58847+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
58848+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
58849+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
58850+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
58851+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
58852+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
58853+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
58854+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
58855+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
58856+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
58857+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
58858+3 2 2 4 4 4
58859+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
58860+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
58861+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
58862+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58863+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
58864+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
58865+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
58866+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
58867+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
58868+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
58869+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
58870+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
58871+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
58872+4 4 4 4 4 4
58873+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
58874+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
58875+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
58876+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
58877+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
58878+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
58879+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
58880+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
58881+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
58882+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
58883+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
58884+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
58885+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
58886+4 4 4 4 4 4
58887+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
58888+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
58889+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
58890+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
58891+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
58892+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58893+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
58894+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
58895+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
58896+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
58897+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
58898+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
58899+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
58900+5 5 5 5 5 5
58901+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
58902+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
58903+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
58904+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
58905+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
58906+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58907+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
58908+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
58909+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
58910+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
58911+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
58912+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
58913+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58914+5 5 5 4 4 4
58915+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
58916+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
58917+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
58918+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
58919+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58920+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
58921+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
58922+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
58923+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
58924+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
58925+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
58926+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
58927+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58928+4 4 4 4 4 4
58929+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
58930+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
58931+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
58932+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
58933+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
58934+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58935+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58936+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
58937+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
58938+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
58939+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
58940+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
58941+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58942+4 4 4 4 4 4
58943+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
58944+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
58945+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
58946+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
58947+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58948+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
58949+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
58950+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
58951+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
58952+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
58953+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
58954+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58955+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58956+4 4 4 4 4 4
58957+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
58958+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
58959+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
58960+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
58961+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58962+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58963+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58964+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
58965+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
58966+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
58967+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
58968+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58969+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58970+4 4 4 4 4 4
58971+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
58972+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
58973+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
58974+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
58975+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58976+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
58977+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58978+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
58979+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
58980+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
58981+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58982+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58983+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58984+4 4 4 4 4 4
58985+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
58986+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
58987+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
58988+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
58989+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58990+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
58991+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
58992+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
58993+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
58994+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
58995+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
58996+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58997+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58998+4 4 4 4 4 4
58999+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
59000+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
59001+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
59002+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
59003+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
59004+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
59005+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
59006+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
59007+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
59008+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
59009+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
59010+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59011+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59012+4 4 4 4 4 4
59013+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
59014+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
59015+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
59016+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
59017+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
59018+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
59019+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
59020+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
59021+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
59022+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
59023+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59024+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59025+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59026+4 4 4 4 4 4
59027+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
59028+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
59029+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
59030+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
59031+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59032+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
59033+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
59034+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
59035+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
59036+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
59037+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59038+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59039+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59040+4 4 4 4 4 4
59041+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
59042+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
59043+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
59044+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
59045+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59046+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
59047+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
59048+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
59049+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
59050+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
59051+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59052+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59053+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59054+4 4 4 4 4 4
59055+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
59056+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
59057+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
59058+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
59059+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59060+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
59061+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
59062+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
59063+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
59064+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59065+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59066+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59067+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59068+4 4 4 4 4 4
59069+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
59070+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
59071+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
59072+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
59073+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
59074+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
59075+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
59076+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
59077+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59078+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59079+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59080+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59081+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59082+4 4 4 4 4 4
59083+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
59084+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
59085+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
59086+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
59087+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59088+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
59089+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
59090+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
59091+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59092+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59093+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59094+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59095+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59096+4 4 4 4 4 4
59097+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
59098+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
59099+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59100+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
59101+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
59102+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
59103+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
59104+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
59105+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59106+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59107+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59108+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59109+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59110+4 4 4 4 4 4
59111+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
59112+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
59113+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59114+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
59115+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
59116+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
59117+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
59118+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
59119+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
59120+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59121+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59122+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59123+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59124+4 4 4 4 4 4
59125+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59126+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
59127+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
59128+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
59129+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
59130+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
59131+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
59132+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
59133+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59134+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59135+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59136+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59137+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59138+4 4 4 4 4 4
59139+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
59140+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
59141+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59142+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
59143+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
59144+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
59145+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
59146+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
59147+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
59148+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59149+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59150+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59151+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59152+4 4 4 4 4 4
59153+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
59154+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
59155+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
59156+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
59157+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
59158+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
59159+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
59160+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
59161+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59162+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59163+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59164+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59165+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59166+4 4 4 4 4 4
59167+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59168+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
59169+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
59170+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
59171+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
59172+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
59173+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
59174+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
59175+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59176+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59177+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59178+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59179+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59180+4 4 4 4 4 4
59181+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59182+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
59183+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
59184+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
59185+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
59186+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
59187+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59188+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
59189+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
59190+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59191+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59192+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59193+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59194+4 4 4 4 4 4
59195+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59196+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
59197+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
59198+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59199+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
59200+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
59201+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
59202+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
59203+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
59204+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59205+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59206+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59207+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59208+4 4 4 4 4 4
59209+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
59210+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
59211+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
59212+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
59213+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
59214+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
59215+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
59216+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
59217+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
59218+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59219+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59220+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59221+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59222+4 4 4 4 4 4
59223+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59224+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
59225+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
59226+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
59227+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
59228+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
59229+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
59230+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
59231+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
59232+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59233+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59234+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59235+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59236+4 4 4 4 4 4
59237+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
59238+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
59239+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
59240+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
59241+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
59242+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
59243+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
59244+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
59245+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
59246+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59247+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59248+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59249+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59250+4 4 4 4 4 4
59251+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
59252+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
59253+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
59254+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
59255+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
59256+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
59257+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
59258+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
59259+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
59260+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
59261+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59262+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59263+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59264+4 4 4 4 4 4
59265+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
59266+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
59267+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
59268+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
59269+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
59270+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
59271+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
59272+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
59273+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
59274+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
59275+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59276+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59277+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59278+4 4 4 4 4 4
59279+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
59280+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59281+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
59282+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
59283+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
59284+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
59285+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
59286+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
59287+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
59288+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
59289+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59290+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59291+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59292+4 4 4 4 4 4
59293+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
59294+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
59295+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
59296+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
59297+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
59298+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
59299+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59300+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
59301+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
59302+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
59303+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59304+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59305+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59306+4 4 4 4 4 4
59307+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
59308+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
59309+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
59310+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
59311+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
59312+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
59313+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
59314+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
59315+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
59316+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
59317+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59318+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59319+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59320+4 4 4 4 4 4
59321+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
59322+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
59323+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59324+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
59325+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
59326+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
59327+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
59328+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
59329+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
59330+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
59331+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59332+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59333+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59334+4 4 4 4 4 4
59335+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59336+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
59337+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
59338+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
59339+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
59340+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
59341+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
59342+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
59343+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
59344+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59345+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59346+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59347+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59348+4 4 4 4 4 4
59349+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
59350+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
59351+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
59352+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
59353+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
59354+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
59355+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
59356+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
59357+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
59358+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
59359+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59360+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59361+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59362+4 4 4 4 4 4
59363+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
59364+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
59365+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
59366+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
59367+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
59368+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
59369+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
59370+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
59371+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
59372+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59374+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59375+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59376+4 4 4 4 4 4
59377+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
59378+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59379+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
59380+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
59381+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
59382+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
59383+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
59384+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
59385+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
59386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59388+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59389+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59390+4 4 4 4 4 4
59391+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
59392+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
59393+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
59394+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
59395+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
59396+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
59397+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
59398+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
59399+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
59400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59401+4 4 4 4 4 4 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
59405+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59406+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
59407+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
59408+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
59409+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
59410+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
59411+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
59412+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
59413+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
59419+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
59420+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
59421+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59422+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
59423+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
59424+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
59425+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
59426+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
59427+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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
59433+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59434+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
59435+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
59436+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
59437+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
59438+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
59439+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
59440+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
59441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
59447+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59448+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
59449+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59450+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
59451+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
59452+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
59453+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
59454+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
59455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59456+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
59461+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59462+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
59463+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
59464+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
59465+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
59466+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
59467+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
59468+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
59469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59470+4 4 4 4 4 4 4 4 4 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
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 5 5 5 5 5 5 5 5 5
59477+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
59478+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59479+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
59480+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
59481+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
59482+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59483+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59484+4 4 4 4 4 4 4 4 4 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
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 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59492+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
59493+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
59494+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
59495+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
59496+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
59497+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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
59503+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59504+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59506+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59507+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
59508+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
59509+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
59510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59513+4 4 4 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
59517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59520+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
59521+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
59522+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
59523+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
59524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59527+4 4 4 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
59531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59534+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
59535+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
59536+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
59537+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
59538+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59539+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59542+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59543+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59544+4 4 4 4 4 4
59545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59548+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
59549+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
59550+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
59551+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
59552+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59553+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59554+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59555+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59556+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59557+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59558+4 4 4 4 4 4
59559+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
59563+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
59564+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
59565+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
59566+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59567+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59568+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59569+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59570+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59571+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59572+4 4 4 4 4 4
59573+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59576+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59577+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
59578+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
59579+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
59580+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59581+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59582+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59583+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59584+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59585+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59586+4 4 4 4 4 4
59587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59590+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59591+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
59592+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
59593+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59594+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59595+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59596+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59597+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59598+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59599+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59600+4 4 4 4 4 4
59601+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59602+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59604+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59605+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
59606+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
59607+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59608+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59609+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59610+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59611+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59612+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59613+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59614+4 4 4 4 4 4
59615+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59617+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59618+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59619+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
59620+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
59621+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59622+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59623+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59624+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59625+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59626+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59627+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
59628+4 4 4 4 4 4
59629diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
59630index 3838795..0d48d61 100644
59631--- a/drivers/xen/events/events_base.c
59632+++ b/drivers/xen/events/events_base.c
59633@@ -1568,7 +1568,7 @@ void xen_irq_resume(void)
59634 restore_pirqs();
59635 }
59636
59637-static struct irq_chip xen_dynamic_chip __read_mostly = {
59638+static struct irq_chip xen_dynamic_chip = {
59639 .name = "xen-dyn",
59640
59641 .irq_disable = disable_dynirq,
59642@@ -1582,7 +1582,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
59643 .irq_retrigger = retrigger_dynirq,
59644 };
59645
59646-static struct irq_chip xen_pirq_chip __read_mostly = {
59647+static struct irq_chip xen_pirq_chip = {
59648 .name = "xen-pirq",
59649
59650 .irq_startup = startup_pirq,
59651@@ -1602,7 +1602,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
59652 .irq_retrigger = retrigger_dynirq,
59653 };
59654
59655-static struct irq_chip xen_percpu_chip __read_mostly = {
59656+static struct irq_chip xen_percpu_chip = {
59657 .name = "xen-percpu",
59658
59659 .irq_disable = disable_dynirq,
59660diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
59661index 00f40f0..e3c0b15 100644
59662--- a/drivers/xen/evtchn.c
59663+++ b/drivers/xen/evtchn.c
59664@@ -201,8 +201,8 @@ static ssize_t evtchn_read(struct file *file, char __user *buf,
59665
59666 /* Byte lengths of two chunks. Chunk split (if any) is at ring wrap. */
59667 if (((c ^ p) & EVTCHN_RING_SIZE) != 0) {
59668- bytes1 = (EVTCHN_RING_SIZE - EVTCHN_RING_MASK(c)) *
59669- sizeof(evtchn_port_t);
59670+ bytes1 = EVTCHN_RING_SIZE - EVTCHN_RING_MASK(c);
59671+ bytes1 *= sizeof(evtchn_port_t);
59672 bytes2 = EVTCHN_RING_MASK(p) * sizeof(evtchn_port_t);
59673 } else {
59674 bytes1 = (p - c) * sizeof(evtchn_port_t);
59675diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
59676index fef20db..d28b1ab 100644
59677--- a/drivers/xen/xenfs/xenstored.c
59678+++ b/drivers/xen/xenfs/xenstored.c
59679@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
59680 static int xsd_kva_open(struct inode *inode, struct file *file)
59681 {
59682 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
59683+#ifdef CONFIG_GRKERNSEC_HIDESYM
59684+ NULL);
59685+#else
59686 xen_store_interface);
59687+#endif
59688+
59689 if (!file->private_data)
59690 return -ENOMEM;
59691 return 0;
59692diff --git a/firmware/Makefile b/firmware/Makefile
59693index e297e1b..aeb0982 100644
59694--- a/firmware/Makefile
59695+++ b/firmware/Makefile
59696@@ -35,9 +35,11 @@ fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.9.0.fw \
59697 bnx2x/bnx2x-e1h-6.2.9.0.fw \
59698 bnx2x/bnx2x-e2-6.2.9.0.fw
59699 fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1a.fw \
59700+ bnx2/bnx2-mips-09-6.2.1b.fw \
59701 bnx2/bnx2-rv2p-09-6.0.17.fw \
59702 bnx2/bnx2-rv2p-09ax-6.0.17.fw \
59703 bnx2/bnx2-mips-06-6.2.1.fw \
59704+ bnx2/bnx2-mips-06-6.2.3.fw \
59705 bnx2/bnx2-rv2p-06-6.0.15.fw
59706 fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
59707 fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
59708diff --git a/firmware/WHENCE b/firmware/WHENCE
59709index 0c4d96d..b17700f 100644
59710--- a/firmware/WHENCE
59711+++ b/firmware/WHENCE
59712@@ -653,21 +653,23 @@ Found in hex form in kernel source.
59713 Driver: BNX2 - Broadcom NetXtremeII
59714
59715 File: bnx2/bnx2-mips-06-6.2.1.fw
59716+File: bnx2/bnx2-mips-06-6.2.3.fw
59717 File: bnx2/bnx2-rv2p-06-6.0.15.fw
59718 File: bnx2/bnx2-mips-09-6.2.1a.fw
59719+File: bnx2/bnx2-mips-09-6.2.1b.fw
59720 File: bnx2/bnx2-rv2p-09-6.0.17.fw
59721 File: bnx2/bnx2-rv2p-09ax-6.0.17.fw
59722
59723 Licence:
59724-
59725- This file contains firmware data derived from proprietary unpublished
59726- source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59727-
59728- Permission is hereby granted for the distribution of this firmware data
59729- in hexadecimal or equivalent format, provided this copyright notice is
59730- accompanying it.
59731-
59732-Found in hex form in kernel source.
59733+
59734+ This file contains firmware data derived from proprietary unpublished
59735+ source code, Copyright (c) 2004 - 2010 Broadcom Corporation.
59736+
59737+ Permission is hereby granted for the distribution of this firmware data
59738+ in hexadecimal or equivalent format, provided this copyright notice is
59739+ accompanying it.
59740+
59741+Found in hex form in kernel source.
59742
59743 --------------------------------------------------------------------------
59744
59745diff --git a/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
59746new file mode 100644
59747index 0000000..da72bf1
59748--- /dev/null
59749+++ b/firmware/bnx2/bnx2-mips-06-6.2.3.fw.ihex
59750@@ -0,0 +1,5804 @@
59751+:10000000080001180800000000004A68000000C84D
59752+:1000100000000000000000000000000008004A6826
59753+:100020000000001400004B30080000A00800000091
59754+:100030000000569400004B44080058200000008443
59755+:100040000000A1D808005694000001580000A25CEE
59756+:100050000800321008000000000072F00000A3B495
59757+:10006000000000000000000000000000080072F026
59758+:1000700000000024000116A40800049008000400F9
59759+:10008000000017D4000116C80000000000000000A6
59760+:100090000000000000000000000000000000000060
59761+:1000A000080000A80800000000003BFC00012E9C96
59762+:1000B0000000000000000000000000000000000040
59763+:1000C00000000000000000000A00004600000000E0
59764+:1000D000000000000000000D636F6D362E322E33DD
59765+:1000E0000000000006020302000000000000000300
59766+:1000F000000000C800000032000000030000000003
59767+:1001000000000000000000000000000000000000EF
59768+:1001100000000010000001360000EA600000000549
59769+:1001200000000000000000000000000000000008C7
59770+:1001300000000000000000000000000000000000BF
59771+:1001400000000000000000000000000000000000AF
59772+:10015000000000000000000000000000000000009F
59773+:10016000000000020000000000000000000000008D
59774+:10017000000000000000000000000000000000007F
59775+:10018000000000000000000000000010000000005F
59776+:10019000000000000000000000000000000000005F
59777+:1001A000000000000000000000000000000000004F
59778+:1001B000000000000000000000000000000000003F
59779+:1001C000000000000000000000000000000000002F
59780+:1001D000000000000000000000000000000000001F
59781+:1001E0000000000010000003000000000000000DEF
59782+:1001F0000000000D3C02080024424AA03C03080015
59783+:1002000024634B9CAC4000000043202B1480FFFD76
59784+:10021000244200043C1D080037BD7FFC03A0F021F0
59785+:100220003C100800261001183C1C0800279C4AA01E
59786+:100230000E000168000000000000000D27470100CB
59787+:1002400090E3000B2402001A94E5000814620028D1
59788+:10025000000020218CE200003C0308008C63004475
59789+:1002600094E60014000211C20002104030A4000203
59790+:10027000005A10212463000130A50004A446008028
59791+:100280003C010800AC23004410A000190004202BFE
59792+:100290008F4202B804410008240400013C02080017
59793+:1002A0008C420060244200013C010800AC22006046
59794+:1002B00003E00008008010218CE2002094E3001687
59795+:1002C00000002021AF4202808CE20004A743028498
59796+:1002D000AF4202883C021000AF4202B83C02080064
59797+:1002E0008C42005C244200013C010800AC22005C0E
59798+:1002F00003E00008008010212747010090E3000B75
59799+:100300002402000394E50008146200280000202164
59800+:100310008CE200003C0308008C63004494E6001467
59801+:10032000000211C20002104030A40002005A102145
59802+:100330002463000130A50004A44600803C010800AD
59803+:10034000AC23004410A000190004202B8F4202B8F7
59804+:1003500004410008240400013C0208008C420060B3
59805+:10036000244200013C010800AC22006003E00008C8
59806+:10037000008010218CE2002094E300160000202170
59807+:10038000AF4202808CE20004A7430284AF4202889D
59808+:100390003C021000AF4202B83C0208008C42005CF4
59809+:1003A000244200013C010800AC22005C03E000088C
59810+:1003B000008010218F4301002402010050620003DD
59811+:1003C000000311C20000000D000311C20002104022
59812+:1003D000005A1021A440008003E000080000102112
59813+:1003E0009362000003E00008AF80000003E0000813
59814+:1003F0000000102103E00008000010212402010089
59815+:1004000014820008000000003C0208008C4200FC3E
59816+:10041000244200013C010800AC2200FC0A0000DD7F
59817+:1004200030A200203C0208008C42008424420001DB
59818+:100430003C010800AC22008430A2002010400008DB
59819+:1004400030A300103C0208008C4201082442000145
59820+:100450003C010800AC22010803E000080000000095
59821+:1004600010600008000000003C0208008C420104FB
59822+:10047000244200013C010800AC22010403E0000812
59823+:10048000000000003C0208008C42010024420001F0
59824+:100490003C010800AC22010003E00008000000005D
59825+:1004A00027BDFFE8AFBF0010274401009483000878
59826+:1004B000306200041040001B306600028F4202B818
59827+:1004C00004410008240500013C0208008C42006041
59828+:1004D000244200013C010800AC2200600A0001290E
59829+:1004E0008FBF00108C82002094830016000028210A
59830+:1004F000AF4202808C820004A7430284AF4202888C
59831+:100500003C021000AF4202B83C0208008C42005C82
59832+:10051000244200013C010800AC22005C0A000129D1
59833+:100520008FBF001010C00006006028218F4401001A
59834+:100530000E0000CD000000000A0001282405000183
59835+:100540008F8200088F4301045043000700002821D8
59836+:100550008F4401000E0000CD000000008F42010416
59837+:10056000AF820008000028218FBF001000A01021DA
59838+:1005700003E0000827BD001827BDFFE8AFBF001447
59839+:10058000AFB00010974201083043700024022000F1
59840+:100590001062000B286220011440002F000010217F
59841+:1005A00024024000106200250000000024026000C8
59842+:1005B00010620026000010210A0001658FBF0014A0
59843+:1005C00027500100920200091040001A2403000184
59844+:1005D0003C0208008C420020104000160000182148
59845+:1005E0000E00049300000000960300083C0608007B
59846+:1005F00094C64B5E8E0400188F8200209605000C76
59847+:1006000000031C0000661825AC440000AC45000443
59848+:1006100024040001AC400008AC40000CAC400010C9
59849+:10062000AC400014AC4000180E0004B8AC43001CF1
59850+:10063000000018210A000164006010210E0003254B
59851+:10064000000000000A000164000010210E000EE905
59852+:1006500000000000000010218FBF00148FB00010B8
59853+:1006600003E0000827BD001827BDFFE0AFB2001867
59854+:100670003C036010AFBF001CAFB10014AFB000105E
59855+:100680008C6450002402FF7F3C1A800000822024EA
59856+:100690003484380C24020037AC6450003C1208004B
59857+:1006A00026524AD8AF42000824020C80AF420024F0
59858+:1006B0003C1B80083C06080024C60324024010218D
59859+:1006C0002404001D2484FFFFAC4600000481FFFDCC
59860+:1006D000244200043C020800244204B03C0108000B
59861+:1006E000AC224AE03C020800244202303C010800EF
59862+:1006F000AC224AE43C020800244201743C03080096
59863+:100700002463032C3C040800248403D83C0508001F
59864+:1007100024A538F03C010800AC224B403C02080004
59865+:10072000244202EC3C010800AC264B243C010800AA
59866+:10073000AC254B343C010800AC234B3C3C01080089
59867+:10074000AC244B443C010800AC224B483C0108005F
59868+:10075000AC234ADC3C010800AC204AE83C0108001C
59869+:10076000AC204AEC3C010800AC204AF03C010800F7
59870+:10077000AC204AF43C010800AC204AF83C010800D7
59871+:10078000AC204AFC3C010800AC204B003C010800B6
59872+:10079000AC244B043C010800AC204B083C01080091
59873+:1007A000AC204B0C3C010800AC204B103C01080075
59874+:1007B000AC204B143C010800AC204B183C01080055
59875+:1007C000AC264B1C3C010800AC264B203C01080029
59876+:1007D000AC254B303C010800AC234B380E000623FF
59877+:1007E000000000003C028000344200708C42000097
59878+:1007F000AF8200143C0308008C6300208F82000449
59879+:10080000104300043C0280000E00045BAF83000430
59880+:100810003C028000344600703C0308008C6300A05A
59881+:100820003C0208008C4200A4104300048F84001492
59882+:100830003C010800AC2300A4A743009E8CCA000022
59883+:100840003C0308008C6300BC3C0208008C4200B8EA
59884+:100850000144202300641821000040210064202B63
59885+:1008600000481021004410213C010800AC2300BCCA
59886+:100870003C010800AC2200B88F5100003222000772
59887+:100880001040FFDCAF8A00148CC600003C05080055
59888+:100890008CA500BC3C0408008C8400B800CA30233E
59889+:1008A00000A628210000102100A6302B0082202164
59890+:1008B00000862021322700013C010800AC2500BC45
59891+:1008C0003C010800AC2400B810E0001F32220002F6
59892+:1008D0008F420100AF4200208F420104AF4200A8C6
59893+:1008E0009342010B0E0000C6305000FF2E02001E86
59894+:1008F00054400004001010800E0000C90A000213CA
59895+:1009000000000000005210218C4200000040F80955
59896+:1009100000000000104000053C0240008F4301042D
59897+:100920003C026020AC4300143C024000AF4201385E
59898+:100930003C0208008C420034244200013C010800C3
59899+:10094000AC220034322200021040000E3222000499
59900+:100950008F4201400E0000C6AF4200200E000295FB
59901+:10096000000000003C024000AF4201783C02080059
59902+:100970008C420038244200013C010800AC220038BF
59903+:10098000322200041040FF983C0280008F42018018
59904+:100990000E0000C6AF4200208F43018024020F00EA
59905+:1009A00014620005000000008F420188A742009CED
59906+:1009B0000A0002483C0240009362000024030050F9
59907+:1009C000304200FF144300083C0240000E00027B4E
59908+:1009D00000000000544000043C0240000E000D7571
59909+:1009E000000000003C024000AF4201B83C02080099
59910+:1009F0008C42003C244200013C010800AC22003C37
59911+:100A00000A0001C83C0280003C0290003442000110
59912+:100A100000822025AF4400208F4200200440FFFECA
59913+:100A20000000000003E00008000000003C0280001D
59914+:100A3000344200010082202503E00008AF4400207A
59915+:100A400027BDFFE0AFB10014AFB0001000808821D7
59916+:100A5000AFBF00180E00025030B000FF9362007D5F
59917+:100A60000220202102028025A370007D8F70007477
59918+:100A70003C0280000E000259020280241600000988
59919+:100A80008FBF00188F4201F80440FFFE24020002CD
59920+:100A9000AF5101C0A34201C43C021000AF4201F8B3
59921+:100AA0008FBF00188FB100148FB0001003E0000852
59922+:100AB00027BD002027BDFFE8AFBF0010974201848B
59923+:100AC0008F440188304202001040000500002821B8
59924+:100AD0000E000FAA000000000A00028D240500018C
59925+:100AE0003C02FF0004800005008218243C02040040
59926+:100AF000506200019362003E240500018FBF001088
59927+:100B000000A0102103E0000827BD0018A360002208
59928+:100B10008F4401400A00025E2405000127BDFFE862
59929+:100B2000AFBF0014AFB0001093620000304400FF6C
59930+:100B300038830020388200300003182B0002102B6D
59931+:100B40000062182410600003240200501482008008
59932+:100B50008FBF001493620005304200011040007CFA
59933+:100B60008FBF0014934201482443FFFF2C6200050D
59934+:100B7000104000788FB00010000310803C03080084
59935+:100B800024634A68004310218C42000000400008A2
59936+:100B9000000000000E0002508F4401408F70000CD6
59937+:100BA0008F4201441602000224020001AF62000CD1
59938+:100BB0000E0002598F4401408F420144145000043A
59939+:100BC0008FBF00148FB000100A000F2027BD00183F
59940+:100BD0008F62000C0A0003040000000097620010FE
59941+:100BE0008F4301443042FFFF1462001A00000000EE
59942+:100BF00024020001A76200108F4202380443001053
59943+:100C00008F4201403C02003F3446F0003C0560004A
59944+:100C10003C04FFC08CA22BBC0044182400461024C6
59945+:100C20000002130200031D82106200390000000060
59946+:100C30008F4202380440FFF7000000008F4201405D
59947+:100C4000AF4202003C021000AF4202380A00032209
59948+:100C50008FBF0014976200100A0003040000000018
59949+:100C60000E0002508F440140976200128F430144EE
59950+:100C70003050FFFF1603000224020001A762001299
59951+:100C80000E0002598F4401408F42014416020004B5
59952+:100C90008FBF00148FB000100A00029127BD00180A
59953+:100CA000976200120A00030400000000976200141B
59954+:100CB0008F4301443042FFFF14620006240200010A
59955+:100CC0008FBF00148FB00010A76200140A00124AF0
59956+:100CD00027BD0018976200141440001D8FBF001438
59957+:100CE0000A00031C00000000976200168F430144B5
59958+:100CF0003042FFFF1462000B240200018FBF00147A
59959+:100D00008FB00010A76200160A000B1227BD001852
59960+:100D10009742007824420004A76200100A000322D0
59961+:100D20008FBF001497620016240300013042FFFFBA
59962+:100D3000144300078FBF00143C0208008C4200706F
59963+:100D4000244200013C010800AC2200708FBF001457
59964+:100D50008FB0001003E0000827BD001827BDFFE892
59965+:100D6000AFBF0014AFB000108F50010093620000BD
59966+:100D700093430109304400FF2402001F106200A5C4
59967+:100D80002862002010400018240200382862000A5F
59968+:100D90001040000C2402000B286200081040002CB8
59969+:100DA00000000000046000E52862000214400028F2
59970+:100DB00024020006106200268FBF00140A00041FE0
59971+:100DC0008FB000101062005E2862000B144000DC3F
59972+:100DD0008FBF00142402000E106200738FB0001049
59973+:100DE0000A00041F00000000106200C028620039E1
59974+:100DF0001040000A2402008024020036106200CA5B
59975+:100E000028620037104000B424020035106200C18F
59976+:100E10008FBF00140A00041F8FB000101062002B57
59977+:100E20002862008110400006240200C82402003914
59978+:100E3000106200B48FBF00140A00041F8FB00010AE
59979+:100E4000106200998FBF00140A00041F8FB00010B9
59980+:100E50003C0208008C420020104000B98FBF0014F3
59981+:100E60000E000493000000008F4201008F830020D9
59982+:100E70009745010C97460108AC6200008F420104BF
59983+:100E80003C04080094844B5E00052C00AC62000416
59984+:100E90008F4201180006340000C43025AC620008FF
59985+:100EA0008F42011C24040001AC62000C9342010A31
59986+:100EB00000A22825AC650010AC600014AC600018DE
59987+:100EC000AC66001C0A0003F58FBF00143C0208004A
59988+:100ED0008C4200201040009A8FBF00140E00049333
59989+:100EE00000000000974401083C03080094634B5E37
59990+:100EF0009745010C000422029746010E8F820020C4
59991+:100F0000000426000083202500052C003C030080FF
59992+:100F100000A6282500832025AC400000AC4000043A
59993+:100F2000AC400008AC40000CAC450010AC400014D4
59994+:100F3000AC400018AC44001C0A0003F42404000177
59995+:100F40009742010C14400015000000009362000558
59996+:100F50003042001014400011000000000E0002504A
59997+:100F6000020020219362000502002021344200107B
59998+:100F70000E000259A36200059362000024030020C2
59999+:100F8000304200FF1043006D020020218FBF00148B
60000+:100F90008FB000100A000FC027BD00180000000D20
60001+:100FA0000A00041E8FBF00143C0208008C4200207F
60002+:100FB000104000638FBF00140E0004930000000077
60003+:100FC0008F4201048F8300209744010C3C050800E8
60004+:100FD00094A54B5EAC6200009762002C00042400D4
60005+:100FE0003042FFFF008220253C02400E00A228254F
60006+:100FF000AC640004AC600008AC60000CAC60001095
60007+:10100000AC600014AC600018AC65001C0A0003F46E
60008+:10101000240400010E00025002002021A7600008F5
60009+:101020000E00025902002021020020210E00025E63
60010+:10103000240500013C0208008C42002010400040C2
60011+:101040008FBF00140E000493000000009742010CB3
60012+:101050008F8300203C05080094A54B5E000214001D
60013+:10106000AC700000AC620004AC6000088F64004CFF
60014+:101070003C02401F00A22825AC64000C8F62005087
60015+:1010800024040001AC6200108F620054AC620014B2
60016+:10109000AC600018AC65001C8FBF00148FB000104E
60017+:1010A0000A0004B827BD0018240200205082002541
60018+:1010B0008FB000100E000F0A020020211040002007
60019+:1010C0008FBF0014020020218FB0001000002821E3
60020+:1010D0000A00025E27BD0018020020218FBF001405
60021+:1010E0008FB000100A00058027BD00189745010C3D
60022+:1010F000020020218FBF00148FB000100A0005A04D
60023+:1011000027BD0018020020218FB000100A0005C57D
60024+:1011100027BD00189345010D020020218FB000105B
60025+:101120000A00060F27BD0018020020218FBF0014FF
60026+:101130008FB000100A0005EB27BD00188FBF001408
60027+:101140008FB0001003E0000827BD00188F4202781E
60028+:101150000440FFFE2402000234840080AF440240B9
60029+:10116000A34202443C02100003E00008AF420278B0
60030+:101170003C04080094844B6A3C0208008C424B7487
60031+:101180003083FFFF000318C000431021AF42003C32
60032+:101190003C0208008C424B70AF4200383C020050C9
60033+:1011A00034420008AF4200300000000000000000A0
60034+:1011B000000000008F420000304200201040FFFD80
60035+:1011C000000000008F4204003C010800AC224B608C
60036+:1011D0008F4204043C010800AC224B643C02002016
60037+:1011E000AF420030000000003C02080094424B680F
60038+:1011F0003C03080094634B6C3C05080094A54B6EBF
60039+:1012000024840001004310213083FFFF3C010800CB
60040+:10121000A4224B683C010800A4244B6A1465000317
60041+:10122000000000003C010800A4204B6A03E0000815
60042+:10123000000000003C05000A27BDFFE80345282107
60043+:101240003C04080024844B50AFBF00100E00051D65
60044+:101250002406000A3C02080094424B523C0308005A
60045+:1012600094634B6E3042000F244200030043180485
60046+:1012700024027FFF0043102B10400002AF83001CAC
60047+:101280000000000D0E00042A000000003C020800CF
60048+:1012900094424B5A8FBF001027BD001803E000088E
60049+:1012A000A74200A23C02000A034210219443000618
60050+:1012B0003C02080094424B5A3C010800A4234B56C0
60051+:1012C000004310238F83001C00021400000214034B
60052+:1012D0000043102B03E000083842000127BDFFE85F
60053+:1012E000AFBF00103C02000A0342102194420006E6
60054+:1012F0003C010800A4224B560E00047700000000B9
60055+:101300005440FFF93C02000A8FBF001003E00008C0
60056+:1013100027BD001827BDFFE8AFBF00100E000477FF
60057+:101320000000000010400003000000000E000485D3
60058+:10133000000000003C0208008C424B608FBF001090
60059+:1013400027430400AF4200383C0208008C424B6443
60060+:1013500027BD0018AF830020AF42003C3C020005CF
60061+:10136000AF42003003E00008AF8000188F82001801
60062+:101370003C0300060002114000431025AF4200303C
60063+:101380000000000000000000000000008F4200008C
60064+:10139000304200101040FFFD27420400AF820020C1
60065+:1013A00003E00008AF8000183C0608008CC64B64C0
60066+:1013B0008F8500188F8300203C02080094424B5A0E
60067+:1013C00027BDFFE024A50001246300202442000182
60068+:1013D00024C70020AFB10014AFB00010AFBF001899
60069+:1013E000AF850018AF8300203C010800A4224B5AAF
60070+:1013F000309000FF3C010800AC274B6404C100089A
60071+:101400000000882104E00006000000003C02080003
60072+:101410008C424B60244200013C010800AC224B602E
60073+:101420003C02080094424B5A3C03080094634B680A
60074+:101430000010202B004310262C42000100441025F0
60075+:10144000144000048F830018240200101462000F5F
60076+:10145000000000000E0004A9241100013C03080054
60077+:1014600094634B5A3C02080094424B681462000398
60078+:10147000000000000E00042A000000001600000317
60079+:10148000000000000E000493000000003C03080070
60080+:1014900094634B5E3C02080094424B5C2463000161
60081+:1014A0003064FFFF3C010800A4234B5E148200035C
60082+:1014B000000000003C010800A4204B5E1200000662
60083+:1014C000000000003C02080094424B5AA74200A2D0
60084+:1014D0000A00050B022010210E0004770000000016
60085+:1014E00010400004022010210E00048500000000BE
60086+:1014F000022010218FBF00188FB100148FB0001090
60087+:1015000003E0000827BD00203084FFFF30A5FFFF67
60088+:101510000000182110800007000000003082000148
60089+:101520001040000200042042006518210A00051343
60090+:101530000005284003E000080060102110C00006EC
60091+:1015400024C6FFFF8CA2000024A50004AC8200008A
60092+:101550000A00051D2484000403E0000800000000C8
60093+:1015600010A0000824A3FFFFAC86000000000000CC
60094+:10157000000000002402FFFF2463FFFF1462FFFA53
60095+:101580002484000403E0000800000000240200019D
60096+:10159000AF62000CA7620010A7620012A7620014DD
60097+:1015A00003E00008A76200163082007F034210218A
60098+:1015B0003C08000E004818213C0208008C42002024
60099+:1015C00027BDFFD82407FF80AFB3001CAFB20018BF
60100+:1015D000AFB10014AFB00010AFBF00200080802179
60101+:1015E00030B100FF0087202430D200FF1040002FD0
60102+:1015F00000009821AF44002C9062000024030050AA
60103+:10160000304200FF1443000E000000003C020800BE
60104+:101610008C4200E00202102100471024AF42002C4F
60105+:101620003C0208008C4200E0020210213042007FA0
60106+:101630000342102100481021944200D43053FFFF90
60107+:101640000E000493000000003C02080094424B5E30
60108+:101650008F8300200011340000C2302500122C00BE
60109+:101660003C02400000C2302534A50001AC700000EF
60110+:101670008FBF0020AC6000048FB20018AC7300086C
60111+:101680008FB10014AC60000C8FB3001CAC6500106F
60112+:101690008FB00010AC60001424040001AC6000188E
60113+:1016A00027BD00280A0004B8AC66001C8FBF0020CC
60114+:1016B0008FB3001C8FB200188FB100148FB00010D0
60115+:1016C00003E0000827BD00289343010F2402001007
60116+:1016D0001062000E2865001110A0000724020012FD
60117+:1016E000240200082405003A1062000600003021A0
60118+:1016F00003E0000800000000240500351462FFFC30
60119+:10170000000030210A000538000000008F420074FC
60120+:1017100024420FA003E00008AF62000C27BDFFE8E1
60121+:10172000AFBF00100E00025E240500018FBF001045
60122+:1017300024020001A762001227BD00182402000144
60123+:1017400003E00008A360002227BDFFE0AFB1001452
60124+:10175000AFB00010AFBF001830B1FFFF0E00025055
60125+:10176000008080219362003F24030004304200FF88
60126+:101770001443000C02002021122000082402000A59
60127+:101780000E00053100000000936200052403FFFEF7
60128+:1017900000431024A362000524020012A362003F4C
60129+:1017A000020020210E000259A360008116200003D0
60130+:1017B000020020210E0005950000000002002021FB
60131+:1017C000322600FF8FBF00188FB100148FB00010B9
60132+:1017D000240500380A00053827BD002027BDFFE09A
60133+:1017E000AFBF001CAFB20018AFB10014AFB0001013
60134+:1017F0000E000250008080210E0005310000000024
60135+:101800009362003F24120018305100FF123200038F
60136+:101810000200202124020012A362003F936200050F
60137+:101820002403FFFE004310240E000259A3620005AA
60138+:10183000020020212405002016320007000030217C
60139+:101840008FBF001C8FB200188FB100148FB0001032
60140+:101850000A00025E27BD00208FBF001C8FB2001857
60141+:101860008FB100148FB00010240500390A0005382C
60142+:1018700027BD002027BDFFE8AFB00010AFBF0014A8
60143+:101880009742010C2405003600808021144000108E
60144+:10189000304600FF0E00025000000000240200123B
60145+:1018A000A362003F93620005344200100E00053130
60146+:1018B000A36200050E00025902002021020020212F
60147+:1018C0000E00025E240500200A000604000000004D
60148+:1018D0000E000538000000000E000250020020211A
60149+:1018E000936200232403FF9F020020210043102461
60150+:1018F0008FBF00148FB00010A36200230A000259AA
60151+:1019000027BD001827BDFFE0AFBF0018AFB100141E
60152+:10191000AFB0001030B100FF0E00025000808021F7
60153+:10192000240200120E000531A362003F0E0002598E
60154+:101930000200202102002021022030218FBF001848
60155+:101940008FB100148FB00010240500350A0005384F
60156+:1019500027BD0020A380002C03E00008A380002DF9
60157+:101960008F4202780440FFFE8F820034AF42024073
60158+:1019700024020002A34202443C02100003E00008DB
60159+:10198000AF4202783C0360008C6254003042000891
60160+:101990001440FFFD000000008C625408AF82000C70
60161+:1019A00024020052AC605408AC645430AC6254342D
60162+:1019B0002402000803E00008AC6254003C0260000E
60163+:1019C0008C42540030420008104000053C03600087
60164+:1019D0008C625400304200081440FFFD00000000FB
60165+:1019E0008F83000C3C02600003E00008AC43540805
60166+:1019F00090A3000024020005008040213063003FD6
60167+:101A000000004821146200050000502190A2001C33
60168+:101A100094A3001E304900FF306AFFFFAD00000CA8
60169+:101A2000AD000010AD000024950200148D05001CCF
60170+:101A30008D0400183042FFFF0049102300021100FE
60171+:101A4000000237C3004038210086202300A2102B5B
60172+:101A50000082202300A72823AD05001CAD04001838
60173+:101A6000A5090014A5090020A50A001603E0000836
60174+:101A7000A50A00228F4201F80440FFFE2402000262
60175+:101A8000AF4401C0A34201C43C02100003E00008BF
60176+:101A9000AF4201F83C0208008C4200B427BDFFE8C9
60177+:101AA000AFBF001424420001AFB000103C01080099
60178+:101AB000AC2200B48F4300243C02001F30AA00FF78
60179+:101AC0003442FF8030D800FF006280240080F8217B
60180+:101AD00030EF00FF1158003B01405821240CFF80DB
60181+:101AE0003C19000A3163007F000310C00003194055
60182+:101AF000006218213C0208008C4200DC25680001CD
60183+:101B0000310D007F03E21021004310213043007F9C
60184+:101B100003431821004C102400794821AF420024CF
60185+:101B20008D220024016C1824006C7026AD22000C5C
60186+:101B30008D220024310800FFAD22001095220014F0
60187+:101B4000952300208D27001C3042FFFF3063FFFFEC
60188+:101B50008D2600180043102300021100000227C345
60189+:101B60000040282100C4302300E2102B00C23023A3
60190+:101B700000E53823AD27001CAD2600189522002073
60191+:101B8000A522001495220022154B000AA52200165A
60192+:101B90008D2300248D220008254600013145008058
60193+:101BA0001462000430C4007F108F000238AA008045
60194+:101BB00000C0502151AF000131C800FF1518FFC906
60195+:101BC000010058218F8400343082007F03421821A5
60196+:101BD0003C02000A006218212402FF8000822024B7
60197+:101BE000AF440024A06A0079A06A00838C62005090
60198+:101BF0008F840034AC6200708C6500743C027FFFFF
60199+:101C00003442FFFF00A228240E00066BAC6500746E
60200+:101C1000AF5000248FBF00148FB0001003E0000805
60201+:101C200027BD001827BDFFC0AFBE0038AFB70034D6
60202+:101C3000AFB5002CAFB20020AFB1001CAFB00018A0
60203+:101C4000AFBF003CAFB60030AFB40028AFB3002444
60204+:101C50008F4500248F4600288F43002C3C02001F34
60205+:101C60003442FF800062182400C230240080A82182
60206+:101C7000AFA3001400A2F0240E00062FAFA60010A0
60207+:101C80003C0208008C4200E02410FF8003608821A1
60208+:101C900002A2102100501024AF4200243C02080090
60209+:101CA0008C4200E002A210213042007F0342182142
60210+:101CB0003C02000A00629021924200D293630084A9
60211+:101CC000305700FF306300FF24020001106200342F
60212+:101CD000036020212402000214620036000000008C
60213+:101CE0000E001216024028219223008392220083C4
60214+:101CF0003063007F3042007F000210C000031940B3
60215+:101D0000006218213C0208008C4200DC02A2102173
60216+:101D10000043382100F01024AF42002892250078BB
60217+:101D20009224008330E2007F034218213C02000C21
60218+:101D300014850007006280212402FFFFA24200F107
60219+:101D40002402FFFFA64200F20A0007272402FFFF39
60220+:101D500096020020A24200F196020022A64200F262
60221+:101D60008E020024AE4200F492220083A24200F0D0
60222+:101D70008E4200C8AE4200FC8E4200C4AE4200F863
60223+:101D80008E220050AE4201008E4200CCAE420104D1
60224+:101D9000922200853042003F0A0007823442004010
60225+:101DA0000E00123902402821922200850A00078283
60226+:101DB0003042003F936200852403FFDF3042003F42
60227+:101DC000A36200859362008500431024A36200850E
60228+:101DD0009363008393620078307400FF304200FF09
60229+:101DE00010540036240AFF803C0C000C3283007F24
60230+:101DF000000310C000031940006218213C020800D3
60231+:101E00008C4200DC268800013109007F02A21021EB
60232+:101E10000043382130E2007F0342182100EA1024F9
60233+:101E2000AF420028006C80218E020024028A182410
60234+:101E3000006A5826AE02000C8E020024310800FF12
60235+:101E4000AE02001096020014960300208E07001CBC
60236+:101E50003042FFFF3063FFFF8E060018004310235F
60237+:101E600000021100000227C30040282100C43023D3
60238+:101E700000E2102B00C2302300E53823AE07001C1F
60239+:101E8000AE06001896020020A60200149602002258
60240+:101E9000A602001692220079304200FF105400077B
60241+:101EA0000000000051370001316800FF92220078E5
60242+:101EB000304200FF1448FFCD0100A0219222008390
60243+:101EC000A22200798E2200500A0007E2AE220070A2
60244+:101ED000A22200858E22004C2405FF80AE42010C18
60245+:101EE0009222008534420020A2220085924200D135
60246+:101EF0003C0308008C6300DC305400FF3C02080007
60247+:101F00008C4200E400143140001420C002A31821C8
60248+:101F100000C4202102A210210064382100461021B3
60249+:101F20000045182400E52824AF450028AF43002CC5
60250+:101F30003042007F924400D030E3007F03422821EA
60251+:101F4000034318213C02000C006280213C02000E79
60252+:101F5000309600FF00A298211296002A000000008F
60253+:101F60008E02000C02002021026028211040002572
60254+:101F7000261000280E00064A000000009262000DA4
60255+:101F800026830001307400FF3042007FA262000D02
60256+:101F90002404FF801697FFF0267300203C020800FF
60257+:101FA0008C4200DC0000A02102A210210044102479
60258+:101FB000AF4200283C0208008C4200E43C030800C9
60259+:101FC0008C6300DC02A2102100441024AF42002CDC
60260+:101FD0003C0208008C4200E402A318213063007F19
60261+:101FE00002A210213042007F034220210343182126
60262+:101FF0003C02000C006280213C02000E0A0007A493
60263+:10200000008298218E4200D8AE2200508E4200D825
60264+:10201000AE22007092250083924600D19223008365
60265+:10202000924400D12402FF8000A228243063007F64
60266+:10203000308400FF00A628250064182A10600002E2
60267+:1020400030A500FF38A50080A2250083A2250079D5
60268+:102050000E00063D000000009222007E02A020211A
60269+:10206000A222007A8E2300743C027FFF3442FFFFDD
60270+:10207000006218240E00066BAE2300748FA20010BD
60271+:10208000AF5E00248FBF003CAF4200288FBE0038F7
60272+:102090008FA200148FB700348FB600308FB5002C9C
60273+:1020A0008FB400288FB300248FB200208FB1001CA2
60274+:1020B0008FB0001827BD004003E00008AF42002C9D
60275+:1020C00090A2000024420001A0A200003C030800EE
60276+:1020D0008C6300F4304200FF1443000F0080302175
60277+:1020E000A0A000003C0208008C4200E48F84003471
60278+:1020F000008220213082007F034218213C02000C24
60279+:10210000006218212402FF8000822024ACC300005A
60280+:1021100003E00008AF4400288C8200002442002025
60281+:1021200003E00008AC82000094C200003C080800F4
60282+:10213000950800CA30E7FFFF008048210102102106
60283+:10214000A4C2000094C200003042FFFF00E2102B46
60284+:1021500054400001A4C7000094A200003C03080002
60285+:102160008C6300CC24420001A4A2000094A20000D1
60286+:102170003042FFFF544300078F8600280107102BD1
60287+:10218000A4A000005440000101003821A4C70000B1
60288+:102190008F8600288CC4001CAF44003C94A2000031
60289+:1021A0008F43003C3042FFFF000210C00062182144
60290+:1021B000AF43003C8F42003C008220231880000483
60291+:1021C000000000008CC200180A00084324420001ED
60292+:1021D0008CC20018AF4200383C020050344200105C
60293+:1021E000AF420030000000000000000000000000CE
60294+:1021F0008F420000304200201040FFFD0000000030
60295+:102200008F420404AD2200048F420400AD2200007E
60296+:102210003C020020AF42003003E000080000000054
60297+:1022200027BDFFE0AFB20018AFB10014AFB000108F
60298+:10223000AFBF001C94C2000000C080213C12080007
60299+:10224000965200C624420001A60200009603000038
60300+:1022500094E2000000E03021144300058FB100300B
60301+:102260000E000818024038210A000875000000001E
60302+:102270008C8300048C820004244200400461000727
60303+:10228000AC8200048C8200040440000400000000C2
60304+:102290008C82000024420001AC8200009602000003
60305+:1022A0003042FFFF50520001A600000096220000BD
60306+:1022B00024420001A62200008F82002896230000FD
60307+:1022C00094420016144300048FBF001C2402000136
60308+:1022D000A62200008FBF001C8FB200188FB100141F
60309+:1022E0008FB0001003E0000827BD00208F89002870
60310+:1022F00027BDFFE0AFBF00188D220028274804004B
60311+:1023000030E700FFAF4200388D22002CAF8800304C
60312+:10231000AF42003C3C020005AF420030000000002C
60313+:1023200000000000000000000000000000000000AD
60314+:10233000000000008C82000C8C82000CAD020000BA
60315+:102340008C820010AD0200048C820018AD020008DF
60316+:102350008C82001CAD02000C8CA20014AD02001097
60317+:102360008C820020AD02001490820005304200FFF4
60318+:1023700000021200AD0200188CA20018AD02001C71
60319+:102380008CA2000CAD0200208CA20010AD02002433
60320+:102390008CA2001CAD0200288CA20020AD02002CF3
60321+:1023A000AD060030AD000034978300263402FFFFF5
60322+:1023B00014620002006020213404FFFF10E00011CD
60323+:1023C000AD04003895230036952400362402000120
60324+:1023D0003063FFFF000318C20069182190650040B8
60325+:1023E000308400070082100400451025A0620040E0
60326+:1023F0008F820028944200563042FFFF0A0008DC1A
60327+:10240000AD02003C952300369524003624020001DD
60328+:102410003063FFFF000318C2006918219065004077
60329+:1024200030840007008210040002102700451024A9
60330+:10243000A0620040AD00003C000000000000000071
60331+:10244000000000003C02000634420040AF42003071
60332+:102450000000000000000000000000008F420000AB
60333+:10246000304200101040FFFD8F860028AF880030FA
60334+:1024700024C2005624C7003C24C4002824C50032CE
60335+:1024800024C600360E000856AFA200108FBF0018F9
60336+:1024900003E0000827BD00208F8300243C060800CD
60337+:1024A0008CC600E88F82003430633FFF0003198040
60338+:1024B00000461021004310212403FF803046007F96
60339+:1024C00000431024AF420028034618213C02000CB0
60340+:1024D0000062302190C2000D30A500FF00003821BD
60341+:1024E00034420010A0C2000D8F8900288F8A00247A
60342+:1024F00095230036000A13823048000324020001AD
60343+:10250000A4C3000E1102000B2902000210400005B6
60344+:10251000240200021100000C240300010A0009201B
60345+:102520000000182111020006000000000A00092026
60346+:10253000000018218CC2002C0A000920244300014D
60347+:102540008CC20014244300018CC200180043102BDD
60348+:1025500050400009240700012402002714A20003B0
60349+:10256000000000000A00092C240700019522003E0B
60350+:1025700024420001A522003E000A138230430003DA
60351+:102580002C62000210400009008028211460000421
60352+:102590000000000094C200360A00093C3046FFFFEC
60353+:1025A0008CC600380A00093C008028210000302138
60354+:1025B0003C04080024844B780A00088900000000CD
60355+:1025C000274901008D22000C9523000601202021BF
60356+:1025D000000216023046003F3063FFFF240200274E
60357+:1025E00000C0282128C7002810C2000EAF83002495
60358+:1025F00010E00008240200312402002110C200096A
60359+:102600002402002510C200079382002D0A00095BF6
60360+:102610000000000010C200059382002D0A00095B33
60361+:10262000000000000A0008F4000000000A0006266E
60362+:102630000000000095230006912400058D25000C64
60363+:102640008D2600108D2700188D28001C8D29002054
60364+:10265000244200013C010800A4234B7E3C010800F9
60365+:10266000A0244B7D3C010800AC254B843C010800B4
60366+:10267000AC264B883C010800AC274B903C0108007D
60367+:10268000AC284B943C010800AC294B9803E00008AF
60368+:10269000A382002D8F87002827BDFFC0AFB3003471
60369+:1026A000AFB20030AFB1002CAFB00028AFBF0038E0
60370+:1026B0003C0208008C4200D094E3003030B0FFFFB1
60371+:1026C000005010073045FFFF3063FFFF00C0982126
60372+:1026D000A7A200103C110800963100C614A3000602
60373+:1026E0003092FFFF8CE2002424420030AF42003CD5
60374+:1026F0000A0009948CE2002094E200323042FFFF8D
60375+:1027000054A2000827A400188CE2002C24420030B8
60376+:10271000AF42003C8CE20028AF4200380A0009A218
60377+:102720008F84002827A5001027A60020022038212A
60378+:102730000E000818A7A000208FA200182442003025
60379+:10274000AF4200388FA2001CAF42003C8F840028AB
60380+:102750003C020005AF42003094820034274304005D
60381+:102760003042FFFF0202102B14400007AF830030FD
60382+:1027700094820054948300340202102100431023F9
60383+:102780000A0009B63043FFFF94830054948200345A
60384+:102790000223182100501023006218233063FFFF2A
60385+:1027A000948200163042FFFF144300030000000033
60386+:1027B0000A0009C424030001948200163042FFFF7E
60387+:1027C0000043102B104000058F82003094820016C9
60388+:1027D000006210233043FFFF8F820030AC530000B3
60389+:1027E000AC400004AC520008AC43000C3C020006B4
60390+:1027F00034420010AF420030000000000000000032
60391+:10280000000000008F420000304200101040FFFD29
60392+:10281000001018C2006418219065004032040007BF
60393+:10282000240200018FBF00388FB300348FB2003014
60394+:102830008FB1002C8FB000280082100400451025B5
60395+:1028400027BD004003E00008A062004027BDFFA8AC
60396+:10285000AFB60050AFB5004CAFB40048AFB30044C2
60397+:10286000AFB1003CAFBF0054AFB20040AFB00038D2
60398+:102870008C9000003C0208008C4200E88F860034F7
60399+:10288000960300022413FF8000C2302130633FFF13
60400+:102890000003198000C3382100F3102490B2000017
60401+:1028A000AF42002C9203000230E2007F034230214D
60402+:1028B0003C02000E00C28821306300C024020040A8
60403+:1028C0000080A82100A0B021146200260000A021F1
60404+:1028D0008E3400388E2200181440000224020001B9
60405+:1028E000AE2200189202000D304200201440001564
60406+:1028F0008F8200343C0308008C6300DC001238C077
60407+:10290000001231400043102100C730210046382119
60408+:1029100030E300073C02008030E6007800C230253A
60409+:102920000343182100F31024AF4208002463090078
60410+:10293000AF4608108E2200188C6300080043102157
60411+:10294000AE2200188E22002C8E2300182442000193
60412+:102950000062182B1060003D000000000A000A7899
60413+:1029600000000000920300022402FFC00043102474
60414+:10297000304200FF1440000524020001AE2200187E
60415+:10298000962200360A000A613054FFFF8E2200149E
60416+:1029900024420001AE22001892020000000216003C
60417+:1029A0000002160304410029000000009602000204
60418+:1029B00027A4001000802821A7A20016960200027A
60419+:1029C00024070001000030213042FFFFAF820024C5
60420+:1029D0000E000889AFA0001C960300023C0408000A
60421+:1029E0008C8400E88F82003430633FFF000319803D
60422+:1029F00000441021004310213043007F3C05000CAF
60423+:102A00000053102403431821AF4200280065182109
60424+:102A10009062000D001221403042007FA062000D44
60425+:102A20003C0308008C6300E48F82003400431021D3
60426+:102A30000044382130E2007F03421021004510217C
60427+:102A400000F31824AF430028AEA200009222000D2C
60428+:102A5000304200101040001302A020218F83002874
60429+:102A60008EA40000028030219462003E2442FFFFC9
60430+:102A7000A462003E948400029625000E3084FFFF7D
60431+:102A80000E00097330A5FFFF8F82002894430034A5
60432+:102A90009622000E1443000302A02021240200010C
60433+:102AA000A382002C02C028210E0007FE00000000B7
60434+:102AB0008FBF00548FB600508FB5004C8FB40048C4
60435+:102AC0008FB300448FB200408FB1003C8FB000380C
60436+:102AD00003E0000827BD00588F82002827BDFFD0E3
60437+:102AE000AFB40028AFB20020AFBF002CAFB30024BA
60438+:102AF000AFB1001CAFB00018904400D0904300D19B
60439+:102B00000000A021309200FFA3A30010306300FF5B
60440+:102B10008C5100D88C5300DC1072002B2402000171
60441+:102B20003C0308008C6300E493A400108F820034FF
60442+:102B30002406FF800004214000431021004410219E
60443+:102B40003043007F00461024AF4200280343182181
60444+:102B50003C02000C006218218C62000427A40014BF
60445+:102B600027A50010022280210270102304400015C6
60446+:102B7000AFA300149062000D00C21024304200FF89
60447+:102B800014400007020088219062000D344200408A
60448+:102B90000E0007FEA062000D0A000ABD93A20010FD
60449+:102BA0000E0009E1241400018F830028AC7000D8C6
60450+:102BB00093A20010A06200D193A200101452FFD87B
60451+:102BC0000000000024020001168200048FBF002CC8
60452+:102BD0000E000626000000008FBF002C8FB40028D6
60453+:102BE0008FB300248FB200208FB1001C8FB000186B
60454+:102BF00003E0000827BD003027BDFFD8AFB3001C9D
60455+:102C0000AFB20018AFB10014AFB00010AFBF0020DA
60456+:102C10000080982100E0802130B1FFFF0E00049376
60457+:102C200030D200FF000000000000000000000000A3
60458+:102C30008F820020AC510000AC520004AC5300085D
60459+:102C4000AC40000CAC400010AC400014AC4000188C
60460+:102C50003C03080094634B5E02038025AC50001CCB
60461+:102C6000000000000000000000000000240400013B
60462+:102C70008FBF00208FB3001C8FB200188FB10014DB
60463+:102C80008FB000100A0004B827BD002827BDFFE858
60464+:102C9000AFB00010AFBF001430A5FFFF30C600FF7B
60465+:102CA0000080802124020C80AF420024000000003C
60466+:102CB0000000000000000000000000000000000014
60467+:102CC0000E000ACC000000003C040800248400E050
60468+:102CD0008C8200002403FF808FBF001402021021A9
60469+:102CE00000431024AF4200248C8200003C03000A01
60470+:102CF000020280213210007F035010218FB000109B
60471+:102D00000043102127BD001803E00008AF8200280F
60472+:102D100027BDFFE8AFBF00108F4401403C0308000F
60473+:102D20008C6300E02402FF80AF840034008318210C
60474+:102D300000621024AF4200243C02000803424021FC
60475+:102D4000950500023063007F3C02000A034318210E
60476+:102D50000062182130A5FFFF3402FFFF0000302180
60477+:102D60003C07602010A20006AF8300282402FFFF6A
60478+:102D7000A5020002946500D40E000AF130A5FFFF01
60479+:102D80008FBF001024020C8027BD001803E000084C
60480+:102D9000AF4200243C020008034240219502000299
60481+:102DA0003C0A0800954A00C63046FFFF14C00007E1
60482+:102DB0003402FFFF8F8200288F8400343C0760209C
60483+:102DC000944500D40A000B5A30A5FFFF10C200241E
60484+:102DD0008F87002894E2005494E400163045FFFFEA
60485+:102DE00000A6102300A6182B3089FFFF10600004F6
60486+:102DF0003044FFFF00C51023012210233044FFFFA1
60487+:102E0000008A102B1040000C012A1023240200011C
60488+:102E1000A50200162402FFFFA502000294E500D4DB
60489+:102E20008F8400340000302130A5FFFF3C07602074
60490+:102E30000A000AF1000000000044102A10400008B7
60491+:102E4000000000009502001630420001104000040E
60492+:102E5000000000009742007E24420014A5020016E4
60493+:102E600003E00008000000008F84002827BDFFE079
60494+:102E7000AFBF0018948200349483003E1060001AA3
60495+:102E80003048FFFF9383002C2402000114620027C6
60496+:102E90008FBF00188F820028000818C23108000771
60497+:102EA000006218212447003A244900542444002099
60498+:102EB000244500302446003490620040304200FF38
60499+:102EC0000102100730420001104000168FBF0018A9
60500+:102ED0000E000856AFA900108F82002894420034DB
60501+:102EE0000A000B733048FFFF94830036948200344D
60502+:102EF0001043000E8FBF001894820036A482003465
60503+:102F000094820056A48200548C82002CAC8200244F
60504+:102F100094820032A48200309482003CA482003A61
60505+:102F20008FBF00180A000B3327BD002003E0000804
60506+:102F300027BD002027BDFFE8AFBF00108F4A01006A
60507+:102F40003C0508008CA500E03C02080090424B8440
60508+:102F50003C0C0800958C4B7E01452821304B003FEE
60509+:102F600030A2007F03424021396900323C02000A4E
60510+:102F70003963003F2C630001010240212D2900012B
60511+:102F80002402FF8000A2282401234825AF8A0034B0
60512+:102F900000801821AF450024000030210080282146
60513+:102FA00024070001AF8800283C04080024844B78E3
60514+:102FB000AF8C002415200007A380002D24020020E0
60515+:102FC0005562000F006020213402FFFF5582000C83
60516+:102FD000006020212402002015620005000000008E
60517+:102FE0008C6300142402FFFF106200070000000041
60518+:102FF0000E000889000000000A000BD0000000004D
60519+:103000000E0008F4016028210E000B68000000008B
60520+:103010008FBF001024020C8027BD001803E00008B9
60521+:10302000AF4200243C0208008C4200E027BDFFA014
60522+:10303000AFB1003C008210212411FF80AFBE0058C8
60523+:10304000AFB70054AFB20040AFB00038AFBF005CC4
60524+:10305000AFB60050AFB5004CAFB40048AFB30044BA
60525+:10306000005110248F4800248F4900288F470028E2
60526+:10307000AF4200243C0208008C4200E00080902116
60527+:1030800024060006008210213042007F03421821EE
60528+:103090003C02000A006280213C02001F3442FF8093
60529+:1030A00000E2382427A40010260500F00122F024B5
60530+:1030B0000102B8240E00051DAFA700308FA2001832
60531+:1030C000AE0200C48FA2001CAE0200C88FA2002472
60532+:1030D000AE0200CC93A40010920300D12402FF8022
60533+:1030E0000082102400431025304900FF3083007F08
60534+:1030F0003122007F0062102A10400004000310C03B
60535+:1031000001311026304900FF000310C000031940B0
60536+:10311000006218213C0208008C4200DC920400D2BC
60537+:10312000024210210043102100511024AF42002818
60538+:1031300093A300103063007F000310C00003194008
60539+:10314000006218213C0208008C4200DC024210217F
60540+:10315000004310213042007F034218213C02000C42
60541+:10316000006240218FA300142402FFFF1062003090
60542+:10317000309500FF93A2001195030014304400FF26
60543+:103180003063FFFF0064182B1060000D000000008A
60544+:10319000950400148D07001C8D0600183084FFFF75
60545+:1031A00000442023000421000000102100E4382105
60546+:1031B00000E4202B00C230210A000C4A00C4302158
60547+:1031C000950400148D07001C8D0600183084FFFF45
60548+:1031D000008220230004210000001021008018211B
60549+:1031E00000C2302300E4202B00C4302300E3382346
60550+:1031F000AD07001CAD06001893A20011A502001433
60551+:1032000097A20012A50200168FA20014AD020010B2
60552+:103210008FA20014AD02000C93A20011A5020020A1
60553+:1032200097A20012A50200228FA20014AD02002472
60554+:103230002406FF80024610243256007FAF4200244D
60555+:10324000035618213C02000A006280218E02004CC5
60556+:103250008FA200203124007F000428C0AE0200505D
60557+:103260008FA200200004214000852821AE020070BA
60558+:1032700093A2001001208821A202008393A20010D3
60559+:10328000A2020079920200853042003FA20200852E
60560+:103290003C0208008C4200DC024210210045102153
60561+:1032A00000461024AF42002C3C0208008C4200E48F
60562+:1032B0003C0308008C6300DC024210210044102112
60563+:1032C00000461024AF4200283C0208008C4200E473
60564+:1032D00002431821006518210242102100441021E8
60565+:1032E0003042007F3063007F93A50010034220210D
60566+:1032F000034318213C02000E006240213C02000CF6
60567+:1033000010B1008C008248213233007F1660001912
60568+:103310002404FF803C0208008C4200DC02421021A1
60569+:1033200000441024AF42002C3C0208008C4200E410
60570+:103330003C0308008C6300DC02421021004410248E
60571+:10334000AF4200283C0208008C4200E402431821EE
60572+:103350003063007F024210213042007F034220216F
60573+:10336000034318213C02000E006240213C02000C85
60574+:10337000008248219124000D2414FF8000001021B8
60575+:1033800000942025A124000D950400029505001449
60576+:103390008D07001C3084FFFF30A5FFFF8D0600184D
60577+:1033A000008520230004210000E4382100C23021E0
60578+:1033B00000E4202B00C43021AD07001CAD0600182E
60579+:1033C00095020002A5020014A50000168D02000857
60580+:1033D000AD0200108D020008AD02000C9502000243
60581+:1033E000A5020020A50000228D020008AD020024E5
60582+:1033F0009122000D30420040104000422622000180
60583+:103400003C0208008C4200E0A3B300283C10000AF4
60584+:103410000242102100541024AF4200243C02080054
60585+:103420008C4200E0A380002C27A4002C0242102133
60586+:103430003042007F03421821007018218C6200D8AE
60587+:103440008D26000427A50028AFA9002C00461021D6
60588+:10345000AC6200D80E0009E1AF83002893A30028D6
60589+:103460008F8200280E000626A04300D10E000B68B4
60590+:103470000000000002541024AF4200243C02080067
60591+:103480008C4200DC00132940001320C000A420213E
60592+:10349000024210210044102100541024AF42002C9D
60593+:1034A0003C0208008C4200E43C0308008C6300DC12
60594+:1034B00003563021024210210045102100541024EF
60595+:1034C000AF4200283C0208008C4200E4024318216D
60596+:1034D0000064182102421021004510213042007F73
60597+:1034E0003063007F03422021034318213C02000E79
60598+:1034F000006240213C02000C00D080210082482163
60599+:10350000262200013043007F14750005304400FF7F
60600+:103510002403FF800223102400431026304400FFC0
60601+:1035200093A2001000808821250800281444FF760B
60602+:103530002529002093A400108FA300142402FFFF6C
60603+:103540001062000A308900FF2482000124830001F8
60604+:103550003042007F14550005306900FF2403FF80CE
60605+:103560000083102400431026304900FF92020078A7
60606+:10357000305300FF11330032012088213C02080043
60607+:103580008C4200DC3225007F000520C00005294068
60608+:1035900000A42021024210212406FF8000441021B3
60609+:1035A00000461024AF42002C3C0308008C6300DC72
60610+:1035B0003C0208008C4200E4024318210242102120
60611+:1035C0000045102100641821004610243063007F5C
60612+:1035D000AF420028034318213C02000E0062402144
60613+:1035E0003C0208008C4200E48D06000C0100202102
60614+:1035F00002421021004510213042007F0342182171
60615+:103600003C02000C0062482110C0000D012028215E
60616+:103610000E00064A000000002402FF800222182447
60617+:1036200026240001006228263082007F1455000203
60618+:10363000308300FF30A300FF1473FFD000608821A7
60619+:103640008E0300743C027FFF3442FFFF00621824A7
60620+:10365000AE0300740E00066B02402021AF57002419
60621+:103660008FA20030AF5E00288FBF005C8FBE005875
60622+:103670008FB700548FB600508FB5004C8FB4004800
60623+:103680008FB300448FB200408FB1003C8FB0003840
60624+:1036900027BD006003E00008AF42002C27BDFFD823
60625+:1036A000AFB1001CAFBF0020AFB000182751018898
60626+:1036B000922200032408FF803C03000A3047007F69
60627+:1036C000A3A700108F4601803C0208008C4200E056
60628+:1036D000AF86003400C2282100A81024AF42002485
60629+:1036E0009224000030A2007F0342102100431021E9
60630+:1036F000AF8200283084007F24020002148200255B
60631+:10370000000719403C0208008C4200E400C210216E
60632+:103710000043282130A2007F0342182100A8102472
60633+:10372000AF4200283C02000C006218219062000D9C
60634+:10373000AFA3001400481025A062000D8FA3001451
60635+:103740009062000D304200405040006A8FBF002060
60636+:103750008F860028A380002C27A400148CC200D8D8
60637+:103760008C63000427A50010004310210E0009E11E
60638+:10377000ACC200D893A300108F8200280E0006264A
60639+:10378000A04300D10E000B68000000000A000E0BE1
60640+:103790008FBF00200E00062F00C020210E00063D26
60641+:1037A000000000003C020008034280219223000137
60642+:1037B0009202007B1443004F8FBF00209222000032
60643+:1037C0003044007F24020004108200172882000584
60644+:1037D00010400006240200052402000310820007A6
60645+:1037E0008FB1001C0A000E0C0000000010820012B5
60646+:1037F0008FBF00200A000E0C8FB1001C92050083C1
60647+:10380000920600788E0700748F84003430A500FF84
60648+:1038100000073E0230C600FF0E00067330E7007F4F
60649+:103820000A000E0B8FBF00200E000BD78F840034D0
60650+:103830000A000E0B8FBF002024020C80AF42002430
60651+:103840009202003E30420040104000200000000084
60652+:103850009202003E00021600000216030441000618
60653+:10386000000000008F8400340E0005A024050093A2
60654+:103870000A000E0B8FBF00209202003F24030018A5
60655+:10388000304200FF1443000C8F84003424050039BB
60656+:103890000E000538000030210E0002508F840034E5
60657+:1038A00024020012A202003F0E0002598F8400344D
60658+:1038B0000A000E0B8FBF0020240500360E000538CD
60659+:1038C000000030210A000E0B8FBF00200E000250B6
60660+:1038D0008F8400349202000534420020A2020005C9
60661+:1038E0000E0002598F8400340E000FC08F84003404
60662+:1038F0008FBF00208FB1001C8FB0001824020C80F5
60663+:1039000027BD002803E00008AF42002427BDFFE8E0
60664+:10391000AFB00010AFBF001427430100946200084D
60665+:103920000002140000021403044100020000802180
60666+:103930002410000194620008304200801040001AF8
60667+:10394000020010219462000830422000104000164E
60668+:10395000020010218C6300183C021C2D344219ED2A
60669+:10396000240600061062000F3C0760213C0208009C
60670+:103970008C4200D4104000078F8200288F830028DB
60671+:10398000906200623042000F34420040A062006248
60672+:103990008F8200288F840034944500D40E000AF1F1
60673+:1039A00030A5FFFF020010218FBF00148FB0001060
60674+:1039B00003E0000827BD001827BDFFE0AFB10014E9
60675+:1039C000AFB00010A380002CAFBF00188F450100DE
60676+:1039D0003C0308008C6300E02402FF80AF850034C4
60677+:1039E00000A318213064007F0344202100621824C2
60678+:1039F0003C02000A00822021AF430024275001002E
60679+:103A00008E0200148C8300DCAF8400280043102356
60680+:103A100018400004000088218E0200140E000A8461
60681+:103A2000AC8200DC9202000B24030002304200FF53
60682+:103A30001443002F0000000096020008304300FFEE
60683+:103A40002402008214620005240200840E00093E54
60684+:103A5000000000000A000E97000000001462000938
60685+:103A6000240200818F8200288F8400343C0760216B
60686+:103A7000944500D49206000530A5FFFF0A000E868B
60687+:103A800030C600FF14620027000000009202000A06
60688+:103A9000304300FF306200201040000430620040DC
60689+:103AA0008F8400340A000E82240600401040000477
60690+:103AB000000316008F8400340A000E8224060041A1
60691+:103AC00000021603044100178F84003424060042CC
60692+:103AD0008F8200283C076019944500D430A5FFFF71
60693+:103AE0000E000AF1000000000A000E97000000001E
60694+:103AF0009202000B24030016304200FF1043000620
60695+:103B0000000000009202000B24030017304200FF67
60696+:103B100014430004000000000E000E11000000001D
60697+:103B2000004088210E000B68000000009202000A8D
60698+:103B3000304200081040000624020C808F850028C7
60699+:103B40003C0400080E0011EE0344202124020C80E6
60700+:103B5000AF4200248FBF0018022010218FB0001048
60701+:103B60008FB1001403E0000827BD002027BDFFE847
60702+:103B7000AFBF0014AFB000108F5000243C0308000A
60703+:103B80008C6300E08F4501002402FF8000A3182110
60704+:103B90003064007F03442021006218243C02000AA4
60705+:103BA00000822021AF850034AF4300249082006260
60706+:103BB000AF8400283042000F34420050A0820062DF
60707+:103BC0003C02001F3442FF800E00062602028024C1
60708+:103BD000AF5000248FBF00148FB0001003E0000826
60709+:103BE00027BD00183C0208008C4200201040001D38
60710+:103BF0002745010090A300093C0200080342202150
60711+:103C000024020018546200033C0200080A000ED887
60712+:103C10002402000803422021240200161462000539
60713+:103C20002402001724020012A082003F0A000EE2C4
60714+:103C300094A700085462000694A700089362000548
60715+:103C40002403FFFE00431024A362000594A700088C
60716+:103C500090A6001B8CA4000094A500060A000ACCC4
60717+:103C600000073C0003E000080000000027440100BA
60718+:103C700094820008304500FF38A3008238A20084F7
60719+:103C80002C6300012C420001006218251060000620
60720+:103C9000240200839382002D1040000D00000000DC
60721+:103CA0000A000B9B0000000014A2000524A2FF8064
60722+:103CB0008F4301043C02602003E00008AC43001481
60723+:103CC000304200FF2C420002104000032402002278
60724+:103CD0000A000E3C0000000014A2000300000000D7
60725+:103CE0000A000EA9000000000A000EC70000000034
60726+:103CF0009363007E9362007A144300090000202140
60727+:103D00009362000024030050304200FF144300047B
60728+:103D1000240400019362007E24420001A362007E1D
60729+:103D200003E00008008010218F4201F80440FFFEEC
60730+:103D300024020002AF4401C0A34201C43C021000AF
60731+:103D400003E00008AF4201F827BDFFE8AFBF001055
60732+:103D50009362003F2403000A304200FF14430046F0
60733+:103D6000000000008F6300548F62004C1062007DE1
60734+:103D7000036030219362000024030050304200FFB2
60735+:103D80001443002F000000008F4401403C02080053
60736+:103D90008C4200E02403FF800082102100431024A5
60737+:103DA000AF4200243C0208008C4200E08F650054C2
60738+:103DB0003C03000A008220213084007F034410214C
60739+:103DC00000431021AC4501089762003C8F63004C12
60740+:103DD0003042FFFF0002104000621821AF63005C18
60741+:103DE0008F6300548F64004C9762003C006418237A
60742+:103DF0003042FFFF00031843000210400043102A26
60743+:103E000010400006000000008F6200548F63004CD9
60744+:103E1000004310230A000F58000210439762003C31
60745+:103E20003042FFFF00021040ACC2006424020001D7
60746+:103E3000A0C0007CA0C2008424020C80AF420024F9
60747+:103E40000E000F0A8F440140104000478FBF001042
60748+:103E50008F4301408F4201F80440FFFE240200021C
60749+:103E6000AF4301C0A34201C43C021000AF4201F8BD
60750+:103E70000A000FA88FBF00109362003F24030010B8
60751+:103E8000304200FF14430004000000008F44014052
60752+:103E90000A000F94000028219362003F24030016BB
60753+:103EA000304200FF1443000424020014A362003FC8
60754+:103EB0000A000FA2000000008F62004C8F630050C8
60755+:103EC00000431023044100288FBF0010936200813B
60756+:103ED00024420001A3620081936200812C4200040D
60757+:103EE00014400010000000009362003F240300040F
60758+:103EF000304200FF14430006000000008F440140E0
60759+:103F00008FBF0010240500930A0005A027BD0018EC
60760+:103F10008F440140240500938FBF00100A00060F54
60761+:103F200027BD00188F4401400E0002500000000021
60762+:103F30008F6200542442FFFFAF6200548F62005032
60763+:103F40002442FFFFAF6200500E0002598F4401402F
60764+:103F50008F4401408FBF0010240500040A00025E58
60765+:103F600027BD00188FBF001003E0000827BD001810
60766+:103F70008F4201889363007E00021402304400FFE8
60767+:103F8000306300FF1464000D0000000093620080A5
60768+:103F9000304200FF1044000900000000A3640080CC
60769+:103FA0009362000024030050304200FF14430004D9
60770+:103FB000000000000A0006D78F440180A36400803F
60771+:103FC00003E000080000000027BDFFE8AFB00010CC
60772+:103FD000AFBF00149362000524030030304200306C
60773+:103FE00014430089008080213C0208008C4200209C
60774+:103FF00010400080020020210E0004930000000009
60775+:104000008F850020ACB000009362003E9363003FB8
60776+:10401000304200FF00021200306300FF0043102511
60777+:10402000ACA2000493620082000216000002160394
60778+:1040300004410005000000003C0308008C630048B8
60779+:104040000A000FE6000000009362003E304200408C
60780+:10405000144000030000182193620081304300FFE8
60781+:104060009362008200031E00304200FF0002140031
60782+:1040700000621825ACA300088F620040ACA2000CBF
60783+:104080008F620048ACA200108F62004CACA20014FA
60784+:104090008F6200508F63004C0043102304410003E3
60785+:1040A000000000000A000FFA8F62004C8F6200507F
60786+:1040B000ACA200183C02080094424B5E3C03C00BCB
60787+:1040C00000002021004310250E0004B8ACA2001C03
60788+:1040D0008F6200548F840020AC8200008F620058F1
60789+:1040E000AC8200048F62005CAC8200088F620060CA
60790+:1040F0008F43007400431021AC82000C8F62006477
60791+:10410000AC820010976300689762006A00031C008D
60792+:104110003042FFFF00621825AC83001493620082D6
60793+:1041200024030080304200FF14430003000000001D
60794+:104130000A00102EAC8000188F63000C24020001CE
60795+:104140001062000E2402FFFF9362003E30420040E6
60796+:104150001440000A2402FFFF8F63000C8F4200749A
60797+:10416000006218233C020800006210241440000280
60798+:10417000000028210060282100051043AC820018AF
60799+:104180003C02080094424B5E3C03C00C000020211E
60800+:10419000004310258F8300200E0004B8AC62001C81
60801+:1041A0008F6200188F8300203C05080094A54B5EA9
60802+:1041B00024040001AC620000AC6000048F66006C57
60803+:1041C0003C02400D00A22825AC6600088F6200DC8E
60804+:1041D000AC62000CAC600010936200050002160097
60805+:1041E000AC620014AC6000180E0004B8AC65001C92
60806+:1041F000020020218FBF00148FB00010A3600005C3
60807+:104200000A00042127BD00188FBF00148FB00010D2
60808+:1042100003E0000827BD00189742007C30C600FF6D
60809+:10422000A08600843047FFFF2402000514C2000B63
60810+:1042300024E3465090A201122C42000710400007D0
60811+:1042400024E30A0090A30112240200140062100467
60812+:1042500000E210210A0010663047FFFF3067FFFFC1
60813+:1042600003E00008A4870014AC87004C8CA201086E
60814+:104270000080402100A0482100E2102330C600FF4A
60815+:104280001840000393AA001324E2FFFCACA201082B
60816+:1042900030C2000110400008000000008D020050F4
60817+:1042A00000E2102304410013240600058D0200548F
60818+:1042B00010E20010000000008D02005414E2001A09
60819+:1042C000000000003C0208008C4200D83042002070
60820+:1042D0001040000A2402000191030078910200833B
60821+:1042E000144300062402000101002021012028219E
60822+:1042F000240600040A00105400000000A1000084FD
60823+:1043000011400009A50200148F4301008F4201F8FB
60824+:104310000440FFFE24020002AF4301C0A34201C4D7
60825+:104320003C021000AF4201F803E00008000000006A
60826+:1043300027BDFFE88FA90028AFBF001000804021F3
60827+:1043400000E918231860007330C600FFA080007CCD
60828+:10435000A08000818CA2010800E210230440004DDF
60829+:10436000000000008C8200509483003C8C84006428
60830+:10437000004748233063FFFF012318210083202BCF
60831+:1043800010800004000000008D0200640A0010B7D5
60832+:1043900000E210219502003C3042FFFF0122102173
60833+:1043A00000E21021AD02005C9502003C8D03005C30
60834+:1043B0003042FFFF0002104000E210210043102BAA
60835+:1043C00010400003000000000A0010C68D02005CCF
60836+:1043D0009502003C3042FFFF0002104000E2102135
60837+:1043E000AD02005CA1000084AD07004C8CA2010866
60838+:1043F00000E210231840000224E2FFFCACA20108F6
60839+:1044000030C200011040000A000000008D02005080
60840+:1044100000E2102304410004010020218D02005419
60841+:1044200014E20003000000000A0010E82406000562
60842+:104430008D02005414E200478FBF00103C020800B8
60843+:104440008C4200D8304200201040000A24020001B3
60844+:1044500091030078910200831443000624020001B6
60845+:1044600001002021240600048FBF00100A00105410
60846+:1044700027BD0018A1000084A50200148F4301008D
60847+:104480008F4201F80440FFFE240200020A00110DD1
60848+:10449000000000008C82005C004910230043102BB8
60849+:1044A00054400001AC87005C9502003C3042FFFFA5
60850+:1044B0000062102B14400007240200029502003C09
60851+:1044C0008D03005C3042FFFF00621821AD03005CE9
60852+:1044D00024020002AD07004CA10200840E000F0A66
60853+:1044E0008F4401001040001B8FBF00108F4301005C
60854+:1044F0008F4201F80440FFFE24020002AF4301C0D6
60855+:10450000A34201C43C021000AF4201F80A0011238B
60856+:104510008FBF001030C200101040000E8FBF00107F
60857+:104520008C83005C9482003C006918233042FFFFBA
60858+:10453000006218213C023FFF3444FFFF0083102B30
60859+:10454000544000010080182101231021AD02005CBD
60860+:104550008FBF001003E0000827BD001827BDFFE84B
60861+:104560008FAA0028AFBF00100080402100EA482336
60862+:104570001920002130C600FF8C83005C8C8200640F
60863+:10458000006A18230043102B5040001000691821C6
60864+:1045900094A2011001221021A4A2011094A20110E2
60865+:1045A0003042FFFF0043102B1440000A3C023FFF43
60866+:1045B00094A2011000431023A4A201109482003C95
60867+:1045C0003042FFFF0A00114200621821A4A001102E
60868+:1045D0003C023FFF3444FFFF0083102B5440000196
60869+:1045E0000080182100671021AD02005CA100007C52
60870+:1045F0000A00118AA100008130C200101040003C66
60871+:10460000000000008C820050004A1023184000383F
60872+:10461000000000009082007C24420001A082007C07
60873+:104620009082007C3C0308008C630024304200FF31
60874+:104630000043102B1440005C8FBF00108CA20108B7
60875+:1046400000E2102318400058000000008C83005442
60876+:104650009482003C006A18233042FFFF0003184395
60877+:10466000000210400043102A104000050000000026
60878+:104670008C820054004A10230A001171000210437A
60879+:104680009482003C3042FFFF00021040AD02006403
60880+:104690009502003C8D0400649503003C3042FFFF0E
60881+:1046A00000021040008220213063FFFF00831821A8
60882+:1046B00001431021AD02005C8D020054ACA2010840
60883+:1046C00024020002A10200840E000F0A8F440100A0
60884+:1046D000104000358FBF00108F4301008F4201F85A
60885+:1046E0000440FFFE240200020A0011B30000000093
60886+:1046F000AD07004C8CA2010800E210231840000214
60887+:1047000024E2FFFCACA2010830C200011040000A04
60888+:10471000000000008D02005000E21023044100045C
60889+:10472000010020218D02005414E20003000000006B
60890+:104730000A0011AA240600058D02005414E2001A92
60891+:104740008FBF00103C0208008C4200D8304200208D
60892+:104750001040000A240200019103007891020083B6
60893+:104760001443000624020001010020212406000455
60894+:104770008FBF00100A00105427BD0018A10000844C
60895+:10478000A50200148F4301008F4201F80440FFFE90
60896+:1047900024020002AF4301C0A34201C43C02100046
60897+:1047A000AF4201F88FBF001003E0000827BD0018DA
60898+:1047B0008FAA00108C8200500080402130C600FF7C
60899+:1047C000004A102300A048211840000700E01821EB
60900+:1047D00024020001A0800084A0A00112A482001481
60901+:1047E0000A001125AFAA0010A0800081AD07004C7F
60902+:1047F0008CA2010800E210231840000224E2FFFC12
60903+:10480000ACA2010830C20001104000080000000006
60904+:104810008D0200500062102304410013240600059D
60905+:104820008D02005410620010000000008D02005440
60906+:1048300014620011000000003C0208008C4200D805
60907+:10484000304200201040000A240200019103007849
60908+:10485000910200831443000624020001010020217C
60909+:1048600001202821240600040A0010540000000042
60910+:10487000A1000084A502001403E00008000000006D
60911+:1048800027BDFFE0AFBF0018274201009046000A95
60912+:104890008C4800148C8B004C9082008430C900FF3F
60913+:1048A00001681823304A00FF1C60001A2D460006DC
60914+:1048B000240200010142100410C00016304300031E
60915+:1048C000012030210100382114600007304C000C19
60916+:1048D00015800009304200301440000B8FBF0018D3
60917+:1048E0000A001214000000000E001125AFAB0010EA
60918+:1048F0000A0012148FBF00180E00109AAFAB001000
60919+:104900000A0012148FBF0018AFAB00100E0011BACE
60920+:10491000AFAA00148FBF001803E0000827BD0020D5
60921+:1049200024020003A08200848C82005403E000086B
60922+:10493000ACA201083C0200080342182190620081E9
60923+:10494000240600433C07601924420001A062008154
60924+:10495000906300813C0208008C4200C0306300FF7D
60925+:10496000146200102403FF803C0208008C4200E027
60926+:104970000082102100431024AF4200243C020800B2
60927+:104980008C4200E03C03000A008210213042007F8C
60928+:104990000342102100431021944500D40A000AF17B
60929+:1049A00030A5FFFF03E000080000000027BDFFE086
60930+:1049B000AFBF0018AFB10014AFB000108F4201803C
60931+:1049C0000080802100A088210E00121B00402021C1
60932+:1049D000A20000848E0200548FBF00188FB0001018
60933+:1049E000AE2201088FB1001403E0000827BD0020AB
60934+:1049F00027BDFFE03C020008AFB00010AFBF0018B9
60935+:104A0000AFB10014034280218F5101409203008412
60936+:104A10008E0400508E02004C14820040306600FF6D
60937+:104A20003C0208008C4200E02403FF800222102197
60938+:104A300000431024AF4200243C0208008C4200E0F6
60939+:104A40009744007C92050081022210213042007FB1
60940+:104A5000034218213C02000A0062182114A0000B36
60941+:104A60003084FFFF2402000554C20014248205DCB8
60942+:104A70009062011224420001A062011224020C8003
60943+:104A8000AF4200240A00127324020005A060011244
60944+:104A90002402000514C20009248205DC9202008170
60945+:104AA0002C4200075040000524820A009203008136
60946+:104AB0002402001400621004008210213044FFFF21
60947+:104AC000A60400140E00121B022020219602003CB6
60948+:104AD0008E03004C022020213042FFFF00021040D4
60949+:104AE000006218210E000250AE03005C9202007DAD
60950+:104AF00002202021344200400E000259A202007D13
60951+:104B00008F4201F80440FFFE24020002AF5101C0B1
60952+:104B1000A34201C43C021000AF4201F88FBF00184D
60953+:104B20008FB100148FB0001003E0000827BD0020F3
60954+:104B300008000ACC08000B1408000B9808000BE4CE
60955+:104B400008000C200A0000280000000000000000FF
60956+:104B50000000000D6370362E322E3300000000007E
60957+:104B60000602030400000000000000000000000036
60958+:104B70000000000000000000000000000000000035
60959+:104B80000000000000000000000000000000002005
60960+:104B90000000000000000000000000000000000015
60961+:104BA0000000000000000000000000000000000005
60962+:104BB00000000000000000000000000000000001F4
60963+:104BC0000000002B000000000000000400030D4066
60964+:104BD00000000000000000000000000000000000D5
60965+:104BE00000000000000000001000000300000000B2
60966+:104BF0000000000D0000000D3C020800244258A4F3
60967+:104C00003C03080024635F70AC4000000043202B8D
60968+:104C10001480FFFD244200043C1D080037BD7FFCCA
60969+:104C200003A0F0213C100800261000A03C1C080046
60970+:104C3000279C58A40E0001AC000000000000000DED
60971+:104C400027BDFFE83C096018AFBF00108D2C500055
60972+:104C5000240DFF7F24080031018D5824356A380C5B
60973+:104C600024070C003C1A8000AD2A50003C04800A46
60974+:104C7000AF4800083C1B8008AF4700240E00091510
60975+:104C8000AF8400100E0008D8000000000E000825B8
60976+:104C9000000000000E001252000000003C046016EC
60977+:104CA0008C8500003C06FFFF3C02535300A61824ED
60978+:104CB0001062004734867C0094C201F2A780002C69
60979+:104CC00010400003A78000CC38581E1EA798002C67
60980+:104CD00094C201F810400004978300CC38591E1E7E
60981+:104CE000A79900CC978300CC2C7F006753E000018C
60982+:104CF000240300669784002C2C82040114400002D7
60983+:104D000000602821240404003C0760008CE904387A
60984+:104D10002403103C3128FFFF1103001F30B9FFFFAF
60985+:104D200057200010A38000CE24020050A38200CEA2
60986+:104D3000939F00CE53E0000FA78500CCA78000CC46
60987+:104D4000978500CC8FBF0010A780002CA78000346F
60988+:104D5000A78000E63C010800AC25008003E00008C5
60989+:104D600027BD0018939F00CE57E0FFF5A78000CC29
60990+:104D7000A78500CC978500CC8FBF0010A784002C9E
60991+:104D8000A7800034A78000E63C010800AC25008025
60992+:104D900003E0000827BD0018A38000CE8CCB003CA8
60993+:104DA000316A00011140000E0000000030A7FFFF33
60994+:104DB00010E0FFDE240200508CCC00C831860001D8
60995+:104DC00014C0FFDC939F00CE0A00007A2402005139
60996+:104DD0008C8F00043C0E60000A00005D01EE302163
60997+:104DE0008CEF0808240D5708000F740211CD000441
60998+:104DF00030B8FFFF240500660A00007B240404008D
60999+:104E00001700FFCC939F00CE0A00007A24020050C6
61000+:104E10008F8600103089FFFF000939408CC30010D5
61001+:104E20003C08005000E82025AF4300388CC5001432
61002+:104E300027420400AF82001CAF45003CAF44003065
61003+:104E40000000000000000000000000000000000062
61004+:104E50000000000000000000000000000000000052
61005+:104E60008F4B0000316A00201140FFFD0000000060
61006+:104E700003E00008000000008F840010948A001AEC
61007+:104E80008C8700243149FFFF000940C000E8302131
61008+:104E9000AF46003C8C8500248F43003C00A31023C8
61009+:104EA00018400029000000008C8B002025620001C2
61010+:104EB0003C0D005035AC0008AF420038AF4C00301C
61011+:104EC00000000000000000000000000000000000E2
61012+:104ED00000000000000000000000000000000000D2
61013+:104EE0008F4F000031EE002011C0FFFD00000000D8
61014+:104EF0008F4A04003C080020AC8A00108F4904044B
61015+:104F0000AC890014AF4800300000000094860018FF
61016+:104F10009487001C00C71821A48300189485001AE8
61017+:104F200024A20001A482001A9498001A9499001EE9
61018+:104F3000133800030000000003E000080000000038
61019+:104F400003E00008A480001A8C8200200A0000DC24
61020+:104F50003C0D00500A0000CD000000003C0308009A
61021+:104F60008C6300208F82001827BDFFE810620008C4
61022+:104F7000AFBF00100E000104AF8300183C0308000F
61023+:104F80008C63002024040001106400048F89001049
61024+:104F90008FBF001003E0000827BD00188FBF00106E
61025+:104FA0003C076012A520000A9528000A34E500108D
61026+:104FB00027BD00183106FFFF03E00008ACA60090F3
61027+:104FC0003C0208008C42002027BDFFC8AFBF003460
61028+:104FD000AFBE0030AFB7002CAFB60028AFB500248D
61029+:104FE000AFB40020AFB3001CAFB20018AFB10014D3
61030+:104FF00010400050AFB000108F840010948600065F
61031+:105000009483000A00C3282330B6FFFF12C0004A71
61032+:105010008FBF003494890018948A000A012A402323
61033+:105020003102FFFF02C2382B14E0000202C020212F
61034+:10503000004020212C8C0005158000020080A0215A
61035+:10504000241400040E0000B3028020218F8700107A
61036+:1050500002809821AF80001494ED000A028088211C
61037+:105060001280004E31B2FFFF3C1770003C1540002B
61038+:105070003C1E60008F8F001C8DEE000001D71824AD
61039+:10508000507500500220202102A3802B160000350D
61040+:105090003C182000507800470220202124100001F5
61041+:1050A0008F83001414600039029158230230F823D2
61042+:1050B0000250C82133F1FFFF1620FFEE3332FFFF0D
61043+:1050C0008F8700103C110020AF510030000000001D
61044+:1050D00094E6000A3C1E601237D5001002662821B3
61045+:1050E000A4E5000A94E2000A94F2000A94F400187D
61046+:1050F0003057FFFF1292003BAEB700908CED0014CA
61047+:105100008CE400100013714001AE4021000E5FC31B
61048+:10511000010E502B008B4821012A1821ACE8001405
61049+:10512000ACE3001002D3382330F6FFFF16C0FFB9FE
61050+:105130008F8400108FBF00348FBE00308FB7002CDB
61051+:105140008FB600288FB500248FB400208FB3001CC9
61052+:105150008FB200188FB100148FB0001003E0000868
61053+:1051600027BD0038107E001B000000001477FFCC24
61054+:10517000241000010E00159B000000008F83001416
61055+:105180001060FFCB0230F823029158238F87001064
61056+:10519000017020210A0001973093FFFF8F830014D4
61057+:1051A0001460FFCB3C110020AF5100300A000163B6
61058+:1051B000000000000E00077D024028210A00015770
61059+:1051C000004080210E00033A024028210A000157C6
61060+:1051D000004080210E001463022020210A000157A4
61061+:1051E000004080210E0000CD000000000A0001797F
61062+:1051F00002D3382327BDFFE8AFB00010AFBF0014C3
61063+:105200000E00003F000000003C028000345000709F
61064+:105210000A0001BA8E0600008F4F000039EE00012F
61065+:1052200031C20001104000248F8600A88E070000C4
61066+:105230003C0C08008D8C003C3C0908008D2900388E
61067+:1052400000E66823018D28210000502100AD302B9D
61068+:10525000012A4021010620213C010800AC25003C28
61069+:10526000AF8700A83C010800AC2400380E000106FE
61070+:10527000000000003C0308008C6300701060FFE633
61071+:10528000006020213C0508008CA500683C06080051
61072+:105290008CC6006C0E00152A000000003C010800BE
61073+:1052A000AC2000708F4F000039EE000131C20001C8
61074+:1052B0001440FFDE8F8600A88E0A00008F8B00A8A6
61075+:1052C0003C0508008CA5003C3C0408008C84003898
61076+:1052D000014B482300A938210082182100E9402B06
61077+:1052E000006810213C010800AC27003C3C0108008C
61078+:1052F000AC2200388F5F01002419FF0024180C0035
61079+:1053000003F9202410980012AF840000AF4400205D
61080+:10531000936D0000240C002031A600FF10CC001279
61081+:10532000240E005010CE00043C194000AF59013843
61082+:105330000A0001B3000000000E0011C800000000C8
61083+:105340003C194000AF5901380A0001B300000000C9
61084+:105350000E00011F000000003C194000AF59013849
61085+:105360000A0001B3000000008F58010000802821CE
61086+:10537000330F00FF01E020210E0002F1AF8F000487
61087+:105380003C194000AF5901380A0001B30000000089
61088+:1053900000A4102B2403000110400009000030215C
61089+:1053A0000005284000A4102B04A0000300031840AF
61090+:1053B0005440FFFC000528405060000A0004182BF0
61091+:1053C0000085382B54E000040003184200C3302548
61092+:1053D00000852023000318421460FFF900052842CD
61093+:1053E0000004182B03E0000800C310218F4201B80D
61094+:1053F0000440FFFE00000000AF4401803C031000A9
61095+:1054000024040040AF450184A3440188A3460189D8
61096+:10541000A747018A03E00008AF4301B83084FFFFCB
61097+:105420000080382130A5FFFF000020210A00022A59
61098+:10543000240600803087FFFF8CA40000240600387B
61099+:105440000A00022A000028218F8300388F8600304E
61100+:105450001066000B008040213C07080024E75A1822
61101+:10546000000328C000A710218C4400002463000121
61102+:10547000108800053063000F5466FFFA000328C04F
61103+:1054800003E00008000010213C07080024E75A1C34
61104+:1054900000A7302103E000088CC200003C0390000C
61105+:1054A0003462000100822025AF4400208F45002097
61106+:1054B00004A0FFFE0000000003E000080000000060
61107+:1054C0003C038000346200010082202503E00008D4
61108+:1054D000AF44002027BDFFE0AFB100143091FFFFC3
61109+:1054E000AFB00010AFBF00181220001300A0802141
61110+:1054F0008CA2000024040002240601401040000F8A
61111+:10550000004028210E000C5C00000000000010216B
61112+:10551000AE000000022038218FBF00188FB10014A8
61113+:105520008FB0001000402021000028210000302111
61114+:105530000A00022A27BD00208CA200000220382188
61115+:105540008FBF00188FB100148FB0001000402021D1
61116+:1055500000002821000030210A00022A27BD002077
61117+:1055600000A010213087FFFF8CA500048C440000B0
61118+:105570000A00022A2406000627BDFFE0AFB0001093
61119+:10558000AFBF0018AFB100149363003E00808021CC
61120+:105590000080282130620040000020211040000FD0
61121+:1055A0008E1100000E000851022020219367000098
61122+:1055B0002404005030E500FF50A400128E0F0000BC
61123+:1055C000022020218FBF00188FB100148FB000106F
61124+:1055D000A762013C0A00091127BD00200E000287C6
61125+:1055E000000000000E0008510220202193670000F7
61126+:1055F0002404005030E500FF14A4FFF20220202113
61127+:105600008E0F00003C1008008E1000503C0D000C66
61128+:10561000240BFF8001F05021314E007F01DA602120
61129+:10562000018D4021014B4824AF4900280220202150
61130+:105630008FBF00188FB100148FB00010A50200D6E4
61131+:1056400027BD00200A000911AF8800D027BDFFE068
61132+:10565000AFBF0018AFB10014AFB0001093660001E7
61133+:10566000008080210E00025630D1000493640005B2
61134+:10567000001029C2A765000034830040A363000521
61135+:105680000E00025F020020210E00091302002021FB
61136+:1056900024020001AF62000C02002821A762001062
61137+:1056A00024040002A762001224060140A76200142D
61138+:1056B0000E000C5CA76200161620000F8FBF0018AA
61139+:1056C000978C00343C0B08008D6B00782588FFFF19
61140+:1056D0003109FFFF256A0001012A382B10E000067E
61141+:1056E000A78800343C0F6006240E001635ED00102C
61142+:1056F000ADAE00508FBF00188FB100148FB00010F6
61143+:1057000003E0000827BD002027BDFFE0AFB1001473
61144+:10571000AFBF0018AFB0001000A088211080000AB1
61145+:105720003C03600024020080108200120000000090
61146+:105730000000000D8FBF00188FB100148FB0001053
61147+:1057400003E0000827BD00208C682BF80500FFFE51
61148+:1057500000000000AC712BC08FBF00188FB1001487
61149+:105760008FB000103C09100027BD002003E00008A6
61150+:10577000AC692BF80E00025600A0202193650005AD
61151+:10578000022020210E00025F30B000FF2403003E03
61152+:105790001603FFE7000000008F4401780480FFFE3D
61153+:1057A000240700073C061000AF51014002202021D1
61154+:1057B000A34701448FBF00188FB100148FB00010B1
61155+:1057C000AF4601780A0002C227BD002027BDFFE8CE
61156+:1057D000AFBF0014AFB000108F50002000000000D9
61157+:1057E0000E000913AF440020AF5000208FBF0014FB
61158+:1057F0008FB0001003E0000827BD00183084FFFFC1
61159+:10580000008038212406003500A020210A00022A49
61160+:10581000000028213084FFFF008038212406003654
61161+:1058200000A020210A00022A0000282127BDFFD065
61162+:10583000AFB3001C3093FFFFAFB50024AFB2001828
61163+:10584000AFBF0028AFB40020AFB10014AFB000105C
61164+:1058500030B5FFFF12600027000090218F90001CE0
61165+:105860008E0300003C0680002402004000033E023C
61166+:1058700000032C0230E4007F006688241482001D9F
61167+:1058800030A500FF8F8300282C68000A510000100B
61168+:105890008F910014000358803C0C0800258C56940E
61169+:1058A000016C50218D49000001200008000000001B
61170+:1058B00002B210213045FFFF0E000236240400849E
61171+:1058C000162000028F90001CAF8000288F910014DA
61172+:1058D000260C002026430001018080213072FFFF4A
61173+:1058E00016200004AF8C001C0253502B1540FFDC27
61174+:1058F00000000000024010218FBF00288FB5002457
61175+:105900008FB400208FB3001C8FB200188FB1001429
61176+:105910008FB0001003E0000827BD0030240E0034D3
61177+:1059200014AE00F9000000009203000E241F168040
61178+:105930003C07000CA36300219202000D0347C8211D
61179+:105940003C066000A3620020961100123C0A7FFF13
61180+:10595000354CFFFFA771003C960B00102403000597
61181+:105960003168FFFFAF6800848E05001CAF5F002820
61182+:105970008F3800008CC4444803057826008F3021FE
61183+:10598000AF66004C8F69004C24CE00013C057F00BF
61184+:10599000AF6900508F740050AF740054AF66007050
61185+:1059A000AF6E00588F6D005824140050AF6D005C2E
61186+:1059B000A3600023AF6C0064A36300378E02001461
61187+:1059C000AF6200488F710048AF7100248E0B001841
61188+:1059D000AF6B006C9208000CA3680036937F003E0A
61189+:1059E00037F90020A379003E8F78007403058024E6
61190+:1059F000360F4000AF6F007493640000308900FFE1
61191+:105A0000513402452404FF803C04080024845A9841
61192+:105A10000E00028D000000003C1008008E105A9805
61193+:105A20000E00025602002021240600042407000173
61194+:105A3000A366007D020020210E00025FA36700051F
61195+:105A40008F5F017807E0FFFE240B0002AF5001409A
61196+:105A5000A34B01448F90001C3C081000AF48017814
61197+:105A60000A000362AF8000282CAD003751A0FF98D8
61198+:105A70008F9100140005A0803C180800271856BC20
61199+:105A8000029878218DEE000001C00008000000009F
61200+:105A90002418000614B80011000000003C0808009B
61201+:105AA0008D085A9824040005AF4800208E1F001866
61202+:105AB000AF7F00188F79004CAF79001C8F650050C4
61203+:105AC000122000C0AF6500700A000362AF84002896
61204+:105AD0002406000710A60083240300063C050800E6
61205+:105AE00024A55A980E000264240400818F90001CA3
61206+:105AF0000011102B0A000362AF8200282407000463
61207+:105B000014A7FFF6240500503C1808008F185A9877
61208+:105B1000AF5800208E0F0008AF6F00408E090008BC
61209+:105B2000AF6900448E14000CAF7400488E0E001054
61210+:105B3000AF6E004C8E0D0010AF6D00848E0A001405
61211+:105B4000AF6A00508E0C0018AF6C00548E04001C1D
61212+:105B5000AF64005893630000306B00FF116501D8FB
61213+:105B6000000000008F7400488F6900400289702394
61214+:105B700005C000042404008C1620FFDE240200036C
61215+:105B8000240400823C05080024A55A980E000287D0
61216+:105B9000000000008F90001C000010210A0003622A
61217+:105BA000AF820028240F000514AFFFCC240520008D
61218+:105BB0003C0708008CE75A98AF4700208E06000487
61219+:105BC000AF66005C9208000824100008A36800215A
61220+:105BD0008F9F001C93F90009A37900208F86001C79
61221+:105BE00090D8000A330400FF10900011000000005C
61222+:105BF0002885000914A0006924020002240A00205C
61223+:105C0000108A000B34058000288D002115A00008A3
61224+:105C100024054000240E0040108E00053C050001C4
61225+:105C200024140080109400023C050002240540006A
61226+:105C30008F7800743C19FF00031980240205782531
61227+:105C4000AF6F007490C4000BA36400818F84001CAC
61228+:105C50009489000C11200192000000009490000C27
61229+:105C60002406FFBF24050004A770003C908F000E9F
61230+:105C7000A36F003E8F84001C9089000FA369003F32
61231+:105C80008F8B001C8D6E00108F54007401D468231C
61232+:105C9000AF6D00608D6A0014AF6A0064956C0018E7
61233+:105CA000A76C00689563001AA763006A8D62001CE8
61234+:105CB000AF62006C9167000EA367003E9368003EE0
61235+:105CC0000106F8241220014BA37F003E8F90001C98
61236+:105CD0000A000362AF8500282407002214A7FF7F73
61237+:105CE000240300073C0B08008D6B5A981220000C0F
61238+:105CF000AF4B00200A000362AF830028240C00335E
61239+:105D000010AC0014240A00283C05080024A55A9869
61240+:105D10000E00023C240400810A0003EB8F90001C5B
61241+:105D20003C04080024845A980E00028D00000000F4
61242+:105D30009363000024110050306200FF10510135C0
61243+:105D4000000000008F90001C000018210A00036270
61244+:105D5000AF8300283C0D08008DAD5A9824040081C3
61245+:105D6000AF4D00203C05080024A55A980E00023CC7
61246+:105D7000A36A00348F90001C240200090A00036209
61247+:105D8000AF82002802B288213225FFFF0E000236C2
61248+:105D9000240400840A0003628F90001C1082FFA478
61249+:105DA00024050400288B000311600170240C0004FA
61250+:105DB000240300015483FF9E240540000A00043B95
61251+:105DC000240501003C04080024845A988F62004C8A
61252+:105DD0000E00028D8F6300508F90001C0000202168
61253+:105DE0000A000362AF8400288E1000042404008A95
61254+:105DF000AF50002093790005333800021700015F8F
61255+:105E0000020028219368002302002821311F00206E
61256+:105E100017E0015A2404008D9367003F2406001206
61257+:105E200030E200FF10460155240400810E000256A6
61258+:105E30000200202193630023240500040200202196
61259+:105E4000346B0042A36B00230E00025FA365007D4C
61260+:105E50008F4401780480FFFE240A0002AF50014005
61261+:105E6000A34A01448F90001C3C0C1000AF4C0178F9
61262+:105E70000A0003EC0011102B8E1000042404008A89
61263+:105E8000AF500020936E000531CD000215A0001622
61264+:105E900002002821936F003F2414000402002821EF
61265+:105EA00031E900FF11340010240400810E00025675
61266+:105EB000020020219362002324080012241FFFFE09
61267+:105EC00034460020A3660023A368003F93790005B1
61268+:105ED00002002021033FC0240E00025FA3780005CA
61269+:105EE00002002821000020210E00033400000000E1
61270+:105EF0000A0003EB8F90001C8E1000043C03000886
61271+:105F00000343A021AF500020928B000024050050D5
61272+:105F1000316400FF10850161240700880200202100
61273+:105F2000000028210E00022A2406000E928D000097
61274+:105F3000240EFF800200282101AE8025A2900000DF
61275+:105F4000240400040E000C5C240600300A0003EB5D
61276+:105F50008F90001C8E0800043C14080026945A9868
61277+:105F60003C010800AC285A98AF480020921F00035B
61278+:105F700033F9000413200002240200122402000658
61279+:105F8000A362003F920B001B2404FFC03165003F59
61280+:105F900000A43825A367003E9206000330C200012A
61281+:105FA00014400132000000008E020008AE8200089A
61282+:105FB0003C0208008C425AA010400131000249C244
61283+:105FC000A76900088E14000C240C0001240300149F
61284+:105FD000AF74002C8E0E0010AF6E0030960D0016C0
61285+:105FE000A76D0038960A0014A76A003AAF6C000C3F
61286+:105FF000A76C0010A76C0012A76C0014A76C001609
61287+:1060000012200136A3630034920F000331F0000226
61288+:106010002E1100018F90001C262200080A00036246
61289+:10602000AF8200288E0400043C0E0008034E30218D
61290+:10603000AF4400208E05000890CD0000240C0050D5
61291+:1060400031AA00FF114C00862407008824060009AD
61292+:106050000E00022A000000000A0003EB8F90001CD3
61293+:106060008E04001C0E00024100000000104000F4ED
61294+:10607000004050218F89001C240700890140202105
61295+:106080008D25001C240600010E00022A00000000DD
61296+:106090000A0003EB8F90001C960D00023C140800D0
61297+:1060A00026945A9831AA0004514000B83C10600070
61298+:1060B0008E0E001C3C010800AC2E5A98AF4E0020FA
61299+:1060C000920700102408001430E200FF144800D6A4
61300+:1060D00000000000960B00023163000114600165AE
61301+:1060E000000000008E020004AE8200083C1408008C
61302+:1060F0008E945AA01280015B000000008F7400741F
61303+:106100003C0380002404000102835825AF6B007417
61304+:10611000A3600005AF64000C3C0708008CE75AA0A0
61305+:106120008F86001CA7640010000711C2A76400122C
61306+:10613000A7640014A7640016A76200088CC80008B2
61307+:1061400024040002AF68002C8CC5000CAF65003041
61308+:1061500090DF0010A37F00348F99001C9330001152
61309+:10616000A37000358F98001C930F0012A36F0036A8
61310+:106170008F89001C912E0013A36E00378F90001C96
61311+:10618000960D0014A76D0038960A0016A76A003A0B
61312+:106190008E0C0018AF6C00245620FDCCAF84002874
61313+:1061A0003C05080024A55A980E0002640000202136
61314+:1061B0008F90001C0A0004A7000020218E1000040C
61315+:1061C00024070081AF500020936900233134001070
61316+:1061D000128000170000000002002021000028218A
61317+:1061E0002406001F0E00022A000000000A0003EB34
61318+:1061F0008F90001C3C05080024A55A980E000287C9
61319+:10620000240400828F90001C000028210A000362F1
61320+:10621000AF8500283C0408008C845A980E0014E8CE
61321+:10622000000000008F90001C0A000482000018216A
61322+:106230000E00025602002021937800230200202144
61323+:10624000370F00100E00025FA36F002300003821FB
61324+:1062500002002021000028210A0005A82406001FB2
61325+:10626000920F000C31E90001112000030000000032
61326+:106270009618000EA4D8002C921F000C33F90002CF
61327+:1062800013200005000038218E0200149608001229
61328+:10629000ACC2001CA4C8001A0A0005432406000969
61329+:1062A0003C05080024A55A980E0002872404008BA0
61330+:1062B0008F90001C0011282B0A000362AF85002874
61331+:1062C000AF6000843C0A08008D4A5A983C0D0800D3
61332+:1062D0008DAD0050240CFF803C02000C014D1821B4
61333+:1062E000006C2024AF4400288E070014306B007F20
61334+:1062F000017A282100A2C821AF2700D88E060014F9
61335+:10630000AF9900D0AF2600DC8E080010251FFFFEDD
61336+:106310000A000408AF3F01083C0508008CA55A9804
61337+:106320003C1908008F39005024CCFFFE00B9C02171
61338+:1063300003047824AF4F00283C1408008E945A9828
61339+:106340003C0908008D2900500289702131CD007F61
61340+:1063500001BA502101478021AE0600D8AF9000D08D
61341+:10636000AE0000DC0A0003B1AE0C0108548CFE3014
61342+:10637000240540000A00043B240510000E00032EF3
61343+:10638000000000000A0003EB8F90001C8E0F442CCD
61344+:106390003C186C62370979703C010800AC205A98AF
61345+:1063A00015E9000824050140979F00349786002CCA
61346+:1063B0000280282103E6C82B132000112404009238
61347+:1063C000240501400E000C7A240400023C01080060
61348+:1063D000AC225A98AF4200203C0508008CA55A9880
61349+:1063E00010A00005240400830E00084500000000F2
61350+:1063F00010400009240400833C05080024A55A9895
61351+:106400000E000264000000008F90001C0011202B81
61352+:106410000A000362AF8400280E0008490000000053
61353+:106420000A00055F8F90001C0E00084D0000000060
61354+:106430003C05080024A55A980A00062F2404008B66
61355+:10644000240400040E000C7A240500301440002AB5
61356+:10645000004050218F89001C240700830140202127
61357+:106460008D25001C0A000551240600018E04000839
61358+:106470000E000241000000000A00051BAE82000869
61359+:106480003C05080024A55A980E00023C240400870D
61360+:106490008F90001C0A0005360011102B8F830038E6
61361+:1064A0008F8600301066FE9D000038213C070800F2
61362+:1064B00024E75A1C000320C0008728218CAC000070
61363+:1064C00011900061246A00013143000F5466FFFA05
61364+:1064D000000320C00A0004F6000038213C05080033
61365+:1064E00024A55A980E000287240400828F90001C75
61366+:1064F0000A000536000010213C0B0008034B202148
61367+:106500002403005024070001AF420020A0830000B4
61368+:10651000A08700018F82001C90480004A08800180A
61369+:106520008F85001C90A60005A08600198F9F001C77
61370+:1065300093F90006A099001A8F90001C921800078A
61371+:10654000A098001B8F94001C928F0008A08F001C45
61372+:106550008F89001C912E0009A08E001D8F8D001CBC
61373+:1065600091AC000AA08C001E8F8B001C3C0C080014
61374+:10657000258C5A1C9163000B3C0B0800256B5A18A4
61375+:10658000A083001F8F87001C90E8000CA0880020CB
61376+:106590008F82001C9045000D24024646A0850021F4
61377+:1065A0008F86001C90DF000EA09F00228F99001C98
61378+:1065B0009330000FA09000238F98001C93140010BC
61379+:1065C000A09400248F8F001C91E90011A089002560
61380+:1065D0008F89001C8F8E00308F900038952D00140D
61381+:1065E000000E18C025C80001A48D002895270016AC
61382+:1065F000006C3021006BC821A487002A9525001863
61383+:106600003108000FA485002CA482002E8D3F001CB1
61384+:10661000ACCA0000AF88003011100006AF3F000088
61385+:10662000000038218D25001C014020210A00055161
61386+:1066300024060001250C00013184000F00003821E0
61387+:106640000A0006B8AF8400383C07080024E75A184F
61388+:106650000087302100003821ACA000000A0004F6B9
61389+:10666000ACC000003C05080024A55A980A00062F7B
61390+:10667000240400878E0400040E0002410000000084
61391+:106680000A00056AAE8200083084FFFF30C600FFB2
61392+:106690008F4201B80440FFFE00064400010430258B
61393+:1066A0003C07200000C720253C031000AF400180BC
61394+:1066B000AF450184AF44018803E00008AF4301B84F
61395+:1066C00027BDFFE8AFB00010AFBF00143C0760006B
61396+:1066D000240600021080000600A080210010102B6C
61397+:1066E0008FBF00148FB0001003E0000827BD001812
61398+:1066F0003C09600EAD2000348CE5201C8F82001C0C
61399+:106700002408FFFC00A81824ACE3201C0E0006D1CE
61400+:106710008C45000C0010102B8FBF00148FB00010A0
61401+:1067200003E0000827BD00183C02600E344701005A
61402+:1067300024090018274A040000000000000000009F
61403+:10674000000000003C06005034C30200AF44003893
61404+:10675000AF45003CAF430030014018218F4B000093
61405+:10676000316800201100FFFD2406007F2408FFFF90
61406+:106770008C6C000024C6FFFF24630004ACEC000016
61407+:1067800014C8FFFB24E70004000000000000000024
61408+:10679000000000003C0F0020AF4F00300000000060
61409+:1067A00024AD020001A5702B2529FFFF008E2021BA
61410+:1067B0001520FFE101A0282103E0000800000000EF
61411+:1067C00027BDFFE0AFB10014AFBF0018AFB000109D
61412+:1067D0003C05600E8CA20034008088211440000625
61413+:1067E0003C0460008C87201C2408FFFC00E8302457
61414+:1067F00034C30001AC83201C8F8B001C24090001D2
61415+:10680000ACA90034956900028D6500148D70000CF0
61416+:106810002D2400818D6700048D660008108000071C
61417+:106820008D6A00102D2C00041580000E30CE00075C
61418+:10683000312D000311A0000B000000002404008B88
61419+:10684000020028210E0006D1240600030011102B9F
61420+:106850008FBF00188FB100148FB0001003E0000844
61421+:1068600027BD002015C0FFF62404008B3C03002048
61422+:10687000AF4300300000000024020001AF8200148A
61423+:106880000000000000000000000000003C1F01505C
61424+:10689000013FC825253800033C0F600EAF47003884
61425+:1068A00000181882AF46003C35E8003CAF59003074
61426+:1068B000274704008F4400003086002010C0FFFDF1
61427+:1068C00000000000106000082466FFFF2403FFFFA3
61428+:1068D0008CEB000024C6FFFF24E70004AD0B000092
61429+:1068E00014C3FFFB250800043C08600EAD09003806
61430+:1068F0000000000000000000000000003C07002035
61431+:10690000AF470030000000000E0006F901402021D2
61432+:1069100002002821000020210E0006D124060003D9
61433+:106920000011102B8FBF00188FB100148FB0001012
61434+:1069300003E0000827BD002027BDFFE0AFB200182C
61435+:106940003092FFFFAFB10014AFBF001CAFB000101A
61436+:106950001640000D000088210A0007AA022010211D
61437+:1069600024050001508500278CE5000C0000000D77
61438+:10697000262300013071FFFF24E200200232382B71
61439+:1069800010E00019AF82001C8F8200141440001622
61440+:106990008F87001C3C0670003C0320008CE5000043
61441+:1069A00000A62024148300108F84003C00054402BC
61442+:1069B0003C09800000A980241480FFE9310600FF13
61443+:1069C0002CCA00095140FFEB262300010006688015
61444+:1069D0003C0E080025CE579801AE60218D8B00003B
61445+:1069E0000160000800000000022010218FBF001C81
61446+:1069F0008FB200188FB100148FB0001003E00008B0
61447+:106A000027BD00200E0006D1240400841600FFD804
61448+:106A10008F87001C0A00078BAF80003C90EF0002BC
61449+:106A200000002021240600090E0006D1000F2E00D0
61450+:106A30008F87001C0010102B0A00078BAF82003CD0
61451+:106A4000020028210E0006DF240400018F87001CAD
61452+:106A50000A00078BAF82003C020028210E0006DFEF
61453+:106A6000000020210A0007C38F87001C0E00071FAB
61454+:106A7000020020210A0007C38F87001C30B0FFFFEF
61455+:106A8000001019C08F5801B80700FFFE3C1F2004FA
61456+:106A90003C191000AF430180AF400184AF5F018813
61457+:106AA000AF5901B80A00078C262300013082FFFF8E
61458+:106AB00014400003000018210004240224030010E5
61459+:106AC000308500FF14A000053087000F2466000801
61460+:106AD0000004220230C300FF3087000F14E00005DD
61461+:106AE000308900032468000400042102310300FF00
61462+:106AF0003089000315200005388B0001246A00024C
61463+:106B000000042082314300FF388B00013164000112
61464+:106B100010800002246C0001318300FF03E00008B4
61465+:106B200000601021308BFFFF000B394230E600FF80
61466+:106B30003C09080025295998000640800109602178
61467+:106B40008D8700003164001F240A0001008A1804A8
61468+:106B500030A500FF00E3202514A000020003102749
61469+:106B600000E22024240F000100CF700401096821F5
61470+:106B7000000E282714800005ADA400008F86000CAD
61471+:106B800000A6102403E00008AF82000C8F88000CE0
61472+:106B900001C8102503E00008AF82000C3C06001F6E
61473+:106BA0003C0360003084FFFF34C5FF8024020020D6
61474+:106BB000AC602008AC60200CAC602010AC652014E8
61475+:106BC000AC642018AC62200000000000000000004F
61476+:106BD00003E000080000000027BDFFE82402FFFFDB
61477+:106BE000AFBF0010AF82000C000020213C0608005F
61478+:106BF00024C659982405FFFF248900010004408021
61479+:106C00003124FFFF010618212C87002014E0FFFA31
61480+:106C1000AC6500000E0008160000202124020001CF
61481+:106C20003C04600024050020AC822018AC852000C4
61482+:106C3000000000000000000000000000244A0001E5
61483+:106C40003142FFFF2C46040014C0FFF78FBF001035
61484+:106C500003E0000827BD00188F8300082C620400A1
61485+:106C600003E00008384200018F830008246200011D
61486+:106C700003E00008AF8200088F8300082462FFFF52
61487+:106C800003E00008AF82000827BDFFE0AFB10014A9
61488+:106C9000AFBF0018AFB000108F6B00303C06600033
61489+:106CA00000808821ACCB20088F6A002C3C02800039
61490+:106CB00024030008ACCA200C9769003A9768003892
61491+:106CC00000092C003107FFFF00A72025ACC42010CD
61492+:106CD000ACC22014ACC32000000000000000000083
61493+:106CE000000000003C0360008C6D200031AC000807
61494+:106CF0001580FFF9000000008C6E201405C00020F4
61495+:106D0000000000000E0007DA8F84000C00024080B3
61496+:106D10003C09080025295998010938218CE4000014
61497+:106D20000E0007DA00028140020220213090FFFFAE
61498+:106D3000020020210E0007F8000028213C0C8000F2
61499+:106D4000022C58253210FFFF3C116000240A00205D
61500+:106D5000AE2B2014AE302018AE2A20000000000018
61501+:106D60000000000000000000020010218FBF00188A
61502+:106D70008FB100148FB0001003E0000827BD002081
61503+:106D80008C6620143C02001F3443FF803C1FFFE848
61504+:106D900000C3C02437F9080003198021001079C20C
61505+:106DA0003C0C8000022C582531F0FFFF3C116000A4
61506+:106DB000240A0020AE2B2014AE302018AE2A20006A
61507+:106DC0000000000000000000000000000200102190
61508+:106DD0008FBF00188FB100148FB0001003E00008BF
61509+:106DE00027BD002027BDFFE8AFB000103402FFFF31
61510+:106DF0003090FFFFAFBF00141202000602002021F6
61511+:106E00000E00081600000000020020210E0007F806
61512+:106E1000240500018F8400088FBF00148FB000107C
61513+:106E20002483FFFF27BD001803E00008AF8300089C
61514+:106E3000000439C230E6003F00043B42000718401E
61515+:106E4000240210002CC4002024C8FFE0AF42002C14
61516+:106E5000246300011480000330A900FF00071840DC
61517+:106E6000310600FF0003608024080001019A5821C8
61518+:106E70003C0A000E00C82804016A382111200005D0
61519+:106E8000000530278CE900000125302503E00008CB
61520+:106E9000ACE600008CEE000001C6682403E00008A8
61521+:106EA000ACED000027BDFFE8AFBF0014AFB000108D
61522+:106EB0003C0460008C8508083403F00030A2F00028
61523+:106EC00050430006240200018C8708083404E000C7
61524+:106ED00030E6F00010C4001E24020002AF82004021
61525+:106EE0003C1060003C0A0200AE0A0814240910009D
61526+:106EF0003C08000E8E03440003482021AF49002CBB
61527+:106F0000240501200E000CC0000030218F830040BA
61528+:106F1000106000043C021691240B0001106B000E5F
61529+:106F20003C023D2C344F0090AE0F44088FBF00143C
61530+:106F30008FB000103C0C6000240E10003C0D0200CD
61531+:106F400027BD0018AD8E442003E00008AD8D081069
61532+:106F50000A0008E7AF8000403C0218DA344F009086
61533+:106F6000AE0F44088FBF00148FB000103C0C6000BF
61534+:106F7000240E10003C0D020027BD0018AD8E4420E9
61535+:106F800003E00008AD8D08100A0008BB24050001CD
61536+:106F90000A0008BB000028213C08080025085DA461
61537+:106FA0002404FFFF010018212402001E2442FFFFD9
61538+:106FB000AC6400000441FFFD246300043C070800AA
61539+:106FC00024E75E208CE5FFFC2404001C240600015D
61540+:106FD000308A001F0146480424840001000910275C
61541+:106FE0002C8300201460FFFA00A22824ACE5FFFCEB
61542+:106FF0003C05666634A4616E3C06080024C65EE06B
61543+:10700000AF840058AF88009C2404FFFF00C0182103
61544+:107010002402001F2442FFFFAC6400000441FFFD76
61545+:10702000246300043C0766663C05080024A55EA0B6
61546+:10703000AF86004834E6616EAF8600982404FFFFF7
61547+:1070400000A018212402000F2442FFFFAC640000BE
61548+:107050000441FFFD246300043C0B66663C06080007
61549+:1070600024C65E203568616EAF8500A4AF880070CD
61550+:107070002404FFFF00C018212402001F2442FFFF48
61551+:10708000AC6400000441FFFD246300043C0D66660F
61552+:107090003C0A0800254A5F6035AC616EAF860090FF
61553+:1070A000AF8C005C2404FFFF014018212402000380
61554+:1070B0002442FFFFAC6400000441FFFD2463000490
61555+:1070C0003C09080025295F708D27FFFC2404000679
61556+:1070D000240500013099001F0325C0042484000109
61557+:1070E000001878272C8E002015C0FFFA00EF3824F6
61558+:1070F000AD27FFFC3C09666624030400240403DC7E
61559+:1071000024050200240600663522616E3C08080052
61560+:1071100025085AA4AF820074AF830044AF83006C8B
61561+:10712000AF830050AF830084AF8A008CAF840064CB
61562+:10713000AF85004CAF860054AF840078AF85006007
61563+:10714000AF86008001001821240200022442FFFFC4
61564+:10715000AC6000000441FFFD24630004240400032C
61565+:107160002403000C3C0A0800254A5AB0AF8A006884
61566+:107170000A00098E2405FFFF000418802484000102
61567+:10718000006858212C8700C014E0FFFBAD650000AB
61568+:107190003C0E666635CD616E240C17A024081800DD
61569+:1071A000AF8D0088AF8C009403E00008AF88007CAE
61570+:1071B0002484007F000421C200004021000030210F
61571+:1071C00000003821000028210A0009A5AF8400A092
61572+:1071D0001060000624E7000100C4302124A500014E
61573+:1071E0002CC20BF51440FFFA2CA300663C090800E2
61574+:1071F00025295F6001201821240200032442FFFF9B
61575+:10720000AC6000000441FFFD2463000410E0001A9C
61576+:1072100024E3FFFF0003294210A0000A0000202100
61577+:107220002406FFFF3C03080024635F602484000100
61578+:107230000085502BAC660000250800011540FFFBBF
61579+:107240002463000430E2001F10400008000868803A
61580+:10725000240C0001004C38040008588001692821E2
61581+:1072600024E6FFFF03E00008ACA6000001A94021CE
61582+:107270002409FFFFAD09000003E000080000000042
61583+:10728000AF4400283C04000C034420210005288260
61584+:107290000A000CC000003021000421803C03600083
61585+:1072A000AC6410080000000000052980AC65100CDB
61586+:1072B0000000000003E000088C62100C27BDFFE80E
61587+:1072C0000080282124040038AFBF00140E0009D527
61588+:1072D000AFB0001024040E00AF4400283C10000C96
61589+:1072E00003502021240500100E000CC000003021A6
61590+:1072F00003501021AC400000AC40000424040038CE
61591+:107300008FBF00148FB0001024053FFF27BD001869
61592+:107310000A0009D58C430000000421803C03600072
61593+:10732000AC641008000000008C62100C03E0000840
61594+:107330000002118227BDFFC8AFB400208F940068FF
61595+:10734000AFBE0030AFB7002CAFB600280000B821A8
61596+:107350000080B021241E00C0AFBF0034AFB50024B0
61597+:10736000AFB3001CAFB20018AFB10014AFB0001043
61598+:107370000A000A12AFA5003C504000018F9400683B
61599+:1073800027DEFFFF13C00028269400048E92000021
61600+:107390003C03080024635DA01240FFF70283102B1A
61601+:1073A0003C04080024845AA4028410230002A8C0CC
61602+:1073B000000098210A000A212411000100118840D0
61603+:1073C000122000260000000002B380210251282470
61604+:1073D0000200202110A0FFF9267300010E0009DE33
61605+:1073E000000000000016684032EC000101AC2021D2
61606+:1073F0000E0009D5020028218F89009426F700018C
61607+:107400008FA6003C3AEB0001316A00012528FFFFFE
61608+:107410000011382702CAB021AF88009416E6FFE7B2
61609+:1074200002479024AE92000002E010218FBF00348A
61610+:107430008FBE00308FB7002C8FB600288FB5002488
61611+:107440008FB400208FB3001C8FB200188FB10014CE
61612+:107450008FB0001003E0000827BD00383C0E080084
61613+:1074600025CE5DA0028E102B0A000A0DAE92000000
61614+:1074700027BDFFD8AFB10014AFB00010AFBF0020E0
61615+:10748000AFB3001CAFB2001800A0882110A0001FED
61616+:10749000000480403C13080026735AA40A000A5ACC
61617+:1074A0002412000112200019261000010E0009F517
61618+:1074B00002002021000231422444FFA0000618806F
61619+:1074C0003045001F2C8217A1007318212631FFFFC1
61620+:1074D0001040FFF400B230048C690000020020214B
61621+:1074E00024053FFF012640241500FFEE0126382524
61622+:1074F0000E0009D5AC6700008F8A009426100001A9
61623+:10750000254700011620FFE9AF8700948FBF0020B8
61624+:107510008FB3001C8FB200188FB100148FB0001011
61625+:1075200003E0000827BD00288F85009C00805821BB
61626+:107530000000402100004821240A001F3C0C0800E4
61627+:10754000258C5E1C3C0D080025AD5DA48CA60000BA
61628+:1075500050C000140000402100AD1023000238C0CC
61629+:10756000240300010A000A930000202115000003F3
61630+:1075700000E410212448202400004821252900018E
61631+:10758000512B00132506DFDC106000062484000167
61632+:1075900000C3702415C0FFF5000318400A000A91CB
61633+:1075A0000000402110AC002624A300040060282124
61634+:1075B000254AFFFF1540FFE5AF85009C512B0004D5
61635+:1075C0002506DFDC0000402103E000080100102157
61636+:1075D0000006614230C5001F000C50803C070800C7
61637+:1075E00024E75DA424040001014730211120000F8D
61638+:1075F00000A420043C05080024A55E20148000059A
61639+:107600002529FFFF24C6000410C50011000000005A
61640+:10761000240400018CCF00000004C0270004204097
61641+:1076200001F868241520FFF5ACCD00008F99007893
61642+:1076300001001021032B482303E00008AF890078E4
61643+:107640003C05080024A55DA40A000A9B0000402117
61644+:107650003C06080024C65DA40A000AB42404000104
61645+:10766000308800FF240200021102000A24030003F4
61646+:107670001103005C8F8900A4240400041104005F3E
61647+:1076800024050005110500670000182103E000082B
61648+:10769000006010218F8900483C0C0800258C5EE0BA
61649+:1076A0003C04080024845F60240300201060000F65
61650+:1076B00000005821240D0002240E00033C0F080096
61651+:1076C00025EF5EE08D27000014E0000B30F9FFFF8E
61652+:1076D000252900040124C02B53000001018048210A
61653+:1076E0002463FFFF5460FFF88D270000016018211C
61654+:1076F00003E0000800601021132000323C0500FF69
61655+:1077000030E200FF004030211040004200005021D4
61656+:1077100024050001000020210005C84000A6C02467
61657+:1077200017000003332500FF14A0FFFB2484000191
61658+:10773000012CC023001828C000AA6021008C502111
61659+:107740003144001F240C0001008C18040003102792
61660+:1077500000E23024110D0041AD260000110E004C56
61661+:10776000000A1840110D00368F87006C510E00562C
61662+:107770008F8C0060240D0004110D005A8F8E008440
61663+:10778000240E0005150EFFDA01601821240B1430B9
61664+:1077900011400006000018218F8400A0246300011E
61665+:1077A000006A402B1500FFFD016458218F8A00807C
61666+:1077B000AF89008C016018212549FFFF0A000AEB00
61667+:1077C000AF89008000E52024000736021080FFD03A
61668+:1077D000240A001800075402314600FF0A000AF389
61669+:1077E000240A00103C0C0800258C5EA03C04080014
61670+:1077F00024845EE00A000ADA240300103C0C08002E
61671+:10780000258C5E203C04080024845EA00A000AD96E
61672+:107810008F89009000071A02306600FF0A000AF301
61673+:10782000240A00088F89008C3C0C0800258C5F60BE
61674+:107830003C04080024845F700A000ADA2403000470
61675+:10784000000A4080250B003024E6FFFF016018216C
61676+:10785000AF8900480A000AEBAF86006C000AC982B3
61677+:10786000001978803C07080024E75EA001E720218A
61678+:10787000000A18428C8F00003079001F032C380456
61679+:107880000007C02701F860240A000B08AC8C000038
61680+:10789000000331420006288000AF28213062001F1B
61681+:1078A0008CB8000024630001004CC804000321428E
61682+:1078B000001938270004108003073024004F2021CE
61683+:1078C0000A000B4CACA60000000A68C025AB0032D1
61684+:1078D000258AFFFF01601821AF8900A40A000AEB86
61685+:1078E000AF8A0060254B1030AF89009001601821ED
61686+:1078F00025C9FFFF0A000AEBAF8900843086000724
61687+:107900002CC2000610400014000000000006408059
61688+:107910003C030800246357BC010338218CE40000B9
61689+:1079200000800008000000002409000310A9000ED8
61690+:1079300000000000240A000510AA000B000000004F
61691+:10794000240B000110AB0008000000008F8C00A089
61692+:1079500010AC00050000000003E00008000010214A
61693+:107960000A000A7900A020210A000AC700C02021CD
61694+:1079700027BDFFE8308400FF240300021083000BC2
61695+:10798000AFBF0010240600031086003A240800044C
61696+:1079900010880068240E0005108E007F2CAF143074
61697+:1079A0008FBF001003E0000827BD00182CA2003094
61698+:1079B0001440FFFC8FBF001024A5FFD0000531C28A
61699+:1079C000000668803C07080024E75EE001A730213C
61700+:1079D0008CC900000005288230AC001F240B000178
61701+:1079E000018B50048F840048012A4025ACC8000058
61702+:1079F0008C83000050600001AF8600488F98006CB7
61703+:107A000030AE000124A6FFFF270F000115C00002C1
61704+:107A1000AF8F006C24A600010006414200082080C0
61705+:107A2000008718218C79000030C2001F2406000155
61706+:107A30000046F804033F382410E0FFDA8FBF00103F
61707+:107A40000005C182001870803C0F080025EF5EA081
61708+:107A500001CF48218D2B00000005684231A5001F91
61709+:107A600000A66004016C502527BD001803E0000843
61710+:107A7000AD2A00002CA7003014E0FFCA8FBF001011
61711+:107A800030B900071723FFC724A8FFCE00086A02F9
61712+:107A9000000D60803C0B0800256B5EA0018B30213F
61713+:107AA0008CC40000000828C230AA001F240800016E
61714+:107AB000014848048F8200A400891825ACC3000047
61715+:107AC0008C5F000053E00001AF8600A40005704009
61716+:107AD000000E7942000F28803C04080024845EE0F8
61717+:107AE00000A418218C6B000025DF000131CD001FA0
61718+:107AF000001F514201A86004016C4825000A108053
61719+:107B0000AC690000004428218CA600008F9800601A
61720+:107B100033F9001F8FBF00100328380400C77825F1
61721+:107B2000270E000127BD0018ACAF000003E00008DD
61722+:107B3000AF8E006024A5EFD02CB804001300FF998D
61723+:107B40008FBF001000053142000658803C0A080033
61724+:107B5000254A5E20016A30218CC4000030A3001F3A
61725+:107B600024090001006910048F9900900082F82513
61726+:107B7000ACDF00008F27000050E00001AF860090CE
61727+:107B80008F8D00848FBF001027BD001825AC000129
61728+:107B900003E00008AF8C008415E0FF828FBF001067
61729+:107BA0008F8600A0000610400046F821001F21002B
61730+:107BB00003E4C8210019384024F8143000B8402BE1
61731+:107BC0001100FF788FBF001024A4EBD00E00021329
61732+:107BD00000C0282100027942000F70803C0D08008F
61733+:107BE00025AD5F6001CD20218C8B0000304C001F43
61734+:107BF00024060001018618048F89008C016350253A
61735+:107C0000AC8A00008D25000050A00001AF84008CDC
61736+:107C10008F9800808FBF001027BD00182708000133
61737+:107C200003E00008AF88008030A5000724030003AC
61738+:107C300010A3001028A2000414400008240700022A
61739+:107C40002403000410A300152408000510A8000F49
61740+:107C50008F8500A003E000080000000014A7FFFDCE
61741+:107C60000080282114C3FFFB240400020A000B8BB0
61742+:107C700000000000240900050080282110C9FFFB36
61743+:107C80002404000303E000080000000014C5FFF115
61744+:107C9000008028210A000B8B24040005240A00011F
61745+:107CA0000080282110CAFFF12404000403E000082A
61746+:107CB0000000000027BDFFE0AFB00010000581C24A
61747+:107CC0002603FFD024C5003F2C6223D024C6007FAA
61748+:107CD000AFB20018AFB10014AFBF001C309100FF6D
61749+:107CE000000691C2000529820200202110400008F0
61750+:107CF0002403FFFF0E000A4B0000000002002021B9
61751+:107D0000022028210E000C390240302100001821E9
61752+:107D10008FBF001C8FB200188FB100148FB00010FD
61753+:107D20000060102103E0000827BD002027BDFFD818
61754+:107D300024A2007FAFB3001CAFB20018000299C2AA
61755+:107D4000309200FF24A3003F02402021026028213E
61756+:107D5000AFB10014AFB00010AFBF00200E000B6E2B
61757+:107D60000003898200408021004020210220282138
61758+:107D700014400009000018218FBF00208FB3001CA1
61759+:107D80008FB200188FB100148FB000100060102166
61760+:107D900003E0000827BD00280E0009FC00000000D9
61761+:107DA00000402821020020211051FFF3001019C0CB
61762+:107DB0000E000A4B00000000020020210240282192
61763+:107DC0000E000C39026030218FBF00208FB3001CE1
61764+:107DD0008FB200188FB100148FB00010000018216E
61765+:107DE0000060102103E0000827BD00283084FFFF59
61766+:107DF00030A5FFFF1080000700001821308200012D
61767+:107E00001040000200042042006518211480FFFB8E
61768+:107E10000005284003E000080060102110C00007A2
61769+:107E2000000000008CA2000024C6FFFF24A500046F
61770+:107E3000AC82000014C0FFFB2484000403E00008AF
61771+:107E40000000000010A0000824A3FFFFAC86000083
61772+:107E500000000000000000002402FFFF2463FFFF79
61773+:107E60001462FFFA2484000403E00008000000000C
61774+:107E700030A5FFFF8F4201B80440FFFE3C076015AC
61775+:107E800000A730253C031000AF440180AF400184BF
61776+:107E9000AF46018803E00008AF4301B88F8500D0EA
61777+:107EA0002C864000008018218CA700840087102BAE
61778+:107EB00014400010000000008CA800842D06400033
61779+:107EC00050C0000F240340008CAA0084008A482B75
61780+:107ED000512000018CA3008400035A42000B208033
61781+:107EE0003C05080024A558200085182103E000085F
61782+:107EF0008C62000014C0FFF4000000002403400066
61783+:107F000000035A42000B20803C05080024A558209D
61784+:107F10000085182103E000088C6200008F8300D0E8
61785+:107F2000906600D024C50001A06500D08F8500D0E8
61786+:107F3000906400D090A200D210440017000000000E
61787+:107F4000936C00788F8B00BC318A00FFA16A000C13
61788+:107F500025490001938700C4312200FF3048007F8B
61789+:107F60001107000B00026827A36200788F4E01788A
61790+:107F700005C0FFFE8F9900B0241800023C0F1000CE
61791+:107F8000AF590140A358014403E00008AF4F017806
61792+:107F90000A000D0931A20080A0A000D00A000CFF49
61793+:107FA000000000008F8700D027BDFFC8AFBF0030A2
61794+:107FB000AFB7002CAFB60028AFB50024AFB4002097
61795+:107FC000AFB3001CAFB20018AFB10014AFB00010D7
61796+:107FD00094E300E094E200E2104300D72405FFFFA1
61797+:107FE0003C047FFF3497FFFF2415FF800A000DF04B
61798+:107FF0003C16000E108A00D18FBF00308F9100B068
61799+:108000003C1808008F18005C001230C0001291402C
61800+:108010000311702101D57824AF4F002C94EC00E2BD
61801+:1080200031CD007F01BA5821318A7FFF0176482186
61802+:10803000000A804002091021945300003C08080007
61803+:108040008D0800580246C02132733FFF001319808B
61804+:10805000010320210224282130BF007F03FAC82118
61805+:1080600000B5A024AF54002C0336A0218E87001049
61806+:108070008E8F003003785821256D008800EF702323
61807+:10808000240C0002AE8E0010AF8D00ACA16C0088F5
61808+:10809000976A003C8E8400308F9100AC0E000CD6A5
61809+:1080A0003150FFFF00024B80020940253C02420094
61810+:1080B00001022025AE2400048E8300048F8D00ACC5
61811+:1080C0008E860000240E0008ADA3001CADA600188B
61812+:1080D000ADA0000CADA00010929F000A33F900FF84
61813+:1080E000A5B90014968500083C1F000CA5A5001634
61814+:1080F0009298000A331100FFA5B100209690000865
61815+:1081000024180005A5B00022ADA00024928F000B1A
61816+:108110002410C00031E700FFA5A70002A1AE0001B6
61817+:108120008E8C00308F8B00AC8F8400B0AD6C00085B
61818+:108130003C0A08008D4A005401444821013540247E
61819+:10814000AF4800283C0208008C4200540044302113
61820+:1081500030C3007F007AC821033F282102458821CF
61821+:10816000AF9100BCAF8500C0A23800008F8A00BC70
61822+:108170002403FFBF2418FFDF954F000201F03824CD
61823+:1081800000F37025A54E0002914D000231AC003F76
61824+:10819000358B0040A14B00028F8600BC8F8900D038
61825+:1081A000ACC000048D28007C3C098000ACC80008ED
61826+:1081B00090C4000D3082007FA0C2000D8F8500BCEE
61827+:1081C00090BF000D03E3C824A0B9000D8F9100BC3F
61828+:1081D0009233000D02789024A232000D8E9000346C
61829+:1081E0008F8B00BCAD7000108E87002C8E8F0030FE
61830+:1081F00000EF7023AD6E0014916D001831AC007F5C
61831+:10820000A16C00188F9F00BC8E8A00308FE8001888
61832+:10821000015720240109302400C41025AFE20018C2
61833+:108220009283000AA3E3001C969900088F8500BC86
61834+:108230008F9800D0A4B9001E8E9000308E8400303C
61835+:108240000E0002138F0500848F8500D0000291403C
61836+:108250000002990090AF00BC0253882100403021F9
61837+:1082600031E7000210E0000302118021000290803B
61838+:108270000212802190B900BC3327000410E00002F4
61839+:108280000006F880021F80218E9800308F8B00BC82
61840+:1082900024068000330F0003000F702331CD00034C
61841+:1082A000020D6021AD6C000494A400E294AA00E2E7
61842+:1082B00094B000E231497FFF2522000130537FFF57
61843+:1082C0000206182400734025A4A800E294A400E24A
61844+:1082D0003C1408008E94006030917FFF123400221D
61845+:1082E000000000000E000CF6000000008F8700D098
61846+:1082F0000000282194F300E094F000E21213000F34
61847+:108300008FBF003090E900D090E800D1313200FFFB
61848+:10831000310400FF0244302B14C0FF36264A00010E
61849+:1083200090EE00D2264B000131CD00FF008D602180
61850+:10833000158BFF338F9100B08FBF00308FB7002CAB
61851+:108340008FB600288FB500248FB400208FB3001C97
61852+:108350008FB200188FB100148FB0001000A0102150
61853+:1083600003E0000827BD003894A300E20066402423
61854+:10837000A4A800E290A400E290B900E2309100FFCE
61855+:108380000011A1C20014F827001F39C03332007F4A
61856+:10839000024730250A000DE8A0A600E23084FFFF66
61857+:1083A00030A5FFFFAF440018AF45001C03E00008F4
61858+:1083B0008F42001427BDFFB8AFB000208F9000D0CF
61859+:1083C0003084FFFFAFA40010AFBF0044AFBE004039
61860+:1083D000AFB7003CAFB60038AFB50034AFB4003033
61861+:1083E000AFB3002CAFB20028AFB10024A7A0001893
61862+:1083F000920600D1920500D030C400FF30A300FFE8
61863+:108400000064102B10400122AFA00014920900D08C
61864+:108410008FB50010312800FF0088382324F4FFFFB7
61865+:108420000014882B0015982B02339024524001260B
61866+:108430008FB40014961E0012961F00108FB7001004
61867+:1084400003DFC823001714000019C400000224032E
61868+:108450000018140302E2B02A52C00001004020219B
61869+:108460000284282B10A0000200801821028018210D
61870+:1084700000033C0000071C033064FFFF2C8600094A
61871+:1084800014C000020060B821241700088E0A0008FA
61872+:10849000001769808E09000C31ABFFFF3C0C001007
61873+:1084A000016C402527520400AF4A0038AF9200B853
61874+:1084B000AF49003CAF480030000000000000000061
61875+:1084C00000000000000000000000000000000000AC
61876+:1084D00000000000000000008F4F000031EE00207F
61877+:1084E00011C0FFFD0017982A027110240A000E83A4
61878+:1084F0000000B02155E001019258000131130080C5
61879+:10850000126001CF012020219655001232A5FFFFF5
61880+:108510000E000CCBA7B500188F9000D00291A023BD
61881+:1085200026CD00018F9100B8000DB4000016B403F1
61882+:108530002638004002D7582A0014882B2405000151
61883+:108540000300902101711024AF9800B8AFA500146A
61884+:10855000104001BC8F8900B03C0C08008D8C005489
61885+:10856000240BFF80921E00D001895021014B28244A
61886+:10857000921900D0AF4500288E4700103C08080033
61887+:108580008D0800583C1808008F18005430E33FFF56
61888+:108590000003218001043021012658212402FF809C
61889+:1085A0000162F824920C00D0AF5F002C92480000CA
61890+:1085B00033D100FF333500FF0309982100117140CA
61891+:1085C000001578C0326D007F01CF382101BA282113
61892+:1085D000318300FF3164007F3C0A000C00AA88212F
61893+:1085E0000367F02100033140009A10213108003F59
61894+:1085F0003C1F000E00D1C021005F982127D90088C0
61895+:108600002D150008AF9100C0AF9900ACAF9800BC29
61896+:10861000AF9300B412A0018A00008821240E00014B
61897+:10862000010E4004310D005D11A0FFB2310F0002B8
61898+:108630008E4A00283C0300803C04FFEFAE6A000035
61899+:108640008E450024A260000A3488FFFFAE65000456
61900+:108650009247002C3C1FFF9F37FEFFFFA267000CD4
61901+:108660008E62000C3C180040A267000B00433025CE
61902+:1086700000C8C824033E88240238A825AE75000C23
61903+:108680008E490004AE6000183C0F00FFAE69001474
61904+:108690008E4D002C35EEFFFF8F8B00B001AE6024B5
61905+:1086A000AE6C00108E470008A660000896450012C8
61906+:1086B000AE6700208E42000C30B03FFF00105180AA
61907+:1086C000AE6200248E5E0014014B182130A400011C
61908+:1086D000AE7E00288E590018000331C2000443808A
61909+:1086E000AE79002C8E51001C00C8F821A67F001C1A
61910+:1086F000AE710030965800028E550020A678001EFC
61911+:10870000AE75003492490033313000045600000544
61912+:10871000925000008F8C00D08D8B007CAE6B0030AF
61913+:10872000925000008F8F00BCA1F00000924E0033E9
61914+:1087300031CD000251A00007925E00018F8900BC7C
61915+:108740002418FF80913100000311A825A1350000F5
61916+:10875000925E00018F9900BC2409FFBF240BFFDF4C
61917+:10876000A33E00018F9500BC92B8000D3311007F2D
61918+:10877000A2B1000D8F8E00BC91D0000D02097824AB
61919+:10878000A1CF000D8F8800BC8E6D0014910A000DE2
61920+:108790002DAC0001000C2940014B382400E51825C0
61921+:1087A000A103000D964200128F8800BC8F8700D075
61922+:1087B000A50200028E45000490FF00BC30A4000317
61923+:1087C0000004302330DE000300BE102133F9000224
61924+:1087D00017200002244400342444003090E200BCFE
61925+:1087E00000A2302430DF000417E0000224830004DC
61926+:1087F000008018218F8F00AC24090002AD03000413
61927+:10880000A1E90000924E003F8F8D00ACA1AE0001A7
61928+:108810008F9500AC924C003F8E440004A6AC000241
61929+:10882000976B003C0E000CD63170FFFF00025380A6
61930+:10883000020A38253C05420000E51825AEA30004D5
61931+:108840008F8600AC8E480038ACC800188E440034C7
61932+:10885000ACC4001CACC0000CACC00010A4C0001420
61933+:10886000A4C00016A4C00020A4C00022ACC00024F4
61934+:108870008E6400145080000124040001ACC4000880
61935+:108880000E000CF6241100010A000E768F9000D025
61936+:10889000920F00D2920E00D08FB5001031EB00FF86
61937+:1088A00031CD00FF008D6023016C50212554FFFF66
61938+:1088B0000014882B0015982B023390241640FEDDFF
61939+:1088C000000000008FB400148FBF00448FBE004032
61940+:1088D0003A8200018FB7003C8FB600388FB5003464
61941+:1088E0008FB400308FB3002C8FB200288FB10024DA
61942+:1088F0008FB0002003E0000827BD0048331100209E
61943+:10890000122000EF24150001921E00BC241F00015C
61944+:108910000000A82133D900011320000DAFBF001CB7
61945+:108920008E4400148E0800840088102B144000022E
61946+:10893000008030218E0600848E03006400C3A82BC3
61947+:1089400016A0000200C020218E0400640080A8212F
61948+:108950008E4700148E05006400E5302B14C0000221
61949+:1089600000E020218E0400640095F02313C0000471
61950+:108970008FAC001C240A0002AFAA001C8FAC001CA4
61951+:10898000028C582B156000A8000018218E4F00386B
61952+:108990008E6D000C3C0E0080AE6F00008E4A0034DD
61953+:1089A0003C10FF9F01AE5825AE6A00049246003F7E
61954+:1089B000360CFFFF016C38243C0500203C03FFEF20
61955+:1089C000A266000B00E510253468FFFF8F8700B812
61956+:1089D0000048F8243C04000803E4C825AE79000CE4
61957+:1089E0008CF80014AE60001802BE7821AE78001436
61958+:1089F0008CF10018AE71001C8CE90008AE690024EF
61959+:108A00008CEE000CAE6F002CAE600028AE6E002025
61960+:108A1000A6600038A660003A8CED001401B58023F2
61961+:108A2000021E902312400011AE72001090EA003D29
61962+:108A30008E6500048E640000000A310000A6C82183
61963+:108A4000000010210326402B0082F82103E8C021FA
61964+:108A5000AE790004AE78000090F1003DA271000AEA
61965+:108A60008F8900B895320006A67200088F9800AC76
61966+:108A70002419000202A02021A31900009769003CDC
61967+:108A80008F9200AC0E000CD63131FFFF00027B80CC
61968+:108A90008F8500B8022F68253C0E420001AE80256C
61969+:108AA000AE5000048F8400AC8CAC0038AC8C001845
61970+:108AB0008CAB0034AC8B001CAC80000CAC80001084
61971+:108AC000A4800014A4800016A4800020A4800022AA
61972+:108AD000AC80002490A7003FA487000212A00135BB
61973+:108AE0002403000153C0000290A2003D90A2003E6A
61974+:108AF00024480001A08800018F9F00ACAFF500085A
61975+:108B00008F8300D024070034906600BC30C500027B
61976+:108B100050A00001240700308F9200B88F8A00BC5B
61977+:108B2000906D00BC924B00002412C00032A50003DF
61978+:108B3000A14B00008F8600B88F8800BC240200047F
61979+:108B400090C400010045182330790003A1040001FE
61980+:108B50008F8A00BC8F9F00B800F53821955800021D
61981+:108B600097E9001200F9382103128824312F3FFFC2
61982+:108B7000022F7025A54E00029150000231A800047A
61983+:108B8000320C003F358B0040A14B000212A00002C6
61984+:108B90008F8500BC00E838218F8E00D0ACA7000480
61985+:108BA000240BFFBF8DCD007C2EA400012403FFDF2A
61986+:108BB000ACAD000890B0000D00044140320C007FC5
61987+:108BC000A0AC000D8F8600BC90CA000D014B102494
61988+:108BD000A0C2000D8F8700BC90E5000D00A3F82413
61989+:108BE00003E8C825A0F9000D8F9100B88F8D00BC57
61990+:108BF0008E380020ADB800108E290024ADA90014D5
61991+:108C00008E2F0028ADAF00188E2E002C0E000CF613
61992+:108C1000ADAE001C8FB0001C240C0002120C00EE44
61993+:108C20008F9000D08FA3001C006088211460000288
61994+:108C30000060A8210000A02156A0FE390291A023C7
61995+:108C40000014882B8FA90010960700103C1E0020EE
61996+:108C50000136402302C750213112FFFFA60A00103F
61997+:108C6000AFB20010AF5E0030000000009617001099
61998+:108C7000961300121277008F000000008E05000C82
61999+:108C80008E0B00080016698000AD7021000DC7C36F
62000+:108C900001CDA82B0178782101F56021AE0E000CE2
62001+:108CA000AE0C00088FB300100013B82B02378024DD
62002+:108CB0001200FF048F9000D00A000E3C000000005C
62003+:108CC0008E4D0038A6600008240B0003AE6D000036
62004+:108CD0008E500034A260000A8F9800B8AE70000475
62005+:108CE0003C0500809311003FA26B000C8E6F000CBE
62006+:108CF0003C0EFF9FA271000B01E5102535CCFFFF54
62007+:108D00003C03FFEF8F9200B8004C30243464FFFF27
62008+:108D100000C4F824AE7F000C8E590014964800124F
62009+:108D20008F8A00B0AE7900108E490014AE60001832
62010+:108D3000AE600020AE690014AE6000248E470018BB
62011+:108D400031093FFF0009F180AE6700288E4D000811
62012+:108D500003CA802131180001AE6D00308E4F000C27
62013+:108D60008F8C00AC001089C200185B80022B282178
62014+:108D7000240E0002A665001CA6600036AE6F002C13
62015+:108D8000A18E00009763003C8F8A00AC3C04420037
62016+:108D90003062FFFF00443025AD4600048F9F00B8CD
62017+:108DA000240700012411C0008FF30038240600348A
62018+:108DB000AD5300188FF90034AD59001CAD40000CC4
62019+:108DC000AD400010A5400014A5400016A5400020AD
62020+:108DD000A5400022AD400024A5550002A147000196
62021+:108DE0008F9E00AC8F8800B88F9200BCAFD5000872
62022+:108DF000910D0000A24D00008F9000B88F8B00BC39
62023+:108E000092180001A17800018F8400BC94850002B3
62024+:108E100000B1782401E97025A48E0002908C000234
62025+:108E20003183003FA08300028F8300D08F8400BC79
62026+:108E3000906200BC305300025260000124060030F2
62027+:108E4000AC8600048C6F007C2403FFBF02A0882145
62028+:108E5000AC8F0008908E000D31CC007FA08C000DEF
62029+:108E60008F8600BC90C2000D00432024A0C4000DDA
62030+:108E70008F8900BC913F000D37F90020A139000D0A
62031+:108E80008F8800B88F9300BC8D070020AE6700105C
62032+:108E90008D0A0024AE6A00148D1E0028AE7E0018D4
62033+:108EA0008D12002C0E000CF6AE72001C0A00103D54
62034+:108EB0008F9000D0960E00148E03000431CCFFFF7B
62035+:108EC000000C10C000622021AF44003C8E1F000443
62036+:108ED0008F46003C03E6C8231B20003C0000000036
62037+:108EE0008E0F000025E200013C05001034B500089B
62038+:108EF000AF420038AF550030000000000000000015
62039+:108F00000000000000000000000000000000000061
62040+:108F100000000000000000008F580000330B00200C
62041+:108F20001160FFFD000000008F5304003C0D002085
62042+:108F3000AE1300088F570404AE17000CAF4D00307D
62043+:108F4000000000003C0608008CC600442416000106
62044+:108F500010D600BD00000000961F00123C0508005E
62045+:108F60008CA5004000BFC821A61900129609001464
62046+:108F700025270001A6070014960A00143144FFFFBC
62047+:108F80005486FF498FB30010A60000140E000E1681
62048+:108F900030A5FFFF3C0408008C84002496030012D7
62049+:108FA0000044102300623023A60600120A00105964
62050+:108FB0008FB30010A08300018F8200AC2404000155
62051+:108FC000AC4400080A000FF08F8300D08E0200002E
62052+:108FD0000A0010EA3C0500108F8200C08FA7001C19
62053+:108FE000921800D0920B00D0920E00D0331100FFE7
62054+:108FF000316900FF00117940000928C001E56021B6
62055+:1090000031C300FF036C50210003314000C2C8216E
62056+:10901000255F0088AF9F00ACAF9900BCA1470088D6
62057+:109020009768003C03C020218F9100AC0E000CD645
62058+:109030003110FFFF00026B80020DC0253C0442008E
62059+:109040008F8D00B803045825AE2B00048DA900387D
62060+:109050008F8B00AC0000882100118100AD690018E1
62061+:109060008DAF00343C087FFF3504FFFFAD6F001C5F
62062+:1090700091AC003E8D65001C8D660018000C190037
62063+:10908000000C770200A33821020E102500E3F82B14
62064+:1090900000C2C821033F5021AD67001CAD6A001813
62065+:1090A000AD60000CAD60001091B8003E24050005D5
62066+:1090B00003C45024A578001495A9000403C02021FE
62067+:1090C000A569001691AF003EA56F002095B1000480
62068+:1090D000A5710022AD60002491AE003FA56E000294
62069+:1090E00091B0003E91AC003D01901023244300015B
62070+:1090F000A16300018F8600AC8F9F00BCACDE00082E
62071+:10910000A3E500008F9000BC8F9900B82405FFBF35
62072+:1091100096070002973800120247782433093FFF70
62073+:1091200001E98825A6110002921200022418FFDF2F
62074+:10913000324E003F35CD0040A20D00028F8600BCAC
62075+:109140008F8C00D02412FFFFACC000048D8B007CFC
62076+:109150003C0C8000ACCB000890C2000D3043007F77
62077+:10916000A0C3000D8F8700BC90FF000D03E5C8244D
62078+:10917000A0F9000D8F9100BC9229000D01387824D0
62079+:10918000A22F000D8F9000BCAE120010AE1500147F
62080+:10919000920E00182415FF8002AE6825A20D00185B
62081+:1091A0008F8500BC8F8300B88CAB0018016C102435
62082+:1091B000004A3025ACA600189068003EA0A8001C0C
62083+:1091C0008F9F00B88F8700BC8F9800D097F900045C
62084+:1091D000A4F9001E0E0002138F0500848F8600D0B4
62085+:1091E000000279400002490090D200BC01E98821C8
62086+:1091F000004028213255000212A0000303D1202193
62087+:109200000002A8800095202190CD00BC31B200045E
62088+:109210001240000333DF0003000540800088202156
62089+:10922000240600048F9E00BC00DFC8233327000300
62090+:1092300000875021AFCA00040E000CF6A665003866
62091+:109240000A0010388F9000D0961E00123C080800CB
62092+:109250008D080024011E9021A61200120A00105948
62093+:109260008FB3001027BDFFE03C1808008F18005096
62094+:10927000AFB00010AFBF0018AFB10014AF8400B0A2
62095+:1092800093710074030478212410FF8031EE007F75
62096+:109290003225007F01F0582401DA68213C0C000AD5
62097+:1092A000A38500C401AC2821AF4B002494A9001071
62098+:1092B0009768000690A600620080382124020030E2
62099+:1092C0000109202330C300F0AF8500D010620019DF
62100+:1092D0003090FFFF90AE0062240DFFF0240A005092
62101+:1092E00001AE6024318B00FF116A002F00000000E6
62102+:1092F00016000007241F0C00AF5F00248FB100147C
62103+:109300008FBF00188FB0001003E0000827BD0020B9
62104+:109310000E000E1C02002021241F0C00AF5F002451
62105+:109320008FB100148FBF00188FB0001003E0000849
62106+:1093300027BD002094A200E094A400E290BF011396
62107+:10934000008218263079FFFF33E700C014E00009DF
62108+:109350002F31000116000038000000005620FFE603
62109+:10936000241F0C000E000D18000000000A0011ED73
62110+:10937000241F0C001620FFDE000000000E000D1858
62111+:10938000000000001440FFDC241F0C001600002227
62112+:109390008F8300D0906901133122003FA062011336
62113+:1093A0000A0011ED241F0C0094AF00D48F8600D466
62114+:1093B00000E02821240400050E000C5C31F0FFFFC2
62115+:1093C0001440000524030003979100E600001821D3
62116+:1093D0002625FFFFA78500E68F5801B80700FFFE8E
62117+:1093E0003C196013AF400180241F0C00AF50018472
62118+:1093F000007938253C101000AF4701888FB1001468
62119+:10940000AF5001B8AF5F00248FB000108FBF0018BD
62120+:1094100003E0000827BD00200E000E1C02002021E2
62121+:109420005040FFB5241F0C008F8300D090690113BA
62122+:109430000A0012163122003F0E000E1C02002021ED
62123+:109440001440FFAD241F0C00122000078F8300D0B2
62124+:10945000906801133106003F34C20040A06201133E
62125+:109460000A0011ED241F0C000E000D180000000072
62126+:109470005040FFA1241F0C008F8300D0906801137F
62127+:109480003106003F0A00124634C20040AF9B00C8BC
62128+:1094900003E00008AF8000EC3089FFFF0009404284
62129+:1094A0002D020041000921801440000200095040B3
62130+:1094B00024080040000830C0000811400046582130
62131+:1094C000256701A800E2C821272F007F2418FF800C
62132+:1094D00001F818240064302100CA702125CC00FF57
62133+:1094E000240DFF00018D202425650088240A0088B2
62134+:1094F0003C010800AC2A004C3C010800AC2500509F
62135+:10950000AF8400D43C010800AC2900603C01080095
62136+:10951000AC2800643C010800AC2700543C01080062
62137+:10952000AC2300583C010800AC26005C03E00008B6
62138+:1095300000000000308300FF30C6FFFF30E400FF72
62139+:109540008F4201B80440FFFE00034C00012438257F
62140+:109550003C08600000E820253C031000AF45018076
62141+:10956000AF460184AF44018803E00008AF4301B86F
62142+:109570008F86001C3C096012352700108CCB00043C
62143+:109580003C0C600E35850010316A00062D48000144
62144+:10959000ACE800C48CC40004ACA431808CC20008C8
62145+:1095A00094C30002ACA2318403E00008A78300E466
62146+:1095B0003C0308008C6300508F8400E88F86001CF9
62147+:1095C0002402FF800064C0210302C824AF59002890
62148+:1095D0008CCD00043305007F00BA78213C0E000CCE
62149+:1095E00001EE2821ACAD00588CC80008AF8500D032
62150+:1095F0003C076012ACA8005C8CCC001034E8001072
62151+:10960000ACAC000C8CCB000CACAB000894AA0014E2
62152+:109610003C0208008C42004425490001A4A9001422
62153+:1096200094A400143083FFFF106200178F8400D0D1
62154+:109630003C0A08008D4A0040A4AA00128CCE0018F3
62155+:10964000AC8E00248CCD0014AC8D00208CC700188B
62156+:10965000AC87002C8CCC001424060001AC8C0028B4
62157+:109660008D0B00BC5166001A8D0200B48D0200B84B
62158+:10967000A482003A948F003AA48F003C948800D4CE
62159+:1096800003E000083102FFFF3C0908008D29002497
62160+:10969000A4A000148F8400D0A4A900128CCE0018BE
62161+:1096A000AC8E00248CCD0014AC8D00208CC700182B
62162+:1096B000AC87002C8CCC001424060001AC8C002854
62163+:1096C0008D0B00BC5566FFEA8D0200B88D0200B418
62164+:1096D000A482003A948F003AA48F003C948800D46E
62165+:1096E00003E000083102FFFF8F86001C3C0C0800DD
62166+:1096F0008D8C0050240BFF808CCD00083C03000CA7
62167+:10970000000D51C0018A4021010B4824AF8A00E8B6
62168+:10971000AF49002890C700073105007F00BA10212B
62169+:109720000043282130E4000410800039AF8500D0C8
62170+:1097300090CF000731EE000811C000380000000093
62171+:109740008CD9000C8CC400140324C02B13000030EF
62172+:10975000000000008CC2000CACA200648CCD00188C
62173+:109760002402FFF8ACAD00688CCC0010ACAC0080DB
62174+:109770008CCB000CACAB00848CCA001CACAA007C67
62175+:1097800090A900BC01224024A0A800BC90C30007FF
62176+:109790003067000810E000048F8500D090AF00BC57
62177+:1097A00035EE0001A0AE00BC90D9000733380001AF
62178+:1097B000130000088F8300D08F8700D0240400346A
62179+:1097C00090E800BC35030002A0E300BC8F8300D00A
62180+:1097D000AC6400C090C900073126000210C000052B
62181+:1097E00000000000906A00BC35420004A06200BC8A
62182+:1097F0008F8300D09065011330AD003FA06D011341
62183+:109800008F8C00D0958B00D403E000083162FFFFFD
62184+:109810008CC200140A001305000000000A001306A1
62185+:10982000ACA0006427BDFFD8AFB000108F90001C23
62186+:10983000AFBF0024AFB40020AFB20018AFB1001426
62187+:10984000AFB3001C9613000E3C07600A3C14600680
62188+:109850003264FFFF369300100E00125534F40410EA
62189+:109860008F8400D43C11600E0E00099B363100102D
62190+:10987000920E00153C0708008CE700603C12601255
62191+:1098800031CD000FA38D00F08E0E00048E0D000868
62192+:1098900096080012961F00109619001A9618001EBE
62193+:1098A000960F001C310CFFFF33EBFFFF332AFFFF45
62194+:1098B0003309FFFF31E6FFFF3C010800AC2B0040FD
62195+:1098C0003C010800AC2C00243C010800AC2A0044F8
62196+:1098D000AE293178AE26317C92020015960300162F
62197+:1098E00036520010304400FF3065FFFF3C06080090
62198+:1098F0008CC60064AE243188AE4500B492080014D2
62199+:1099000096190018241F0001011FC004332FFFFF08
62200+:109910003C0508008CA50058AE5800B8AE4F00BCFE
62201+:10992000920C0014AF8E00D8AF8D00DC318B00FF9D
62202+:10993000AE4B00C0920A0015AE670048AE66004C00
62203+:10994000314900FFAE4900C8AE65007C3C03080009
62204+:109950008C6300503C0408008C84004C3C080800D8
62205+:109960008D0800543C0208008C42005C8FBF00242C
62206+:10997000AE6300808FB00010AE8300748FB3001C04
62207+:10998000AE22319CAE4200DCAE2731A0AE2631A41F
62208+:10999000AE24318CAE233190AE283194AE2531986F
62209+:1099A000AE870050AE860054AE8500708FB10014B3
62210+:1099B000AE4700E0AE4600E4AE4400CCAE4300D07B
62211+:1099C000AE4800D4AE4500D88FB400208FB2001846
62212+:1099D00003E0000827BD002827BDFFE0AFB1001459
62213+:1099E000AFBF0018241100010E000845AFB00010F1
62214+:1099F00010510005978400E6978300CC0083102B5C
62215+:109A0000144000088F8500D4240700028FBF00187F
62216+:109A10008FB100148FB0001000E0102103E00008A7
62217+:109A200027BD00200E000C7A24040005AF8200E858
62218+:109A30001040FFF6240700020E0008498F90001C1A
62219+:109A4000979F00E68F9900E88F8D00C827EF0001EF
62220+:109A5000240E0050AF590020A78F00E6A1AE0000F1
62221+:109A60003C0C08008D8C00648F8600C8240A80009E
62222+:109A7000000C5E00ACCB0074A4C0000694C9000AC0
62223+:109A8000241FFF803C0D000C012AC024A4D8000A2A
62224+:109A900090C8000A24182000011F1825A0C3000A3E
62225+:109AA0008F8700C8A0E000788F8500C800003821AB
62226+:109AB000A0A000833C0208008C4200508F8400E884
62227+:109AC0000044782101FFC824AF590028960B0002FA
62228+:109AD00031EE007F01DA6021018D3021A4CB00D46A
62229+:109AE000960A0002AF8600D03C0E000425492401EE
62230+:109AF000A4C900E68E080004ACC800048E03000868
62231+:109B0000ACC30000A4C00010A4C00014A0C000D0CA
62232+:109B10008F8500D02403FFBFA0A000D13C04080023
62233+:109B20008C8400648F8200D0A04400D28E1F000C71
62234+:109B30008F8A00D0978F00E4AD5F001C8E19001053
62235+:109B400024100030AD590018A5400030A551005434
62236+:109B5000A5510056A54F0016AD4E0068AD580080C7
62237+:109B6000AD580084914D006231AC000F358B001070
62238+:109B7000A14B00628F8600D090C900633128007F1E
62239+:109B8000A0C800638F8400D02406FFFF9085006387
62240+:109B900000A31024A08200638F9100D000E0102168
62241+:109BA000923F00BC37F90001A23900BC8F8A00D077
62242+:109BB000938F00F0AD580064AD5000C0914E00D3BB
62243+:109BC000000F690031CC000F018D5825A14B00D347
62244+:109BD0008F8500D08F8900DCACA900E88F8800D881
62245+:109BE0008FBF00188FB100148FB0001027BD002068
62246+:109BF000ACA800ECA4A600D6A4A000E0A4A000E2BB
62247+:109C000003E000080000000027BDFFE0AFB0001037
62248+:109C10008F90001CAFB10014AFBF00188E19000464
62249+:109C20003C1808008F180050240FFF80001989C0CD
62250+:109C30000238702131CD007F01CF602401BA50215C
62251+:109C40003C0B000CAF4C0028014B4021950900D47F
62252+:109C5000950400D68E0700043131FFFFAF8800D095
62253+:109C60000E000913000721C08E0600048F8300C870
62254+:109C7000000629C0AF4500209064003E30820040BD
62255+:109C8000144000068F8400D0341FFFFF948300D659
62256+:109C90003062FFFF145F000400000000948400D6CF
62257+:109CA0000E0008A83084FFFF8E050004022030213A
62258+:109CB0008FBF00188FB100148FB000102404002251
62259+:109CC00000003821000529C00A00127C27BD0020B1
62260+:109CD00027BDFFE0AFB100143091FFFFAFB000101F
62261+:109CE000AFBF00181220001D000080218F86001CCD
62262+:109CF0008CC500002403000600053F020005140285
62263+:109D000030E4000714830015304500FF2CA800063E
62264+:109D10001100004D000558803C0C0800258C57D4DC
62265+:109D2000016C50218D490000012000080000000056
62266+:109D30008F8E00EC240D000111CD005900000000B1
62267+:109D4000260B00013170FFFF24CA00200211202BD6
62268+:109D5000014030211480FFE6AF8A001C0200102170
62269+:109D60008FBF00188FB100148FB0001003E00008FF
62270+:109D700027BD0020938700CE14E00038240400148F
62271+:109D80000E001338000000008F86001C2402000122
62272+:109D90000A00147FAF8200EC8F8900EC24080002D7
62273+:109DA0001128003B2404001300002821000030216A
62274+:109DB000240700010E00127C000000000A00147F3E
62275+:109DC0008F86001C8F8700EC2405000214E5FFF647
62276+:109DD000240400120E0012E9000000008F8500E844
62277+:109DE00000403021240400120E00127C00003821B3
62278+:109DF0000A00147F8F86001C8F8300EC241F000351
62279+:109E0000147FFFD0260B00010E00129B0000000003
62280+:109E10008F8500E800403021240200022404001055
62281+:109E200000003821AF8200EC0E00127C0000000020
62282+:109E30000A00147F8F86001C8F8F00EC240600021E
62283+:109E400011E6000B0000000024040010000028218F
62284+:109E5000000030210A00149C240700010000282182
62285+:109E60000E00127C000030210A00147F8F86001C37
62286+:109E70000E0013A500000000144000128F99001C72
62287+:109E80008F86001C240200030A00147FAF8200ECBE
62288+:109E90000E001431000000000A00147F8F86001CA1
62289+:109EA0000E00128B000000002402000224040014A3
62290+:109EB0000000282100003021000038210A0014B9D8
62291+:109EC000AF8200EC004038212404001097380002D3
62292+:109ED000000028210E00127C3306FFFF0A00147FC9
62293+:109EE0008F86001C8F8400C83C077FFF34E6FFFF8D
62294+:109EF0008C8500742402000100A61824AC83007431
62295+:109F000003E00008A082000510A000362CA200800B
62296+:109F1000274A04003C0B000524090080104000077C
62297+:109F20002408008030A6000F00C540212D030081C9
62298+:109F30001460000200A0482124080080AF4B0030CC
62299+:109F400000000000000000000000000011000009F7
62300+:109F500000003821014030218C8D000024E70004EE
62301+:109F600000E8602BACCD0000248400041580FFFACB
62302+:109F700024C60004000000000000000000000000F3
62303+:109F80003C0E0006010E3825AF47003000000000EF
62304+:109F900000000000000000008F4F000031E80010BA
62305+:109FA0001100FFFD000000008F42003C8F43003C89
62306+:109FB0000049C8210323C02B130000040000000047
62307+:109FC0008F4C003825860001AF4600388F47003C93
62308+:109FD00000A9282300E96821AF4D003C14A0FFCE62
62309+:109FE0002CA2008003E000080000000027BDFFD085
62310+:109FF0003C020002AFB100143C11000CAF45003828
62311+:10A00000AFB3001CAF46003C00809821AF42003047
62312+:10A0100024050088AF44002803512021AFBF002849
62313+:10A02000AFB50024AFB40020AFB200180E0014F199
62314+:10A03000AFB000103C1F08008FFF004C3C18080018
62315+:10A040008F1800642410FF8003F3A82132B9007F29
62316+:10A0500002B078240018A0C0033A70210018914083
62317+:10A0600001D12021AF4F00280E0014F10254282105
62318+:10A070003C0D08008DAD00502405012001B358218E
62319+:10A08000316C007F01705024019A48210131202158
62320+:10A090000E0014F1AF4A00283C0808008D08005457
62321+:10A0A0003C0508008CA500640113382130E6007FD0
62322+:10A0B00000F0182400DA202100912021AF4300286D
62323+:10A0C0000E0014F1000529403C0208008C420058A3
62324+:10A0D0003C1008008E1000601200001C0053882104
62325+:10A0E0002415FF800A0015743C14000C3226007FF2
62326+:10A0F0000235182400DA202102402821AF4300282D
62327+:10A10000009420210E0014F12610FFC01200000F51
62328+:10A11000023288212E05004110A0FFF42412100005
62329+:10A120003226007F001091800235182400DA2021A9
62330+:10A1300002402821AF430028009420210E0014F192
62331+:10A14000000080211600FFF3023288213C0B08003A
62332+:10A150008D6B005C240AFF802405000201734021FE
62333+:10A16000010A4824AF4900283C0408009484006296
62334+:10A170003110007F021A88213C07000C0E000CAA47
62335+:10A180000227982100402821026020218FBF00284B
62336+:10A190008FB500248FB400208FB3001C8FB200183D
62337+:10A1A0008FB100148FB000100A0014F127BD0030E9
62338+:10A1B0008F83001C8C62000410400003000000002C
62339+:10A1C00003E00008000000008C6400108C650008AB
62340+:10A1D0000A00152A8C66000C000000000000001B1D
62341+:10A1E0000000000F0000000A000000080000000648
62342+:10A1F000000000050000000500000004000000044D
62343+:10A200000000000300000003000000030000000342
62344+:10A210000000000300000002000000020000000235
62345+:10A220000000000200000002000000020000000226
62346+:10A230000000000200000002000000020000000216
62347+:10A240000000000200000002000000020000000206
62348+:10A2500000000001000000010000000108000F24C0
62349+:10A2600008000D6C08000FB80800106008000F4CC3
62350+:10A2700008000F8C0800119408000D88080011B820
62351+:10A2800008000DD8080015540800151C08000D889A
62352+:10A2900008000D8808000D880800124008001240D0
62353+:10A2A00008000D8808000D88080014E008000D88DB
62354+:10A2B00008000D8808000D8808000D88080013B4F8
62355+:10A2C00008000D8808000D8808000D8808000D881A
62356+:10A2D00008000D8808000D8808000D8808000D880A
62357+:10A2E00008000D8808000D8808000D8808000D88FA
62358+:10A2F00008000D8808000D8808000FAC08000D88C4
62359+:10A3000008000D880800167808000D8808000D88E0
62360+:10A3100008000D8808000D8808000D8808000D88C9
62361+:10A3200008000D8808000D8808000D8808000D88B9
62362+:10A3300008000D8808000D8808000D8808000D88A9
62363+:10A3400008000D8808000D8808000D88080014100A
62364+:10A3500008000D8808000D8808001334080012A4B6
62365+:10A3600008001E2C08001EFC08001F1408001F28EF
62366+:10A3700008001F3808001E2C08001E2C08001E2C88
62367+:10A3800008001ED808002E1408002E1C08002DE41A
62368+:10A3900008002DF008002DFC08002E08080052F4DB
62369+:10A3A000080052B40800528008005254080052308D
62370+:10A3B000080051EC0A000C840000000000000000BE
62371+:10A3C0000000000D727870362E322E33000000002F
62372+:10A3D000060203030000000000000001000000006E
62373+:10A3E000000000000000000000000000000000006D
62374+:10A3F000000000000000000000000000000000005D
62375+:10A40000000000000000000000000000000000004C
62376+:10A41000000000000000000000000000000000003C
62377+:10A42000000000000000000000000000000000002C
62378+:10A43000000000000000000000000000000000001C
62379+:10A44000000000000000000000000000000000000C
62380+:10A4500000000000000000000000000000000000FC
62381+:10A4600000000000000000000000000000000000EC
62382+:10A4700000000000000000000000000000000000DC
62383+:10A4800000000000000000000000000000000000CC
62384+:10A4900000000000000000000000000000000000BC
62385+:10A4A00000000000000000000000000000000000AC
62386+:10A4B000000000000000000000000000000000009C
62387+:10A4C000000000000000000000000000000000008C
62388+:10A4D000000000000000000000000000000000007C
62389+:10A4E000000000000000000000000000000000006C
62390+:10A4F000000000000000000000000000000000005C
62391+:10A50000000000000000000000000000000000004B
62392+:10A51000000000000000000000000000000000003B
62393+:10A52000000000000000000000000000000000002B
62394+:10A53000000000000000000000000000000000001B
62395+:10A54000000000000000000000000000000000000B
62396+:10A5500000000000000000000000000000000000FB
62397+:10A5600000000000000000000000000000000000EB
62398+:10A5700000000000000000000000000000000000DB
62399+:10A5800000000000000000000000000000000000CB
62400+:10A5900000000000000000000000000000000000BB
62401+:10A5A00000000000000000000000000000000000AB
62402+:10A5B000000000000000000000000000000000009B
62403+:10A5C000000000000000000000000000000000008B
62404+:10A5D000000000000000000000000000000000007B
62405+:10A5E000000000000000000000000000000000006B
62406+:10A5F000000000000000000000000000000000005B
62407+:10A60000000000000000000000000000000000004A
62408+:10A61000000000000000000000000000000000003A
62409+:10A62000000000000000000000000000000000002A
62410+:10A63000000000000000000000000000000000001A
62411+:10A64000000000000000000000000000000000000A
62412+:10A6500000000000000000000000000000000000FA
62413+:10A6600000000000000000000000000000000000EA
62414+:10A6700000000000000000000000000000000000DA
62415+:10A6800000000000000000000000000000000000CA
62416+:10A6900000000000000000000000000000000000BA
62417+:10A6A00000000000000000000000000000000000AA
62418+:10A6B000000000000000000000000000000000009A
62419+:10A6C000000000000000000000000000000000008A
62420+:10A6D000000000000000000000000000000000007A
62421+:10A6E000000000000000000000000000000000006A
62422+:10A6F000000000000000000000000000000000005A
62423+:10A700000000000000000000000000000000000049
62424+:10A710000000000000000000000000000000000039
62425+:10A720000000000000000000000000000000000029
62426+:10A730000000000000000000000000000000000019
62427+:10A740000000000000000000000000000000000009
62428+:10A7500000000000000000000000000000000000F9
62429+:10A7600000000000000000000000000000000000E9
62430+:10A7700000000000000000000000000000000000D9
62431+:10A7800000000000000000000000000000000000C9
62432+:10A7900000000000000000000000000000000000B9
62433+:10A7A00000000000000000000000000000000000A9
62434+:10A7B0000000000000000000000000000000000099
62435+:10A7C0000000000000000000000000000000000089
62436+:10A7D0000000000000000000000000000000000079
62437+:10A7E0000000000000000000000000000000000069
62438+:10A7F0000000000000000000000000000000000059
62439+:10A800000000000000000000000000000000000048
62440+:10A810000000000000000000000000000000000038
62441+:10A820000000000000000000000000000000000028
62442+:10A830000000000000000000000000000000000018
62443+:10A840000000000000000000000000000000000008
62444+:10A8500000000000000000000000000000000000F8
62445+:10A8600000000000000000000000000000000000E8
62446+:10A8700000000000000000000000000000000000D8
62447+:10A8800000000000000000000000000000000000C8
62448+:10A8900000000000000000000000000000000000B8
62449+:10A8A00000000000000000000000000000000000A8
62450+:10A8B0000000000000000000000000000000000098
62451+:10A8C0000000000000000000000000000000000088
62452+:10A8D0000000000000000000000000000000000078
62453+:10A8E0000000000000000000000000000000000068
62454+:10A8F0000000000000000000000000000000000058
62455+:10A900000000000000000000000000000000000047
62456+:10A910000000000000000000000000000000000037
62457+:10A920000000000000000000000000000000000027
62458+:10A930000000000000000000000000000000000017
62459+:10A940000000000000000000000000000000000007
62460+:10A9500000000000000000000000000000000000F7
62461+:10A9600000000000000000000000000000000000E7
62462+:10A9700000000000000000000000000000000000D7
62463+:10A9800000000000000000000000000000000000C7
62464+:10A9900000000000000000000000000000000000B7
62465+:10A9A00000000000000000000000000000000000A7
62466+:10A9B0000000000000000000000000000000000097
62467+:10A9C0000000000000000000000000000000000087
62468+:10A9D0000000000000000000000000000000000077
62469+:10A9E0000000000000000000000000000000000067
62470+:10A9F0000000000000000000000000000000000057
62471+:10AA00000000000000000000000000000000000046
62472+:10AA10000000000000000000000000000000000036
62473+:10AA20000000000000000000000000000000000026
62474+:10AA30000000000000000000000000000000000016
62475+:10AA40000000000000000000000000000000000006
62476+:10AA500000000000000000000000000000000000F6
62477+:10AA600000000000000000000000000000000000E6
62478+:10AA700000000000000000000000000000000000D6
62479+:10AA800000000000000000000000000000000000C6
62480+:10AA900000000000000000000000000000000000B6
62481+:10AAA00000000000000000000000000000000000A6
62482+:10AAB0000000000000000000000000000000000096
62483+:10AAC0000000000000000000000000000000000086
62484+:10AAD0000000000000000000000000000000000076
62485+:10AAE0000000000000000000000000000000000066
62486+:10AAF0000000000000000000000000000000000056
62487+:10AB00000000000000000000000000000000000045
62488+:10AB10000000000000000000000000000000000035
62489+:10AB20000000000000000000000000000000000025
62490+:10AB30000000000000000000000000000000000015
62491+:10AB40000000000000000000000000000000000005
62492+:10AB500000000000000000000000000000000000F5
62493+:10AB600000000000000000000000000000000000E5
62494+:10AB700000000000000000000000000000000000D5
62495+:10AB800000000000000000000000000000000000C5
62496+:10AB900000000000000000000000000000000000B5
62497+:10ABA00000000000000000000000000000000000A5
62498+:10ABB0000000000000000000000000000000000095
62499+:10ABC0000000000000000000000000000000000085
62500+:10ABD0000000000000000000000000000000000075
62501+:10ABE0000000000000000000000000000000000065
62502+:10ABF0000000000000000000000000000000000055
62503+:10AC00000000000000000000000000000000000044
62504+:10AC10000000000000000000000000000000000034
62505+:10AC20000000000000000000000000000000000024
62506+:10AC30000000000000000000000000000000000014
62507+:10AC40000000000000000000000000000000000004
62508+:10AC500000000000000000000000000000000000F4
62509+:10AC600000000000000000000000000000000000E4
62510+:10AC700000000000000000000000000000000000D4
62511+:10AC800000000000000000000000000000000000C4
62512+:10AC900000000000000000000000000000000000B4
62513+:10ACA00000000000000000000000000000000000A4
62514+:10ACB0000000000000000000000000000000000094
62515+:10ACC0000000000000000000000000000000000084
62516+:10ACD0000000000000000000000000000000000074
62517+:10ACE0000000000000000000000000000000000064
62518+:10ACF0000000000000000000000000000000000054
62519+:10AD00000000000000000000000000000000000043
62520+:10AD10000000000000000000000000000000000033
62521+:10AD20000000000000000000000000000000000023
62522+:10AD30000000000000000000000000000000000013
62523+:10AD40000000000000000000000000000000000003
62524+:10AD500000000000000000000000000000000000F3
62525+:10AD600000000000000000000000000000000000E3
62526+:10AD700000000000000000000000000000000000D3
62527+:10AD800000000000000000000000000000000000C3
62528+:10AD900000000000000000000000000000000000B3
62529+:10ADA00000000000000000000000000000000000A3
62530+:10ADB0000000000000000000000000000000000093
62531+:10ADC0000000000000000000000000000000000083
62532+:10ADD0000000000000000000000000000000000073
62533+:10ADE0000000000000000000000000000000000063
62534+:10ADF0000000000000000000000000000000000053
62535+:10AE00000000000000000000000000000000000042
62536+:10AE10000000000000000000000000000000000032
62537+:10AE20000000000000000000000000000000000022
62538+:10AE30000000000000000000000000000000000012
62539+:10AE40000000000000000000000000000000000002
62540+:10AE500000000000000000000000000000000000F2
62541+:10AE600000000000000000000000000000000000E2
62542+:10AE700000000000000000000000000000000000D2
62543+:10AE800000000000000000000000000000000000C2
62544+:10AE900000000000000000000000000000000000B2
62545+:10AEA00000000000000000000000000000000000A2
62546+:10AEB0000000000000000000000000000000000092
62547+:10AEC0000000000000000000000000000000000082
62548+:10AED0000000000000000000000000000000000072
62549+:10AEE0000000000000000000000000000000000062
62550+:10AEF0000000000000000000000000000000000052
62551+:10AF00000000000000000000000000000000000041
62552+:10AF10000000000000000000000000000000000031
62553+:10AF20000000000000000000000000000000000021
62554+:10AF30000000000000000000000000000000000011
62555+:10AF40000000000000000000000000000000000001
62556+:10AF500000000000000000000000000000000000F1
62557+:10AF600000000000000000000000000000000000E1
62558+:10AF700000000000000000000000000000000000D1
62559+:10AF800000000000000000000000000000000000C1
62560+:10AF900000000000000000000000000000000000B1
62561+:10AFA00000000000000000000000000000000000A1
62562+:10AFB0000000000000000000000000000000000091
62563+:10AFC0000000000000000000000000000000000081
62564+:10AFD0000000000000000000000000000000000071
62565+:10AFE0000000000000000000000000000000000061
62566+:10AFF0000000000000000000000000000000000051
62567+:10B000000000000000000000000000000000000040
62568+:10B010000000000000000000000000000000000030
62569+:10B020000000000000000000000000000000000020
62570+:10B030000000000000000000000000000000000010
62571+:10B040000000000000000000000000000000000000
62572+:10B0500000000000000000000000000000000000F0
62573+:10B0600000000000000000000000000000000000E0
62574+:10B0700000000000000000000000000000000000D0
62575+:10B0800000000000000000000000000000000000C0
62576+:10B0900000000000000000000000000000000000B0
62577+:10B0A00000000000000000000000000000000000A0
62578+:10B0B0000000000000000000000000000000000090
62579+:10B0C0000000000000000000000000000000000080
62580+:10B0D0000000000000000000000000000000000070
62581+:10B0E0000000000000000000000000000000000060
62582+:10B0F0000000000000000000000000000000000050
62583+:10B10000000000000000000000000000000000003F
62584+:10B11000000000000000000000000000000000002F
62585+:10B12000000000000000000000000000000000001F
62586+:10B13000000000000000000000000000000000000F
62587+:10B1400000000000000000000000000000000000FF
62588+:10B1500000000000000000000000000000000000EF
62589+:10B1600000000000000000000000000000000000DF
62590+:10B1700000000000000000000000000000000000CF
62591+:10B1800000000000000000000000000000000000BF
62592+:10B1900000000000000000000000000000000000AF
62593+:10B1A000000000000000000000000000000000009F
62594+:10B1B000000000000000000000000000000000008F
62595+:10B1C000000000000000000000000000000000007F
62596+:10B1D000000000000000000000000000000000006F
62597+:10B1E000000000000000000000000000000000005F
62598+:10B1F000000000000000000000000000000000004F
62599+:10B20000000000000000000000000000000000003E
62600+:10B21000000000000000000000000000000000002E
62601+:10B22000000000000000000000000000000000001E
62602+:10B23000000000000000000000000000000000000E
62603+:10B2400000000000000000000000000000000000FE
62604+:10B2500000000000000000000000000000000000EE
62605+:10B2600000000000000000000000000000000000DE
62606+:10B2700000000000000000000000000000000000CE
62607+:10B2800000000000000000000000000000000000BE
62608+:10B2900000000000000000000000000000000000AE
62609+:10B2A000000000000000000000000000000000009E
62610+:10B2B000000000000000000000000000000000008E
62611+:10B2C000000000000000000000000000000000007E
62612+:10B2D000000000000000000000000000000000006E
62613+:10B2E000000000000000000000000000000000005E
62614+:10B2F000000000000000000000000000000000004E
62615+:10B30000000000000000000000000000000000003D
62616+:10B31000000000000000000000000000000000002D
62617+:10B32000000000000000000000000000000000001D
62618+:10B33000000000000000000000000000000000000D
62619+:10B3400000000000000000000000000000000000FD
62620+:10B3500000000000000000000000000000000000ED
62621+:10B3600000000000000000000000000000000000DD
62622+:10B3700000000000000000000000000000000000CD
62623+:10B3800000000000000000000000000000000000BD
62624+:10B3900000000000000000000000000000000000AD
62625+:10B3A000000000000000000000000000000000009D
62626+:10B3B000000000000000000000000000000000008D
62627+:10B3C000000000000000000000000000000000007D
62628+:10B3D000000000000000000000000000000000006D
62629+:10B3E000000000000000000000000000000000005D
62630+:10B3F000000000000000000000000000000000004D
62631+:10B40000000000000000000000000000000000003C
62632+:10B41000000000000000000000000000000000002C
62633+:10B42000000000000000000000000000000000001C
62634+:10B43000000000000000000000000000000000000C
62635+:10B4400000000000000000000000000000000000FC
62636+:10B4500000000000000000000000000000000000EC
62637+:10B4600000000000000000000000000000000000DC
62638+:10B4700000000000000000000000000000000000CC
62639+:10B4800000000000000000000000000000000000BC
62640+:10B4900000000000000000000000000000000000AC
62641+:10B4A000000000000000000000000000000000009C
62642+:10B4B000000000000000000000000000000000008C
62643+:10B4C000000000000000000000000000000000007C
62644+:10B4D000000000000000000000000000000000006C
62645+:10B4E000000000000000000000000000000000005C
62646+:10B4F000000000000000000000000000000000004C
62647+:10B50000000000000000000000000000000000003B
62648+:10B51000000000000000000000000000000000002B
62649+:10B52000000000000000000000000000000000001B
62650+:10B53000000000000000000000000000000000000B
62651+:10B5400000000000000000000000000000000000FB
62652+:10B5500000000000000000000000000000000000EB
62653+:10B5600000000000000000000000000000000000DB
62654+:10B5700000000000000000000000000000000000CB
62655+:10B5800000000000000000000000000000000000BB
62656+:10B5900000000000000000000000000000000000AB
62657+:10B5A000000000000000000000000000000000009B
62658+:10B5B000000000000000000000000000000000008B
62659+:10B5C000000000000000000000000000000000007B
62660+:10B5D000000000000000000000000000000000006B
62661+:10B5E000000000000000000000000000000000005B
62662+:10B5F000000000000000000000000000000000004B
62663+:10B60000000000000000000000000000000000003A
62664+:10B61000000000000000000000000000000000002A
62665+:10B62000000000000000000000000000000000001A
62666+:10B63000000000000000000000000000000000000A
62667+:10B6400000000000000000000000000000000000FA
62668+:10B6500000000000000000000000000000000000EA
62669+:10B6600000000000000000000000000000000000DA
62670+:10B6700000000000000000000000000000000000CA
62671+:10B6800000000000000000000000000000000000BA
62672+:10B6900000000000000000000000000000000000AA
62673+:10B6A000000000000000000000000000000000009A
62674+:10B6B000000000000000000000000000000000008A
62675+:10B6C000000000000000000000000000000000007A
62676+:10B6D000000000000000000000000000000000006A
62677+:10B6E000000000000000000000000000000000005A
62678+:10B6F000000000000000000000000000000000004A
62679+:10B700000000000000000000000000000000000039
62680+:10B710000000000000000000000000000000000029
62681+:10B720000000000000000000000000000000000019
62682+:10B730000000000000000000000000000000000009
62683+:10B7400000000000000000000000000000000000F9
62684+:10B7500000000000000000000000000000000000E9
62685+:10B7600000000000000000000000000000000000D9
62686+:10B7700000000000000000000000000000000000C9
62687+:10B7800000000000000000000000000000000000B9
62688+:10B7900000000000000000000000000000000000A9
62689+:10B7A0000000000000000000000000000000000099
62690+:10B7B0000000000000000000000000000000000089
62691+:10B7C0000000000000000000000000000000000079
62692+:10B7D0000000000000000000000000000000000069
62693+:10B7E0000000000000000000000000000000000059
62694+:10B7F0000000000000000000000000000000000049
62695+:10B800000000000000000000000000000000000038
62696+:10B810000000000000000000000000000000000028
62697+:10B820000000000000000000000000000000000018
62698+:10B830000000000000000000000000000000000008
62699+:10B8400000000000000000000000000000000000F8
62700+:10B8500000000000000000000000000000000000E8
62701+:10B8600000000000000000000000000000000000D8
62702+:10B8700000000000000000000000000000000000C8
62703+:10B8800000000000000000000000000000000000B8
62704+:10B8900000000000000000000000000000000000A8
62705+:10B8A0000000000000000000000000000000000098
62706+:10B8B0000000000000000000000000000000000088
62707+:10B8C0000000000000000000000000000000000078
62708+:10B8D0000000000000000000000000000000000068
62709+:10B8E0000000000000000000000000000000000058
62710+:10B8F0000000000000000000000000000000000048
62711+:10B900000000000000000000000000000000000037
62712+:10B910000000000000000000000000000000000027
62713+:10B920000000000000000000000000000000000017
62714+:10B930000000000000000000000000000000000007
62715+:10B9400000000000000000000000000000000000F7
62716+:10B9500000000000000000000000000000000000E7
62717+:10B9600000000000000000000000000000000000D7
62718+:10B9700000000000000000000000000000000000C7
62719+:10B9800000000000000000000000000000000000B7
62720+:10B9900000000000000000000000000000000000A7
62721+:10B9A0000000000000000000000000000000000097
62722+:10B9B0000000000000000000000000000000000087
62723+:10B9C0000000000000000000000000000000000077
62724+:10B9D0000000000000000000000000000000000067
62725+:10B9E0000000000000000000000000000000000057
62726+:10B9F0000000000000000000000000000000000047
62727+:10BA00000000000000000000000000000000000036
62728+:10BA10000000000000000000000000000000000026
62729+:10BA20000000000000000000000000000000000016
62730+:10BA30000000000000000000000000000000000006
62731+:10BA400000000000000000000000000000000000F6
62732+:10BA500000000000000000000000000000000000E6
62733+:10BA600000000000000000000000000000000000D6
62734+:10BA700000000000000000000000000000000000C6
62735+:10BA800000000000000000000000000000000000B6
62736+:10BA900000000000000000000000000000000000A6
62737+:10BAA0000000000000000000000000000000000096
62738+:10BAB0000000000000000000000000000000000086
62739+:10BAC0000000000000000000000000000000000076
62740+:10BAD0000000000000000000000000000000000066
62741+:10BAE0000000000000000000000000000000000056
62742+:10BAF0000000000000000000000000000000000046
62743+:10BB00000000000000000000000000000000000035
62744+:10BB10000000000000000000000000000000000025
62745+:10BB20000000000000000000000000000000000015
62746+:10BB30000000000000000000000000000000000005
62747+:10BB400000000000000000000000000000000000F5
62748+:10BB500000000000000000000000000000000000E5
62749+:10BB600000000000000000000000000000000000D5
62750+:10BB700000000000000000000000000000000000C5
62751+:10BB800000000000000000000000000000000000B5
62752+:10BB900000000000000000000000000000000000A5
62753+:10BBA0000000000000000000000000000000000095
62754+:10BBB0000000000000000000000000000000000085
62755+:10BBC0000000000000000000000000000000000075
62756+:10BBD0000000000000000000000000000000000065
62757+:10BBE0000000000000000000000000000000000055
62758+:10BBF0000000000000000000000000000000000045
62759+:10BC00000000000000000000000000000000000034
62760+:10BC10000000000000000000000000000000000024
62761+:10BC20000000000000000000000000000000000014
62762+:10BC30000000000000000000000000000000000004
62763+:10BC400000000000000000000000000000000000F4
62764+:10BC500000000000000000000000000000000000E4
62765+:10BC600000000000000000000000000000000000D4
62766+:10BC700000000000000000000000000000000000C4
62767+:10BC800000000000000000000000000000000000B4
62768+:10BC900000000000000000000000000000000000A4
62769+:10BCA0000000000000000000000000000000000094
62770+:10BCB0000000000000000000000000000000000084
62771+:10BCC0000000000000000000000000000000000074
62772+:10BCD0000000000000000000000000000000000064
62773+:10BCE0000000000000000000000000000000000054
62774+:10BCF0000000000000000000000000000000000044
62775+:10BD00000000000000000000000000000000000033
62776+:10BD10000000000000000000000000000000000023
62777+:10BD20000000000000000000000000000000000013
62778+:10BD30000000000000000000000000000000000003
62779+:10BD400000000000000000000000000000000000F3
62780+:10BD500000000000000000000000000000000000E3
62781+:10BD600000000000000000000000000000000000D3
62782+:10BD700000000000000000000000000000000000C3
62783+:10BD800000000000000000000000000000000000B3
62784+:10BD900000000000000000000000000000000000A3
62785+:10BDA0000000000000000000000000000000000093
62786+:10BDB0000000000000000000000000000000000083
62787+:10BDC0000000000000000000000000000000000073
62788+:10BDD0000000000000000000000000000000000063
62789+:10BDE0000000000000000000000000000000000053
62790+:10BDF0000000000000000000000000000000000043
62791+:10BE00000000000000000000000000000000000032
62792+:10BE10000000000000000000000000000000000022
62793+:10BE20000000000000000000000000000000000012
62794+:10BE30000000000000000000000000000000000002
62795+:10BE400000000000000000000000000000000000F2
62796+:10BE500000000000000000000000000000000000E2
62797+:10BE600000000000000000000000000000000000D2
62798+:10BE700000000000000000000000000000000000C2
62799+:10BE800000000000000000000000000000000000B2
62800+:10BE900000000000000000000000000000000000A2
62801+:10BEA0000000000000000000000000000000000092
62802+:10BEB0000000000000000000000000000000000082
62803+:10BEC0000000000000000000000000000000000072
62804+:10BED0000000000000000000000000000000000062
62805+:10BEE0000000000000000000000000000000000052
62806+:10BEF0000000000000000000000000000000000042
62807+:10BF00000000000000000000000000000000000031
62808+:10BF10000000000000000000000000000000000021
62809+:10BF20000000000000000000000000000000000011
62810+:10BF30000000000000000000000000000000000001
62811+:10BF400000000000000000000000000000000000F1
62812+:10BF500000000000000000000000000000000000E1
62813+:10BF600000000000000000000000000000000000D1
62814+:10BF700000000000000000000000000000000000C1
62815+:10BF800000000000000000000000000000000000B1
62816+:10BF900000000000000000000000000000000000A1
62817+:10BFA0000000000000000000000000000000000091
62818+:10BFB0000000000000000000000000000000000081
62819+:10BFC0000000000000000000000000000000000071
62820+:10BFD0000000000000000000000000000000000061
62821+:10BFE0000000000000000000000000000000000051
62822+:10BFF0000000000000000000000000000000000041
62823+:10C000000000000000000000000000000000000030
62824+:10C010000000000000000000000000000000000020
62825+:10C020000000000000000000000000000000000010
62826+:10C030000000000000000000000000000000000000
62827+:10C0400000000000000000000000000000000000F0
62828+:10C0500000000000000000000000000000000000E0
62829+:10C0600000000000000000000000000000000000D0
62830+:10C0700000000000000000000000000000000000C0
62831+:10C0800000000000000000000000000000000000B0
62832+:10C0900000000000000000000000000000000000A0
62833+:10C0A0000000000000000000000000000000000090
62834+:10C0B0000000000000000000000000000000000080
62835+:10C0C0000000000000000000000000000000000070
62836+:10C0D0000000000000000000000000000000000060
62837+:10C0E0000000000000000000000000000000000050
62838+:10C0F0000000000000000000000000000000000040
62839+:10C10000000000000000000000000000000000002F
62840+:10C11000000000000000000000000000000000001F
62841+:10C12000000000000000000000000000000000000F
62842+:10C1300000000000000000000000000000000000FF
62843+:10C1400000000000000000000000000000000000EF
62844+:10C1500000000000000000000000000000000000DF
62845+:10C1600000000000000000000000000000000000CF
62846+:10C1700000000000000000000000000000000000BF
62847+:10C1800000000000000000000000000000000000AF
62848+:10C19000000000000000000000000000000000009F
62849+:10C1A000000000000000000000000000000000008F
62850+:10C1B000000000000000000000000000000000007F
62851+:10C1C000000000000000000000000000000000006F
62852+:10C1D000000000000000000000000000000000005F
62853+:10C1E000000000000000000000000000000000004F
62854+:10C1F000000000000000000000000000000000003F
62855+:10C20000000000000000000000000000000000002E
62856+:10C21000000000000000000000000000000000001E
62857+:10C22000000000000000000000000000000000000E
62858+:10C2300000000000000000000000000000000000FE
62859+:10C2400000000000000000000000000000000000EE
62860+:10C2500000000000000000000000000000000000DE
62861+:10C2600000000000000000000000000000000000CE
62862+:10C2700000000000000000000000000000000000BE
62863+:10C2800000000000000000000000000000000000AE
62864+:10C29000000000000000000000000000000000009E
62865+:10C2A000000000000000000000000000000000008E
62866+:10C2B000000000000000000000000000000000007E
62867+:10C2C000000000000000000000000000000000006E
62868+:10C2D000000000000000000000000000000000005E
62869+:10C2E000000000000000000000000000000000004E
62870+:10C2F000000000000000000000000000000000003E
62871+:10C30000000000000000000000000000000000002D
62872+:10C31000000000000000000000000000000000001D
62873+:10C32000000000000000000000000000000000000D
62874+:10C3300000000000000000000000000000000000FD
62875+:10C3400000000000000000000000000000000000ED
62876+:10C3500000000000000000000000000000000000DD
62877+:10C3600000000000000000000000000000000000CD
62878+:10C3700000000000000000000000000000000000BD
62879+:10C3800000000000000000000000000000000000AD
62880+:10C39000000000000000000000000000000000009D
62881+:10C3A000000000000000000000000000000000008D
62882+:10C3B000000000000000000000000000000000007D
62883+:10C3C000000000000000000000000000000000006D
62884+:10C3D000000000000000000000000000000000005D
62885+:10C3E000000000000000000000000000000000004D
62886+:10C3F000000000000000000000000000000000003D
62887+:10C40000000000000000000000000000000000002C
62888+:10C41000000000000000000000000000000000001C
62889+:10C42000000000000000000000000000000000000C
62890+:10C4300000000000000000000000000000000000FC
62891+:10C4400000000000000000000000000000000000EC
62892+:10C4500000000000000000000000000000000000DC
62893+:10C4600000000000000000000000000000000000CC
62894+:10C4700000000000000000000000000000000000BC
62895+:10C4800000000000000000000000000000000000AC
62896+:10C49000000000000000000000000000000000009C
62897+:10C4A000000000000000000000000000000000008C
62898+:10C4B000000000000000000000000000000000007C
62899+:10C4C000000000000000000000000000000000006C
62900+:10C4D000000000000000000000000000000000005C
62901+:10C4E000000000000000000000000000000000004C
62902+:10C4F000000000000000000000000000000000003C
62903+:10C50000000000000000000000000000000000002B
62904+:10C51000000000000000000000000000000000001B
62905+:10C52000000000000000000000000000000000000B
62906+:10C5300000000000000000000000000000000000FB
62907+:10C5400000000000000000000000000000000000EB
62908+:10C5500000000000000000000000000000000000DB
62909+:10C5600000000000000000000000000000000000CB
62910+:10C5700000000000000000000000000000000000BB
62911+:10C5800000000000000000000000000000000000AB
62912+:10C59000000000000000000000000000000000009B
62913+:10C5A000000000000000000000000000000000008B
62914+:10C5B000000000000000000000000000000000007B
62915+:10C5C000000000000000000000000000000000006B
62916+:10C5D000000000000000000000000000000000005B
62917+:10C5E000000000000000000000000000000000004B
62918+:10C5F000000000000000000000000000000000003B
62919+:10C60000000000000000000000000000000000002A
62920+:10C61000000000000000000000000000000000001A
62921+:10C62000000000000000000000000000000000000A
62922+:10C6300000000000000000000000000000000000FA
62923+:10C6400000000000000000000000000000000000EA
62924+:10C6500000000000000000000000000000000000DA
62925+:10C6600000000000000000000000000000000000CA
62926+:10C6700000000000000000000000000000000000BA
62927+:10C6800000000000000000000000000000000000AA
62928+:10C69000000000000000000000000000000000009A
62929+:10C6A000000000000000000000000000000000008A
62930+:10C6B000000000000000000000000000000000007A
62931+:10C6C000000000000000000000000000000000006A
62932+:10C6D000000000000000000000000000000000005A
62933+:10C6E000000000000000000000000000000000004A
62934+:10C6F000000000000000000000000000000000003A
62935+:10C700000000000000000000000000000000000029
62936+:10C710000000000000000000000000000000000019
62937+:10C720000000000000000000000000000000000009
62938+:10C7300000000000000000000000000000000000F9
62939+:10C7400000000000000000000000000000000000E9
62940+:10C7500000000000000000000000000000000000D9
62941+:10C7600000000000000000000000000000000000C9
62942+:10C7700000000000000000000000000000000000B9
62943+:10C7800000000000000000000000000000000000A9
62944+:10C790000000000000000000000000000000000099
62945+:10C7A0000000000000000000000000000000000089
62946+:10C7B0000000000000000000000000000000000079
62947+:10C7C0000000000000000000000000000000000069
62948+:10C7D0000000000000000000000000000000000059
62949+:10C7E0000000000000000000000000000000000049
62950+:10C7F0000000000000000000000000000000000039
62951+:10C800000000000000000000000000000000000028
62952+:10C810000000000000000000000000000000000018
62953+:10C820000000000000000000000000000000000008
62954+:10C8300000000000000000000000000000000000F8
62955+:10C8400000000000000000000000000000000000E8
62956+:10C8500000000000000000000000000000000000D8
62957+:10C8600000000000000000000000000000000000C8
62958+:10C8700000000000000000000000000000000000B8
62959+:10C8800000000000000000000000000000000000A8
62960+:10C890000000000000000000000000000000000098
62961+:10C8A0000000000000000000000000000000000088
62962+:10C8B0000000000000000000000000000000000078
62963+:10C8C0000000000000000000000000000000000068
62964+:10C8D0000000000000000000000000000000000058
62965+:10C8E0000000000000000000000000000000000048
62966+:10C8F0000000000000000000000000000000000038
62967+:10C900000000000000000000000000000000000027
62968+:10C910000000000000000000000000000000000017
62969+:10C920000000000000000000000000000000000007
62970+:10C9300000000000000000000000000000000000F7
62971+:10C9400000000000000000000000000000000000E7
62972+:10C9500000000000000000000000000000000000D7
62973+:10C9600000000000000000000000000000000000C7
62974+:10C9700000000000000000000000000000000000B7
62975+:10C9800000000000000000000000000000000000A7
62976+:10C990000000000000000000000000000000000097
62977+:10C9A0000000000000000000000000000000000087
62978+:10C9B0000000000000000000000000000000000077
62979+:10C9C0000000000000000000000000000000000067
62980+:10C9D0000000000000000000000000000000000057
62981+:10C9E0000000000000000000000000000000000047
62982+:10C9F0000000000000000000000000000000000037
62983+:10CA00000000000000000000000000000000000026
62984+:10CA10000000000000000000000000000000000016
62985+:10CA20000000000000000000000000000000000006
62986+:10CA300000000000000000000000000000000000F6
62987+:10CA400000000000000000000000000000000000E6
62988+:10CA500000000000000000000000000000000000D6
62989+:10CA600000000000000000000000000000000000C6
62990+:10CA700000000000000000000000000000000000B6
62991+:10CA800000000000000000000000000000000000A6
62992+:10CA90000000000000000000000000000000000096
62993+:10CAA0000000000000000000000000000000000086
62994+:10CAB0000000000000000000000000000000000076
62995+:10CAC0000000000000000000000000000000000066
62996+:10CAD0000000000000000000000000000000000056
62997+:10CAE0000000000000000000000000000000000046
62998+:10CAF0000000000000000000000000000000000036
62999+:10CB00000000000000000000000000000000000025
63000+:10CB10000000000000000000000000000000000015
63001+:10CB20000000000000000000000000000000000005
63002+:10CB300000000000000000000000000000000000F5
63003+:10CB400000000000000000000000000000000000E5
63004+:10CB500000000000000000000000000000000000D5
63005+:10CB600000000000000000000000000000000000C5
63006+:10CB700000000000000000000000000000000000B5
63007+:10CB800000000000000000000000000000000000A5
63008+:10CB90000000000000000000000000000000000095
63009+:10CBA0000000000000000000000000000000000085
63010+:10CBB0000000000000000000000000000000000075
63011+:10CBC0000000000000000000000000000000000065
63012+:10CBD0000000000000000000000000000000000055
63013+:10CBE0000000000000000000000000000000000045
63014+:10CBF0000000000000000000000000000000000035
63015+:10CC00000000000000000000000000000000000024
63016+:10CC10000000000000000000000000000000000014
63017+:10CC20000000000000000000000000000000000004
63018+:10CC300000000000000000000000000000000000F4
63019+:10CC400000000000000000000000000000000000E4
63020+:10CC500000000000000000000000000000000000D4
63021+:10CC600000000000000000000000000000000000C4
63022+:10CC700000000000000000000000000000000000B4
63023+:10CC800000000000000000000000000000000000A4
63024+:10CC90000000000000000000000000000000000094
63025+:10CCA0000000000000000000000000000000000084
63026+:10CCB0000000000000000000000000000000000074
63027+:10CCC0000000000000000000000000000000000064
63028+:10CCD0000000000000000000000000000000000054
63029+:10CCE0000000000000000000000000000000000044
63030+:10CCF0000000000000000000000000000000000034
63031+:10CD00000000000000000000000000000000000023
63032+:10CD10000000000000000000000000000000000013
63033+:10CD20000000000000000000000000000000000003
63034+:10CD300000000000000000000000000000000000F3
63035+:10CD400000000000000000000000000000000000E3
63036+:10CD500000000000000000000000000000000000D3
63037+:10CD600000000000000000000000000000000000C3
63038+:10CD700000000000000000000000000000000000B3
63039+:10CD800000000000000000000000000000000000A3
63040+:10CD90000000000000000000000000000000000093
63041+:10CDA0000000000000000000000000000000000083
63042+:10CDB0000000000000000000000000000000000073
63043+:10CDC0000000000000000000000000000000000063
63044+:10CDD0000000000000000000000000000000000053
63045+:10CDE0000000000000000000000000000000000043
63046+:10CDF0000000000000000000000000000000000033
63047+:10CE00000000000000000000000000000000000022
63048+:10CE10000000000000000000000000000000000012
63049+:10CE20000000000000000000000000000000000002
63050+:10CE300000000000000000000000000000000000F2
63051+:10CE400000000000000000000000000000000000E2
63052+:10CE500000000000000000000000000000000000D2
63053+:10CE600000000000000000000000000000000000C2
63054+:10CE700000000000000000000000000000000000B2
63055+:10CE800000000000000000000000000000000000A2
63056+:10CE90000000000000000000000000000000000092
63057+:10CEA0000000000000000000000000000000000082
63058+:10CEB0000000000000000000000000000000000072
63059+:10CEC0000000000000000000000000000000000062
63060+:10CED0000000000000000000000000000000000052
63061+:10CEE0000000000000000000000000000000000042
63062+:10CEF0000000000000000000000000000000000032
63063+:10CF00000000000000000000000000000000000021
63064+:10CF10000000000000000000000000000000000011
63065+:10CF20000000000000000000000000000000000001
63066+:10CF300000000000000000000000000000000000F1
63067+:10CF400000000000000000000000000000000000E1
63068+:10CF500000000000000000000000000000000000D1
63069+:10CF600000000000000000000000000000000000C1
63070+:10CF700000000000000000000000000000000000B1
63071+:10CF800000000000000000000000000000000000A1
63072+:10CF90000000000000000000000000000000000091
63073+:10CFA0000000000000000000000000000000000081
63074+:10CFB0000000000000000000000000000000000071
63075+:10CFC0000000000000000000000000000000000061
63076+:10CFD0000000000000000000000000000000000051
63077+:10CFE0000000000000000000000000000000000041
63078+:10CFF0000000000000000000000000000000000031
63079+:10D000000000000000000000000000000000000020
63080+:10D010000000000000000000000000000000000010
63081+:10D020000000000000000000000000000000000000
63082+:10D0300000000000000000000000000000000000F0
63083+:10D0400000000000000000000000000000000000E0
63084+:10D0500000000000000000000000000000000000D0
63085+:10D0600000000000000000000000000000000000C0
63086+:10D0700000000000000000000000000000000000B0
63087+:10D0800000000000000000000000000000000000A0
63088+:10D090000000000000000000000000000000000090
63089+:10D0A0000000000000000000000000000000000080
63090+:10D0B0000000000000000000000000000000000070
63091+:10D0C0000000000000000000000000000000000060
63092+:10D0D0000000000000000000000000000000000050
63093+:10D0E0000000000000000000000000000000000040
63094+:10D0F0000000000000000000000000000000000030
63095+:10D10000000000000000000000000000000000001F
63096+:10D11000000000000000000000000000000000000F
63097+:10D1200000000000000000000000000000000000FF
63098+:10D1300000000000000000000000000000000000EF
63099+:10D1400000000000000000000000000000000000DF
63100+:10D1500000000000000000000000000000000000CF
63101+:10D1600000000000000000000000000000000000BF
63102+:10D1700000000000000000000000000000000000AF
63103+:10D18000000000000000000000000000000000009F
63104+:10D19000000000000000000000000000000000008F
63105+:10D1A000000000000000000000000000000000007F
63106+:10D1B000000000000000000000000000000000006F
63107+:10D1C000000000000000000000000000000000005F
63108+:10D1D000000000000000000000000000000000004F
63109+:10D1E000000000000000000000000000000000003F
63110+:10D1F000000000000000000000000000000000002F
63111+:10D20000000000000000000000000000000000001E
63112+:10D21000000000000000000000000000000000000E
63113+:10D2200000000000000000000000000000000000FE
63114+:10D2300000000000000000000000000000000000EE
63115+:10D2400000000000000000000000000000000000DE
63116+:10D2500000000000000000000000000000000000CE
63117+:10D2600000000000000000000000000000000000BE
63118+:10D2700000000000000000000000000000000000AE
63119+:10D28000000000000000000000000000000000009E
63120+:10D29000000000000000000000000000000000008E
63121+:10D2A000000000000000000000000000000000007E
63122+:10D2B000000000000000000000000000000000006E
63123+:10D2C000000000000000000000000000000000005E
63124+:10D2D000000000000000000000000000000000004E
63125+:10D2E000000000000000000000000000000000003E
63126+:10D2F000000000000000000000000000000000002E
63127+:10D30000000000000000000000000000000000001D
63128+:10D31000000000000000000000000000000000000D
63129+:10D3200000000000000000000000000000000000FD
63130+:10D3300000000000000000000000000000000000ED
63131+:10D3400000000000000000000000000000000000DD
63132+:10D3500000000000000000000000000000000000CD
63133+:10D3600000000000000000000000000000000000BD
63134+:10D3700000000000000000000000000000000000AD
63135+:10D38000000000000000000000000000000000009D
63136+:10D39000000000000000000000000000000000008D
63137+:10D3A000000000000000000000000000000000007D
63138+:10D3B000000000000000000000000000000000006D
63139+:10D3C000000000000000000000000000000000005D
63140+:10D3D000000000000000000000000000000000004D
63141+:10D3E000000000000000000000000000000000003D
63142+:10D3F000000000000000000000000000000000002D
63143+:10D40000000000000000000000000000000000001C
63144+:10D41000000000000000000000000000000000000C
63145+:10D4200000000000000000000000000000000000FC
63146+:10D4300000000000000000000000000000000000EC
63147+:10D4400000000000000000000000000000000000DC
63148+:10D4500000000000000000000000000000000000CC
63149+:10D4600000000000000000000000000000000000BC
63150+:10D4700000000000000000000000000000000000AC
63151+:10D48000000000000000000000000000000000009C
63152+:10D49000000000000000000000000000000000008C
63153+:10D4A000000000000000000000000000000000007C
63154+:10D4B000000000000000000000000000000000006C
63155+:10D4C000000000000000000000000000000000005C
63156+:10D4D000000000000000000000000000000000004C
63157+:10D4E000000000000000000000000000000000003C
63158+:10D4F000000000000000000000000000000000002C
63159+:10D50000000000000000000000000000000000001B
63160+:10D51000000000000000000000000000000000000B
63161+:10D5200000000000000000000000000000000000FB
63162+:10D5300000000000000000000000000000000000EB
63163+:10D5400000000000000000000000000000000000DB
63164+:10D5500000000000000000000000000000000000CB
63165+:10D5600000000000000000000000000000000000BB
63166+:10D5700000000000000000000000000000000000AB
63167+:10D58000000000000000000000000000000000009B
63168+:10D59000000000000000008000000000000000000B
63169+:10D5A000000000000000000000000000000000007B
63170+:10D5B00000000000000000000000000A0000000061
63171+:10D5C0000000000000000000100000030000000048
63172+:10D5D0000000000D0000000D3C02080024427340D2
63173+:10D5E0003C030800246377CCAC4000000043202BB0
63174+:10D5F0001480FFFD244200043C1D080037BD7FFC61
63175+:10D6000003A0F0213C100800261032103C1C08003A
63176+:10D61000279C73400E0010FE000000000000000D6B
63177+:10D6200030A5FFFF30C600FF274301808F4201B8BD
63178+:10D630000440FFFE24020002AC640000A465000860
63179+:10D64000A066000AA062000B3C021000AC67001844
63180+:10D6500003E00008AF4201B83C0360008C624FF861
63181+:10D660000440FFFE3C020200AC644FC0AC624FC4F9
63182+:10D670003C02100003E00008AC624FF89482000CFA
63183+:10D680002486001400A0382100021302000210803A
63184+:10D690000082402100C8102B1040005700000000FD
63185+:10D6A00090C300002C6200095040005190C200015C
63186+:10D6B000000310803C030800246372F00043102133
63187+:10D6C0008C420000004000080000000090C30001F0
63188+:10D6D0002402000A1462003A000000000106102330
63189+:10D6E0002C42000A1440003624C600028CE20000DE
63190+:10D6F00034420100ACE2000090C2000090C300017F
63191+:10D7000090C4000290C5000300031C000002160034
63192+:10D710000043102500042200004410250045102578
63193+:10D7200024C60004ACE2000490C2000090C30001D3
63194+:10D7300090C4000290C500030002160000031C0004
63195+:10D740000043102500042200004410250045102548
63196+:10D7500024C600040A000CB8ACE2000890C3000123
63197+:10D76000240200041462001624C6000290C20000C5
63198+:10D7700090C400018CE30000000212000044102558
63199+:10D780003463000424C60002ACE2000C0A000CB8AA
63200+:10D79000ACE3000090C300012402000314620008FF
63201+:10D7A00024C600028CE2000090C3000024C60001E1
63202+:10D7B00034420008A0E300100A000CB8ACE20000FC
63203+:10D7C00003E000082402000190C3000124020002CB
63204+:10D7D0001062000224C40002010020210A000CB8DB
63205+:10D7E000008030210A000CB824C6000190C200015C
63206+:10D7F0000A000CB800C2302103E00008000010212C
63207+:10D8000027BDFFE8AFBF0014AFB000100E00130239
63208+:10D8100000808021936200052403FFFE0200202186
63209+:10D82000004310248FBF00148FB00010A3620005C6
63210+:10D830000A00130B27BD001827BDFFE8AFB000108A
63211+:10D84000AFBF00140E000F3C0080802193620000E7
63212+:10D8500024030050304200FF14430004240201005E
63213+:10D86000AF4201800A000D3002002021AF4001804C
63214+:10D87000020020218FBF00148FB000100A000FE7B4
63215+:10D8800027BD001827BDFF80AFBE0078AFB700747A
63216+:10D89000AFB20060AFBF007CAFB60070AFB5006C38
63217+:10D8A000AFB40068AFB30064AFB1005CAFB0005874
63218+:10D8B0008F5001283C0208008C4231A02403FF80D5
63219+:10D8C0009365003F0202102100431024AF42002460
63220+:10D8D0003C0208008C4231A09364000530B200FF86
63221+:10D8E000020210213042007F034218210004202749
63222+:10D8F0003C02000A0062182130840001AF8300144A
63223+:10D900000000F0210000B82114800053AFA00050A7
63224+:10D9100093430116934401128F450104306300FFC5
63225+:10D920003C020001308400FF00A2282403431021A0
63226+:10D9300003441821245640002467400014A001CD60
63227+:10D940002402000193620000304300FF2402002003
63228+:10D950001062000524020050106200060000000062
63229+:10D960000A000D74000000000000000D0A000D7D8B
63230+:10D97000AFA000303C1E080027DE738C0A000D7D2E
63231+:10D98000AFA000303C0208008C4200DC24420001C1
63232+:10D990003C010800AC2200DC0E00139F00000000D8
63233+:10D9A0000A000F318FBF007C8F4201043C0300202E
63234+:10D9B00092D3000D004310240002202B00042140CC
63235+:10D9C000AFA400308F4301043C02004000621824E1
63236+:10D9D000146000023485004000802821326200205B
63237+:10D9E000AFA500301440000234A6008000A0302112
63238+:10D9F00010C0000BAFA6003093C500088F67004C25
63239+:10DA00000200202100052B0034A5008130A5F08103
63240+:10DA10000E000C9B30C600FF0A000F2E0000000015
63241+:10DA20009362003E304200401040000F2402000488
63242+:10DA300056420007240200120200202100E02821A3
63243+:10DA40000E0013F702C030210A000F318FBF007C97
63244+:10DA500016420005000000000E000D2100002021EC
63245+:10DA60000A000F318FBF007C9743011A96C4000E45
63246+:10DA700093620035326500043075FFFF00442004D6
63247+:10DA8000AFA400548ED1000410A000158ED400085D
63248+:10DA90009362003E3042004010400007000000004A
63249+:10DAA0000E0013E0022020211040000D00000000B5
63250+:10DAB0000A000F2E000000008F6200440222102393
63251+:10DAC0000440016A000000008F6200480222102317
63252+:10DAD00004410166240400160A000E218FC20004CE
63253+:10DAE0008F6200480222102304400008000000005A
63254+:10DAF0003C0208008C423100244200013C01080035
63255+:10DB0000AC2231000A000F23000000008F620040A9
63256+:10DB100002221023184000128F8400143C020800D7
63257+:10DB20008C423100327300FC0000A8212442000125
63258+:10DB30003C010800AC2231008F6300409482011C3C
63259+:10DB4000022318233042FFFF0043102A50400010E8
63260+:10DB50002402000C8F6200400A000DF20222102302
63261+:10DB60009483011C9762003C0043102B1040000678
63262+:10DB7000000000009482011C00551023A482011CA7
63263+:10DB80000A000DF72402000CA480011C2402000CE2
63264+:10DB9000AFA200308F620040005120231880000D9A
63265+:10DBA00002A4102A1440012600000000149500066B
63266+:10DBB00002A410233A620001304200011440012007
63267+:10DBC0000000000002A41023022488210A000E098C
63268+:10DBD0003055FFFF00002021326200021040001A81
63269+:10DBE000326200109362003E30420040504000110B
63270+:10DBF0008FC200040E00130202002021240200182C
63271+:10DC0000A362003F936200052403FFFE020020216F
63272+:10DC1000004310240E00130BA362000524040039F6
63273+:10DC2000000028210E0013C9240600180A000F3036
63274+:10DC300024020001240400170040F809000000003D
63275+:10DC40000A000F302402000110400108000000000B
63276+:10DC50008F63004C8F620054028210231C4001032A
63277+:10DC600002831023044200010060A021AFA4001829
63278+:10DC7000AFB10010AFB50014934201208F65004092
63279+:10DC80009763003C304200FF034210210044102102
63280+:10DC90008FA400543063FFFF244240000083182B00
63281+:10DCA0008FA40030AFA20020AFA50028008320255C
63282+:10DCB000AFA40030AFA50024AFA0002CAFB4003457
63283+:10DCC0009362003E30420008504000118FC20000B5
63284+:10DCD00002C0202127A500380E000CB2AFA00038EA
63285+:10DCE0005440000B8FC200008FA200383042010068
63286+:10DCF000504000078FC200008FA3003C8F6200607D
63287+:10DD00000062102304430001AF6300608FC2000073
63288+:10DD10000040F80927A400108FA200303042000212
63289+:10DD200054400001327300FE9362003E30420040D6
63290+:10DD3000104000378FA200248F6200541682001A10
63291+:10DD40003262000124020014124200102A4200151F
63292+:10DD500010400006240200162402000C12420007A4
63293+:10DD6000326200010A000E7D000000001242000530
63294+:10DD7000326200010A000E7D000000000A000E78E9
63295+:10DD80002417000E0A000E78241700100A000E7CDB
63296+:10DD900024170012936200232403FFBD00431024C4
63297+:10DDA000A362002332620001104000198FA20024F8
63298+:10DDB0002402000C1242000E2A42000D1040000600
63299+:10DDC0002402000E2402000A124200078FA200243F
63300+:10DDD0000A000E9524420001124200088FA200247E
63301+:10DDE0000A000E95244200010A000E932417000831
63302+:10DDF0002402000E16E20002241700162417001059
63303+:10DE00008FA2002424420001AFA200248FA200248C
63304+:10DE10008FA300148F76004000431021AF620040B2
63305+:10DE20008F8200149442011C104000090000000081
63306+:10DE30008F6200488F6400409763003C00441023C9
63307+:10DE40003063FFFF0043102A104000088FA20054E7
63308+:10DE5000936400368F6300403402FFFC008210049C
63309+:10DE600000621821AF6300488FA200548FA60030D3
63310+:10DE70000282902130C200081040000E0000000015
63311+:10DE80008F6200581642000430C600FF9742011A04
63312+:10DE90005040000134C6001093C500088FA700341D
63313+:10DEA0000200202100052B0034A500800E000C9BF1
63314+:10DEB00030A5F0808F620040005610231840001BF0
63315+:10DEC0008FA200183C0208008C42319830420010AA
63316+:10DED0001040000D24020001976200681440000AFF
63317+:10DEE000240200018F8200149442011C1440000699
63318+:10DEF00024020001A76200689742007A244200646D
63319+:10DF00000A000EE9A7620012A76200120E001302B7
63320+:10DF1000020020219362007D2403000102002021E1
63321+:10DF2000344200010A000EE7AFA300501840000A77
63322+:10DF3000000000000E001302020020219362007D09
63323+:10DF40002403000102002021AFA30050344200044A
63324+:10DF50000E00130BA362007D9362003E304200402E
63325+:10DF60001440000C326200011040000A0000000062
63326+:10DF70008F6300408FC20004240400182463000152
63327+:10DF80000040F809AF6300408FA200300A000F3054
63328+:10DF9000304200048F620058105200100000000050
63329+:10DFA0008F620018022210231C4000082404000184
63330+:10DFB0008F62001816220009000000008F62001C0A
63331+:10DFC000028210230440000500000000AF720058D8
63332+:10DFD000AFA40050AF710018AF74001C12E0000B2A
63333+:10DFE0008FA200500E00130202002021A377003FF1
63334+:10DFF0000E00130B0200202102E030212404003720
63335+:10E000000E0013C9000028218FA200501040000309
63336+:10E01000000000000E000CA90200202112A0000543
63337+:10E02000000018218FA2003030420004504000113F
63338+:10E0300000601021240300010A000F30006010214D
63339+:10E040000E001302020020219362007D02002021B5
63340+:10E05000344200040E00130BA362007D0E000CA9D5
63341+:10E06000020020210A000F3024020001AF400044CA
63342+:10E07000240200018FBF007C8FBE00788FB7007430
63343+:10E080008FB600708FB5006C8FB400688FB30064DA
63344+:10E090008FB200608FB1005C8FB0005803E00008C1
63345+:10E0A00027BD00808F4201B80440FFFE2402080013
63346+:10E0B000AF4201B803E00008000000003C02000885
63347+:10E0C00003421021944200483084FFFF2484001250
63348+:10E0D0003045FFFF10A0001700A4102B10400016C1
63349+:10E0E00024020003934201202403001AA343018B5E
63350+:10E0F000304200FF2446FFFE8F82000000A6182B4E
63351+:10E100003863000100021382004310241040000510
63352+:10E110008F84000434820001A746019403E00008C4
63353+:10E12000AF8200042402FFFE0082102403E00008F6
63354+:10E13000AF8200042402000303E00008A342018B25
63355+:10E1400027BDFFE0AFB10014AFB00010AFBF0018A3
63356+:10E1500030B0FFFF30D1FFFF8F4201B80440FFFE17
63357+:10E1600000000000AF440180AF4400200E000F42C9
63358+:10E17000020020218F8300008F840004A750019AA1
63359+:10E18000A750018EA74301908F8300083082800042
63360+:10E19000AF4301A8A75101881040000E8F820004F0
63361+:10E1A00093420116304200FC24420004005A102120
63362+:10E1B0008C4240003042FFFF144000068F82000472
63363+:10E1C0003C02FFFF34427FFF00821024AF82000434
63364+:10E1D0008F8200042403BFFF00431024A74201A63E
63365+:10E1E0009743010C8F42010400031C003042FFFFE3
63366+:10E1F00000621825AF4301AC3C021000AF4201B8E9
63367+:10E200008FBF00188FB100148FB0001003E000081A
63368+:10E2100027BD00208F470070934201128F830000BA
63369+:10E2200027BDFFF0304200FF00022882306201006B
63370+:10E23000000030211040004324A40003306240005D
63371+:10E24000104000103062200000041080005A10219D
63372+:10E250008C43400024A4000400041080AFA30000FD
63373+:10E26000005A10218C424000AFA2000493420116D4
63374+:10E27000304200FC005A10218C4240000A000FC0BE
63375+:10E28000AFA200081040002F0000302100041080D1
63376+:10E29000005A10218C43400024A400040004108084
63377+:10E2A000AFA30000005A10218C424000AFA000082C
63378+:10E2B000AFA200048FA80008000030210000202138
63379+:10E2C000240A00083C0908002529010003A41021A4
63380+:10E2D000148A000300042A001100000A0000000054
63381+:10E2E00090420000248400012C83000C00A2102125
63382+:10E2F00000021080004910218C4200001460FFF3DE
63383+:10E3000000C230263C0408008C8431048F42007027
63384+:10E310002C83002010600009004738233C030800CC
63385+:10E32000246331080004108000431021248300017D
63386+:10E33000AC4700003C010800AC233104AF86000864
63387+:10E340002406000100C0102103E0000827BD0010D2
63388+:10E350003C0208008C42003827BDFFD0AFB5002436
63389+:10E36000AFB40020AFB10014AFBF0028AFB3001CA2
63390+:10E37000AFB20018AFB00010000088213C150800B3
63391+:10E3800026B50038144000022454FFFF0000A021ED
63392+:10E390009742010E8F8400003042FFFF308340001F
63393+:10E3A0001060000A245200043C0200200082102465
63394+:10E3B00050400007308280008F8200042403BFFF9A
63395+:10E3C000008318240A0010103442100030828000AC
63396+:10E3D0001040000A3C020020008210241040000778
63397+:10E3E0008F8200043C03FFFF34637FFF0083182407
63398+:10E3F00034428000AF820004AF8300000E000F980B
63399+:10E400000000000014400007000000009743011EB8
63400+:10E410009742011C3063FFFF0002140000621825C0
63401+:10E42000AF8300089742010C8F4340003045FFFF47
63402+:10E430003402FFFF14620003000000000A001028ED
63403+:10E44000241100208F42400030420100544000015E
63404+:10E45000241100108F8400003082100050400014FE
63405+:10E4600036310001308200201440000B3C021000C5
63406+:10E47000008210245040000E363100013C030E0093
63407+:10E480003C020DFF008318243442FFFF0043102B91
63408+:10E4900050400007363100013C0208008C42002C3D
63409+:10E4A000244200013C010800AC22002C363100055A
63410+:10E4B0003C0608008CC6003454C000238F85000041
63411+:10E4C0008F820004304240005440001F8F850000BE
63412+:10E4D0003C021F01008210243C0310005443001A28
63413+:10E4E0008F85000030A20200144000178F850000C5
63414+:10E4F0003250FFFF363100028F4201B80440FFFE68
63415+:10E5000000000000AF400180020020210E000F42F9
63416+:10E51000AF4000208F8300042402BFFFA750019A60
63417+:10E52000006218248F820000A750018EA751018835
63418+:10E53000A74301A6A74201903C021000AF4201B8D8
63419+:10E540000A0010F5000010213C02100000A2102467
63420+:10E550001040003A0000000010C0000F0000000052
63421+:10E5600030A201001040000C3C0302003C020F00EE
63422+:10E5700000A2102410430008000000008F82000851
63423+:10E58000005410240055102190420004244200043D
63424+:10E590000A00109F000221C00000000000051602C2
63425+:10E5A0003050000F3A0300022E4203EF38420001C0
63426+:10E5B0002C6300010062182414600073240200011F
63427+:10E5C0003C0308008C6300D02E06000C386200016A
63428+:10E5D0002C4200010046102414400015001021C0F8
63429+:10E5E0002602FFFC2C4200045440001100002021B0
63430+:10E5F000386200022C420001004610241040000343
63431+:10E60000000512420A00109F000020210010182B64
63432+:10E610000043102450400006001021C000002021BB
63433+:10E620003245FFFF0E000F633226FFFB001021C0B2
63434+:10E630003245FFFF0A0010F2362600028F424000EA
63435+:10E640003C0308008C630024304201001040004667
63436+:10E6500030620001322200043070000D14400002CC
63437+:10E660002413000424130002000512C238420001E2
63438+:10E670002E4303EF304200013863000100431025B0
63439+:10E68000104000033231FFFB2402FFFB0202802412
63440+:10E6900010C000183202000130A201001040001525
63441+:10E6A000320200013C020F0000A210243C030200D1
63442+:10E6B0001043000F8F8200082403FFFE0203802412
63443+:10E6C00000541024005510219042000402333025DC
63444+:10E6D0002442000412000002000221C03226FFFF83
63445+:10E6E0000E000F633245FFFF1200002700001021CB
63446+:10E6F000320200011040000D320200042402000129
63447+:10E7000012020002023330253226FFFF00002021D2
63448+:10E710000E000F633245FFFF2402FFFE0202802439
63449+:10E7200012000019000010213202000410400016EF
63450+:10E7300024020001240200041202000202333025E8
63451+:10E740003226FFFF3245FFFF0E000F632404010055
63452+:10E750002402FFFB020280241200000B00001021A3
63453+:10E760000A0010F5240200011040000700001021EB
63454+:10E770003245FFFF36260002000020210E000F6305
63455+:10E7800000000000000010218FBF00288FB500247A
63456+:10E790008FB400208FB3001C8FB200188FB100140B
63457+:10E7A0008FB0001003E0000827BD003027BDFFD068
63458+:10E7B000AFB000103C04600CAFBF002CAFB6002817
63459+:10E7C000AFB50024AFB40020AFB3001CAFB2001847
63460+:10E7D000AFB100148C8250002403FF7F3C1A8000EC
63461+:10E7E000004310243442380CAC8250002402000351
63462+:10E7F0003C106000AF4200088E0208083C1B8008F5
63463+:10E800003C010800AC2000203042FFF038420010EC
63464+:10E810002C4200010E001B8DAF8200183C04FFFF4C
63465+:10E820003C020400348308063442000CAE0219484E
63466+:10E83000AE03194C3C0560168E0219808CA30000B3
63467+:10E840003442020000641824AE0219803C02535383
63468+:10E850001462000334A47C008CA200040050202128
63469+:10E860008C82007C8C830078AF820010AF83000C18
63470+:10E870008F55000032A200031040FFFD32A20001BC
63471+:10E880001040013D32A200028F420128AF42002019
63472+:10E890008F4201048F430100AF8200000E000F3C45
63473+:10E8A000AF8300043C0208008C4200C01040000806
63474+:10E8B0008F8400003C0208008C4200C42442000106
63475+:10E8C0003C010800AC2200C40A00126900000000EC
63476+:10E8D0003C020010008210241440010C8F830004BD
63477+:10E8E0003C0208008C4200203C0308008C63003886
63478+:10E8F00000008821244200013C010800AC220020D5
63479+:10E900003C16080026D60038146000022474FFFF6D
63480+:10E910000000A0219742010E308340003042FFFFEB
63481+:10E920001060000A245200043C02002000821024DF
63482+:10E9300050400007308280008F8200042403BFFF14
63483+:10E94000008318240A0011703442100030828000C5
63484+:10E950001040000A3C0200200082102410400007F2
63485+:10E960008F8200043C03FFFF34637FFF0083182481
63486+:10E9700034428000AF820004AF8300000E000F9885
63487+:10E980000000000014400007000000009743011E33
63488+:10E990009742011C3063FFFF00021400006218253B
63489+:10E9A000AF8300089742010C8F4340003045FFFFC2
63490+:10E9B0003402FFFF14620003000000000A00118807
63491+:10E9C000241100208F4240003042010054400001D9
63492+:10E9D000241100108F840000308210005040001479
63493+:10E9E00036310001308200201440000B3C02100040
63494+:10E9F000008210245040000E363100013C030E000E
63495+:10EA00003C020DFF008318243442FFFF0043102B0B
63496+:10EA100050400007363100013C0208008C42002CB7
63497+:10EA2000244200013C010800AC22002C36310005D4
63498+:10EA30003C0608008CC6003454C000238F850000BB
63499+:10EA40008F820004304240005440001F8F85000038
63500+:10EA50003C021F01008210243C0310005443001AA2
63501+:10EA60008F85000030A20200144000178F8500003F
63502+:10EA70003250FFFF363100028F4201B80440FFFEE2
63503+:10EA800000000000AF400180020020210E000F4274
63504+:10EA9000AF4000208F8300042402BFFFA750019ADB
63505+:10EAA000006218248F820000A750018EA7510188B0
63506+:10EAB000A74301A6A74201903C021000AF4201B853
63507+:10EAC0000A001267000010213C02100000A210246E
63508+:10EAD0001040003A0000000010C0000F00000000CD
63509+:10EAE00030A201001040000C3C0302003C020F0069
63510+:10EAF00000A2102410430008000000008F820008CC
63511+:10EB000000541024005610219042000424420004B6
63512+:10EB10000A0011FF000221C00000000000051602DB
63513+:10EB20003050000F3A0300022E4203EF384200013A
63514+:10EB30002C63000100621824146000852402000187
63515+:10EB40003C0308008C6300D02E06000C38620001E4
63516+:10EB50002C4200010046102414400015001021C072
63517+:10EB60002602FFFC2C42000454400011000020212A
63518+:10EB7000386200022C42000100461024504000037D
63519+:10EB8000000512420A0011FF000020210010182B7E
63520+:10EB90000043102450400006001021C00000202136
63521+:10EBA0003245FFFF0E000F633226FFFB001021C02D
63522+:10EBB0003245FFFF0A001252362600028F42400003
63523+:10EBC0003C0308008C6300243042010010400046E2
63524+:10EBD00030620001322200043070000D1440000247
63525+:10EBE0002413000424130002000512C2384200015D
63526+:10EBF0002E4303EF3042000138630001004310252B
63527+:10EC0000104000033231FFFB2402FFFB020280248C
63528+:10EC100010C000183202000130A20100104000159F
63529+:10EC2000320200013C020F0000A210243C0302004B
63530+:10EC30001043000F8F8200082403FFFE020380248C
63531+:10EC40000054102400561021904200040233302555
63532+:10EC50002442000412000002000221C03226FFFFFD
63533+:10EC60000E000F633245FFFF120000390000102133
63534+:10EC7000320200011040000D3202000424020001A3
63535+:10EC800012020002023330253226FFFF000020214D
63536+:10EC90000E000F633245FFFF2402FFFE02028024B4
63537+:10ECA0001200002B00001021320200041040002846
63538+:10ECB0002402000124020004120200020233302563
63539+:10ECC0003226FFFF3245FFFF0E000F6324040100D0
63540+:10ECD0002402FFFB020280241200001D000010210C
63541+:10ECE0000A001267240200015040001900001021A0
63542+:10ECF0003245FFFF36260002000020210E000F6380
63543+:10ED0000000000000A001267000010212402BFFF6B
63544+:10ED1000006210241040000800000000240287FF59
63545+:10ED200000621024144000083C020060008210249D
63546+:10ED300010400005000000000E000D34000000002F
63547+:10ED40000A001267000000000E0012C70000000059
63548+:10ED5000104000063C0240008F4301243C0260202A
63549+:10ED6000AC430014000000003C024000AF420138F8
63550+:10ED70000000000032A200021040FEBD00000000B2
63551+:10ED80008F4201403C044000AF4200208F430148C5
63552+:10ED90003C02700000621824106400420000000071
63553+:10EDA0000083102B144000063C0260003C0220004F
63554+:10EDB000106200073C0240000A0012C3000000007D
63555+:10EDC0001062003C3C0240000A0012C30000000038
63556+:10EDD0008F4501408F4601448F42014800021402D2
63557+:10EDE000304300FF240200041462000A274401801B
63558+:10EDF0008F4201B80440FFFE2402001CAC850000D5
63559+:10EE0000A082000B3C021000AF4201B80A0012C3FE
63560+:10EE10003C0240002402000914620012000616029F
63561+:10EE2000000229C0AF4500208F4201B80440FFFE18
63562+:10EE30002402000124030003AF450180A343018B9A
63563+:10EE4000A740018EA740019AA7400190AF4001A8BA
63564+:10EE5000A7420188A74201A6AF4001AC3C021000C6
63565+:10EE6000AF4201B88F4201B80440FFFE000000002D
63566+:10EE7000AC8500008F42014800021402A482000801
63567+:10EE800024020002A082000B8F420148A4820010DD
63568+:10EE90003C021000AC860024AF4201B80A0012C345
63569+:10EEA0003C0240000E001310000000000A0012C3D4
63570+:10EEB0003C0240000E001BC2000000003C0240006B
63571+:10EEC000AF420178000000000A00112F000000008E
63572+:10EED0008F4201003042003E144000112402000124
63573+:10EEE000AF4000488F420100304207C0104000058B
63574+:10EEF00000000000AF40004CAF40005003E00008AD
63575+:10EF000024020001AF400054AF4000408F42010096
63576+:10EF10003042380054400001AF4000442402000158
63577+:10EF200003E00008000000008F4201B80440FFFE2B
63578+:10EF300024020001AF440180AF400184A74501884D
63579+:10EF4000A342018A24020002A342018B9742014A94
63580+:10EF500014C00004A7420190AF4001A40A0012EFC0
63581+:10EF60003C0210008F420144AF4201A43C02100059
63582+:10EF7000AF4001A803E00008AF4201B88F4201B8DA
63583+:10EF80000440FFFE24020002AF440180AF4401842C
63584+:10EF9000A7450188A342018AA342018B9742014AF7
63585+:10EFA000A7420190AF4001A48F420144AF4201A8A3
63586+:10EFB0003C02100003E00008AF4201B83C029000A0
63587+:10EFC0003442000100822025AF4400208F420020FF
63588+:10EFD0000440FFFE0000000003E000080000000005
63589+:10EFE0003C028000344200010082202503E000083A
63590+:10EFF000AF44002027BDFFE8AFBF0014AFB0001042
63591+:10F000008F50014093430149934201489344014882
63592+:10F01000306300FF304200FF00021200006228252A
63593+:10F020002402001910620076308400802862001AE1
63594+:10F030001040001C24020020240200081062007707
63595+:10F04000286200091040000E2402000B2402000177
63596+:10F0500010620034286200025040000524020006BD
63597+:10F0600050600034020020210A00139A00000000C2
63598+:10F0700010620030020020210A00139A00000000F4
63599+:10F080001062003B2862000C504000022402000E77
63600+:10F090002402000910620056020020210A00139A7F
63601+:10F0A0000000000010620056286200211040000F8E
63602+:10F0B000240200382402001C106200582862001D3F
63603+:10F0C000104000062402001F2402001B1062004CA6
63604+:10F0D000000000000A00139A000000001062004ABD
63605+:10F0E000020020210A00139A00000000106200456F
63606+:10F0F0002862003910400007240200802462FFCB00
63607+:10F100002C42000210400045020020210A00139604
63608+:10F110000000302110620009000000000A00139A6C
63609+:10F12000000000001480003D020020210A0013901E
63610+:10F130008FBF00140A001396240600018F4201B805
63611+:10F140000440FFFE24020002A342018BA745018870
63612+:10F150009742014AA74201908F420144A74201927F
63613+:10F160003C021000AF4201B80A00139C8FBF00148C
63614+:10F170009742014A144000290000000093620005F4
63615+:10F180003042000414400025000000000E0013026D
63616+:10F190000200202193620005020020213442000475
63617+:10F1A0000E00130BA36200059362000530420004B9
63618+:10F1B00014400002000000000000000D93620000F7
63619+:10F1C00024030020304200FF14430014000000001C
63620+:10F1D0008F4201B80440FFFE24020005AF500180B9
63621+:10F1E000A342018B3C0210000A00139AAF4201B8FF
63622+:10F1F0008FBF00148FB000100A0012F227BD001854
63623+:10F200000000000D02002021000030218FBF0014FB
63624+:10F210008FB000100A0012DD27BD00180000000D9D
63625+:10F220008FBF00148FB0001003E0000827BD001846
63626+:10F2300027BDFFE8AFBF00100E000F3C000000002C
63627+:10F24000AF4001808FBF0010000020210A000FE7AF
63628+:10F2500027BD00183084FFFF30A5FFFF00001821F4
63629+:10F260001080000700000000308200011040000202
63630+:10F2700000042042006518210A0013AB0005284055
63631+:10F2800003E000080060102110C0000624C6FFFF44
63632+:10F290008CA2000024A50004AC8200000A0013B573
63633+:10F2A0002484000403E000080000000010A000080F
63634+:10F2B00024A3FFFFAC860000000000000000000057
63635+:10F2C0002402FFFF2463FFFF1462FFFA248400047A
63636+:10F2D00003E0000800000000308300FF30A500FFBD
63637+:10F2E00030C600FF274701808F4201B80440FFFE6F
63638+:10F2F000000000008F42012834634000ACE20000AF
63639+:10F3000024020001ACE00004A4E30008A0E2000A2B
63640+:10F3100024020002A0E2000B3C021000A4E5001051
63641+:10F32000ACE00024ACE00028A4E6001203E00008F2
63642+:10F33000AF4201B827BDFFE8AFBF00109362003FA6
63643+:10F3400024030012304200FF1043000D00803021E2
63644+:10F350008F620044008210230440000A8FBF001017
63645+:10F360008F620048240400390000282100C21023C5
63646+:10F3700004410004240600120E0013C9000000001E
63647+:10F380008FBF00102402000103E0000827BD001811
63648+:10F3900027BDFFC8AFB20030AFB1002CAFBF003403
63649+:10F3A000AFB0002890C5000D0080902130A400105F
63650+:10F3B0001080000B00C088218CC300088F620054AD
63651+:10F3C0001062000730A20005144000B524040001BB
63652+:10F3D0000E000D21000020210A0014BB0040202156
63653+:10F3E00030A200051040000930A30012108000ACCC
63654+:10F3F000240400018E2300088F620054146200A9C7
63655+:10F400008FBF00340A00142C240400382402001298
63656+:10F41000146200A3240400010220202127A500106B
63657+:10F420000E000CB2AFA000101040001102402021CD
63658+:10F430008E220008AF620084AF6000400E0013020D
63659+:10F44000000000009362007D024020213442002031
63660+:10F450000E00130BA362007D0E000CA902402021B8
63661+:10F46000240400382405008D0A0014B82406001274
63662+:10F470009362003E304200081040000F8FA200103F
63663+:10F4800030420100104000078FA300148F6200601B
63664+:10F490000062102304430008AF6300600A001441B7
63665+:10F4A00000000000AF6000609362003E2403FFF79D
63666+:10F4B00000431024A362003E9362003E30420008E5
63667+:10F4C000144000022406000300003021936200343F
63668+:10F4D000936300378F640084304200FF306300FF85
63669+:10F4E00000661821000318800043282100A4202B67
63670+:10F4F0001080000B000000009763003C8F620084C6
63671+:10F500003063FFFF004510230062182B14600004D5
63672+:10F51000000000008F6200840A00145D0045802313
63673+:10F520009762003C3050FFFF8FA300103062000450
63674+:10F5300010400004000628808FA2001C0A001465F9
63675+:10F540000202102B2E02021850400003240202185F
63676+:10F550000A00146E020510233063000410600003DB
63677+:10F56000004510238FA2001C00451023004080217D
63678+:10F570002C42008054400001241000800E00130231
63679+:10F580000240202124020001AF62000C9362003E81
63680+:10F59000001020403042007FA362003E8E22000413
63681+:10F5A00024420001AF620040A770003C8F6200500F
63682+:10F5B0009623000E00431021AF6200588F62005066
63683+:10F5C00000441021AF62005C8E220004AF6200187C
63684+:10F5D0008E220008AF62001C8FA20010304200088B
63685+:10F5E0005440000A93A20020A360003693620036C4
63686+:10F5F0002403FFDFA36200359362003E0043102422
63687+:10F60000A362003E0A0014988E220008A36200350F
63688+:10F610008E220008AF62004C8F6200248F6300408E
63689+:10F6200000431021AF6200489362000024030050A1
63690+:10F63000304200FF144300122403FF803C02080004
63691+:10F640008C4231A00242102100431024AF42002816
63692+:10F650003C0208008C4231A08E2400083C03000CC0
63693+:10F66000024210213042007F03421021004310214A
63694+:10F67000AC4400D88E230008AF820014AC4300DCF9
63695+:10F680000E00130B02402021240400380000282122
63696+:10F690002406000A0E0013C9000000002404000123
63697+:10F6A0008FBF00348FB200308FB1002C8FB0002894
63698+:10F6B0000080102103E0000827BD003827BDFFF8B7
63699+:10F6C00027420180AFA20000308A00FF8F4201B8BC
63700+:10F6D0000440FFFE000000008F4601283C020800A5
63701+:10F6E0008C4231A02403FF80AF86004800C2102165
63702+:10F6F00000431024AF4200243C0208008C4231A099
63703+:10F700008FA900008FA8000000C210213042007FA6
63704+:10F71000034218213C02000A00621821946400D4BC
63705+:10F720008FA700008FA5000024020002AF83001401
63706+:10F73000A0A2000B8FA30000354260003084FFFFC1
63707+:10F74000A4E200083C021000AD260000AD04000455
63708+:10F75000AC60002427BD0008AF4201B803E00008F8
63709+:10F76000240200018F88003C938200288F830014BC
63710+:10F770003C07080024E7779800481023304200FF38
63711+:10F78000304900FC246500888F860040304A000321
63712+:10F790001120000900002021248200048CA3000015
63713+:10F7A000304400FF0089102AACE3000024A50004C7
63714+:10F7B0001440FFF924E70004114000090000202153
63715+:10F7C0002482000190A30000304400FF008A102B27
63716+:10F7D000A0E3000024A500011440FFF924E7000184
63717+:10F7E00030C20003144000048F85003C3102000346
63718+:10F7F0001040000D0000000010A0000900002021B2
63719+:10F800002482000190C30000304400FF0085102BCB
63720+:10F81000A0E3000024C600011440FFF924E7000122
63721+:10F8200003E00008000000001100FFFD000020219F
63722+:10F83000248200048CC30000304400FF0088102B99
63723+:10F84000ACE3000024C600041440FFF924E70004E0
63724+:10F8500003E00008000000008F83003C9382002832
63725+:10F8600030C600FF30A500FF00431023304300FFE7
63726+:10F870008F820014008038210043102114C0000240
63727+:10F88000244800880083382130E20003144000053A
63728+:10F8900030A2000314400003306200031040000D4A
63729+:10F8A0000000000010A000090000202124820001B7
63730+:10F8B00090E30000304400FF0085102BA1030000FE
63731+:10F8C00024E700011440FFF92508000103E00008C7
63732+:10F8D0000000000010A0FFFD000020212482000491
63733+:10F8E0008CE30000304400FF0085102BAD030000C6
63734+:10F8F00024E700041440FFF92508000403E0000891
63735+:10F90000000000000080482130AAFFFF30C600FF41
63736+:10F9100030E7FFFF274801808F4201B80440FFFE17
63737+:10F920008F820048AD0200008F420124AD02000426
63738+:10F930008D220020A5070008A102000A240200165B
63739+:10F94000A102000B934301208D2200088D240004A6
63740+:10F95000306300FF004310219783003A00441021D8
63741+:10F960008D250024004310233C0308008C6331A044
63742+:10F970008F840014A502000C246300E82402FFFF1A
63743+:10F98000A50A000EA5030010A5060012AD0500187B
63744+:10F99000AD020024948201142403FFF73042FFFFDC
63745+:10F9A000AD0200288C820118AD02002C3C02100030
63746+:10F9B000AD000030AF4201B88D220020004310247A
63747+:10F9C00003E00008AD2200208F82001430E7FFFF23
63748+:10F9D00000804821904200D330A5FFFF30C600FFD1
63749+:10F9E0000002110030420F0000E238252748018054
63750+:10F9F0008F4201B80440FFFE8F820048AD02000034
63751+:10FA00008F420124AD0200048D220020A5070008CA
63752+:10FA1000A102000A24020017A102000B9343012057
63753+:10FA20008D2200088D240004306300FF0043102164
63754+:10FA30009783003A004410218F8400140043102360
63755+:10FA40003C0308008C6331A0A502000CA505000E44
63756+:10FA5000246300E8A5030010A5060012AD00001401
63757+:10FA60008D220024AD0200188C82005CAD02001CC7
63758+:10FA70008C820058AD0200202402FFFFAD0200245A
63759+:10FA8000948200E63042FFFFAD02002894820060BD
63760+:10FA9000948300BE30427FFF3063FFFF00021200FC
63761+:10FAA00000431021AD02002C3C021000AD000030DC
63762+:10FAB000AF4201B8948200BE2403FFF700A21021D8
63763+:10FAC000A48200BE8D2200200043102403E0000821
63764+:10FAD000AD220020274301808F4201B80440FFFE81
63765+:10FAE0008F8200249442001C3042FFFF000211C0AC
63766+:10FAF000AC62000024020019A062000B3C0210005E
63767+:10FB0000AC60003003E00008AF4201B88F87002CE2
63768+:10FB100030C300FF8F4201B80440FFFE8F820048CF
63769+:10FB200034636000ACA2000093820044A0A20005F0
63770+:10FB30008CE20010A4A20006A4A300088C8200207E
63771+:10FB40002403FFF7A0A2000A24020002A0A2000BD7
63772+:10FB50008CE20000ACA200108CE20004ACA2001405
63773+:10FB60008CE2001CACA200248CE20020ACA2002895
63774+:10FB70008CE2002CACA2002C8C820024ACA20018D9
63775+:10FB80003C021000AF4201B88C82002000431024D8
63776+:10FB900003E00008AC8200208F86001427BDFFE838
63777+:10FBA000AFBF0014AFB0001090C20063304200201D
63778+:10FBB0001040000830A500FF8CC2007C2403FFDF4A
63779+:10FBC00024420001ACC2007C90C2006300431024B8
63780+:10FBD000A0C2006310A000238F830014275001806F
63781+:10FBE000020028210E0015D6240600828F82001400
63782+:10FBF000904200633042004050400019A38000440E
63783+:10FC00008F83002C8F4201B80440FFFE8F82004892
63784+:10FC1000AE02000024026082A60200082402000254
63785+:10FC2000A202000B8C620008AE0200108C62000C75
63786+:10FC3000AE0200148C620014AE0200188C62001830
63787+:10FC4000AE0200248C620024AE0200288C620028E0
63788+:10FC5000AE02002C3C021000AF4201B8A380004469
63789+:10FC60008F8300148FBF00148FB000109062006368
63790+:10FC700027BD00183042007FA06200639782003ADF
63791+:10FC80008F86003C8F850014938300280046102344
63792+:10FC9000A782003AA4A000E490A400638F820040F1
63793+:10FCA000AF83003C2403FFBF0046102100832024C3
63794+:10FCB000AF820040A0A400638F820014A04000BD6A
63795+:10FCC0008F82001403E00008A44000BE8F8A001455
63796+:10FCD00027BDFFE0AFB10014AFB000108F88003C2B
63797+:10FCE000AFBF00189389001C954200E430D100FF9B
63798+:10FCF0000109182B0080802130AC00FF3047FFFF46
63799+:10FD00000000582114600003310600FF012030215B
63800+:10FD1000010958239783003A0068102B1440003CD7
63801+:10FD20000000000014680007240200018E02002079
63802+:10FD30002403FFFB34E7800000431024AE020020C0
63803+:10FD40002402000134E70880158200053165FFFFB9
63804+:10FD50000E001554020020210A00169102002021F5
63805+:10FD60000E001585020020218F8400482743018062
63806+:10FD70008F4201B80440FFFE24020018AC6400006A
63807+:10FD8000A062000B8F840014948200E6A46200102D
63808+:10FD90003C021000AC600030AF4201B894820060B9
63809+:10FDA00024420001A4820060948200603C030800A9
63810+:10FDB0008C63318830427FFF5443000F02002021C2
63811+:10FDC000948200602403800000431024A482006019
63812+:10FDD0009082006090830060304200FF000211C2F8
63813+:10FDE00000021027000211C03063007F0062182556
63814+:10FDF000A083006002002021022028218FBF00186C
63815+:10FE00008FB100148FB000100A0015F927BD002033
63816+:10FE1000914200632403FF8000431025A142006348
63817+:10FE20009782003A3048FFFF110000209383001CA6
63818+:10FE30008F840014004B1023304600FF948300E4AD
63819+:10FE40002402EFFF0168282B00621824A48300E439
63820+:10FE500014A000038E020020010058210000302170
63821+:10FE60002403FFFB34E7800000431024AE0200208F
63822+:10FE700024020001158200053165FFFF0E001554B4
63823+:10FE8000020020210A0016B99783003A0E0015855A
63824+:10FE9000020020219783003A8F82003CA780003A1D
63825+:10FEA00000431023AF82003C9383001C8F82001418
63826+:10FEB0008FBF00188FB100148FB0001027BD002035
63827+:10FEC00003E00008A04300BD938200442403000126
63828+:10FED00027BDFFE8004330042C420020AFB00010E3
63829+:10FEE000AFBF00142410FFFE10400005274501801D
63830+:10FEF0003C0208008C4231900A0016D600461024BD
63831+:10FF00003C0208008C423194004610241440000743
63832+:10FF1000240600848F8300142410FFFF9062006287
63833+:10FF20003042000F34420040A06200620E0015D63D
63834+:10FF300000000000020010218FBF00148FB00010DD
63835+:10FF400003E0000827BD00188F83002427BDFFE0D1
63836+:10FF5000AFB20018AFB10014AFB00010AFBF001CBB
63837+:10FF60009062000D00A0902130D100FF3042007F50
63838+:10FF7000A062000D8F8500148E4300180080802140
63839+:10FF80008CA2007C146200052402000E90A2006383
63840+:10FF9000344200200A0016FFA0A200630E0016C51E
63841+:10FFA000A38200442403FFFF104300472404FFFF03
63842+:10FFB00052200045000020218E4300003C0200102A
63843+:10FFC00000621024504000043C020008020020217E
63844+:10FFD0000A00170E24020015006210245040000988
63845+:10FFE0008E45000002002021240200140E0016C5D8
63846+:10FFF000A38200442403FFFF104300332404FFFFC7
63847+:020000021000EC
63848+:100000008E4500003C02000200A2102410400016A1
63849+:100010003C0200048F8600248CC200148CC30010A4
63850+:100020008CC40014004310230044102B50400005E2
63851+:10003000020020218E43002C8CC2001010620003AD
63852+:10004000020020210A00173F240200123C02000493
63853+:1000500000A210245040001C00002021020020219A
63854+:100060000A00173F2402001300A2102410400006CB
63855+:100070008F8300248C620010504000130000202168
63856+:100080000A001739020020218C6200105040000441
63857+:100090008E42002C020020210A00173F240200118A
63858+:1000A00050400009000020210200202124020017F6
63859+:1000B0000E0016C5A38200442403FFFF1043000274
63860+:1000C0002404FFFF000020218FBF001C8FB2001806
63861+:1000D0008FB100148FB000100080102103E00008E1
63862+:1000E00027BD00208F83001427BDFFD8AFB40020A8
63863+:1000F000AFB3001CAFB20018AFB10014AFB0001026
63864+:10010000AFBF0024906200638F91002C2412FFFF88
63865+:100110003442004092250000A06200638E2200104D
63866+:100120000080982130B0003F105200060360A021EB
63867+:100130002402000D0E0016C5A38200441052005484
63868+:100140002404FFFF8F8300148E2200188C63007C30
63869+:1001500010430007026020212402000E0E0016C585
63870+:10016000A38200442403FFFF104300492404FFFF3F
63871+:1001700024040020120400048F83001490620063A2
63872+:1001800034420020A06200638F85003410A000205C
63873+:1001900000000000560400048F8200140260202139
63874+:1001A0000A0017902402000A9683000A9442006015
63875+:1001B0003042FFFF144300048F8200202404FFFD1F
63876+:1001C0000A0017B7AF82003C3C0208008C42318C19
63877+:1001D0000045102B14400006026020210000282159
63878+:1001E0000E001646240600010A0017B70000202161
63879+:1001F0002402002D0E0016C5A38200442403FFFF35
63880+:10020000104300232404FFFF0A0017B70000202139
63881+:10021000160400058F8400148E2300142402FFFFAF
63882+:100220005062001802602021948200602442000184
63883+:10023000A4820060948200603C0308008C633188D3
63884+:1002400030427FFF5443000F0260202194820060FF
63885+:100250002403800000431024A48200609082006088
63886+:1002600090830060304200FF000211C2000210279C
63887+:10027000000211C03063007F00621825A083006077
63888+:10028000026020210E0015F9240500010000202144
63889+:100290008FBF00248FB400208FB3001C8FB20018D2
63890+:1002A0008FB100148FB000100080102103E000080F
63891+:1002B00027BD00288F83001427BDFFE8AFB00010D2
63892+:1002C000AFBF0014906200638F87002C00808021F4
63893+:1002D000344200408CE60010A06200633C0308003A
63894+:1002E0008C6331B030C23FFF0043102B1040004EF2
63895+:1002F0008F8500302402FF8090A3000D004310245E
63896+:10030000304200FF504000490200202100061382C5
63897+:10031000304800032402000255020044020020215C
63898+:1003200094A2001C8F85001424030023A4A20114AE
63899+:100330008CE60000000616023042003F1043001019
63900+:100340003C0300838CE300188CA2007C1062000642
63901+:100350002402000E0E0016C5A38200442403FFFFF2
63902+:10036000104300382404FFFF8F8300149062006361
63903+:1003700034420020A06200630A0017FC8F8300242F
63904+:1003800000C31024144300078F83002490A200624E
63905+:100390003042000F34420020A0A20062A38800383F
63906+:1003A0008F8300249062000D3042007FA062000D18
63907+:1003B0008F83003410600018020020218F840030E9
63908+:1003C0008C8200100043102B1040000924020018FA
63909+:1003D000020020210E0016C5A38200442403FFFF63
63910+:1003E000104300182404FFFF0A00182400002021F5
63911+:1003F0008C820010240500010200202100431023FC
63912+:100400008F830024240600010E001646AC62001003
63913+:100410000A001824000020210E0015F9240500010F
63914+:100420000A00182400002021020020212402000DCF
63915+:100430008FBF00148FB0001027BD00180A0016C52A
63916+:10044000A38200448FBF00148FB0001000801021E1
63917+:1004500003E0000827BD001827BDFFC8AFB2002089
63918+:10046000AFBF0034AFB60030AFB5002CAFB400283A
63919+:10047000AFB30024AFB1001CAFB000188F46012805
63920+:100480003C0308008C6331A02402FF80AF86004843
63921+:1004900000C318213065007F03452821006218241D
63922+:1004A0003C02000AAF43002400A2282190A200626F
63923+:1004B00000809021AF850014304200FF000211023D
63924+:1004C000A382003890A200BC304200021440000217
63925+:1004D00024030034240300308F820014A3830028F7
63926+:1004E000938300388C4200C0A3800044AF82003C5C
63927+:1004F000240200041062031C8F84003C8E4400041C
63928+:10050000508003198F84003C8E4200103083FFFF1F
63929+:10051000A784003A106002FFAF8200408F8400146D
63930+:100520002403FF809082006300621024304200FFA9
63931+:10053000144002CF9785003A9383003824020002CA
63932+:1005400030B6FFFF14620005000088219382002866
63933+:100550002403FFFD0A001B19AF82003C8F82003C80
63934+:1005600002C2102B144002A18F8400400E0014EC34
63935+:1005700000000000938300283C040800248477983E
63936+:10058000240200341462002EAF84002C3C0A0800C0
63937+:100590008D4A77C82402FFFFAFA2001000803821E7
63938+:1005A0002405002F3C09080025297398240800FF22
63939+:1005B0002406FFFF90E2000024A3FFFF00062202B2
63940+:1005C00000C21026304200FF0002108000491021B6
63941+:1005D0008C420000306500FF24E7000114A8FFF5FD
63942+:1005E0000082302600061027AFA20014AFA2001030
63943+:1005F0000000282127A7001027A6001400C51023FB
63944+:100600009044000324A2000100A71821304500FFF8
63945+:100610002CA200041440FFF9A06400008FA2001077
63946+:100620001142000724020005024020210E0016C5D9
63947+:10063000A38200442403FFFF104300642404FFFF4F
63948+:100640003C0208009042779C104000098F82001401
63949+:10065000024020212402000C0E0016C5A382004493
63950+:100660002403FFFF104300592404FFFF8F8200146E
63951+:10067000A380001C3C0308008C63779C8C440080A2
63952+:100680003C0200FF3442FFFF006218240083202B4D
63953+:1006900010800008AF83003402402021240200199A
63954+:1006A0000E0016C5A38200442403FFFF1043004739
63955+:1006B0002404FFFF8F87003C9782003A8F85003427
63956+:1006C000AF8700200047202310A0003BA784003AFA
63957+:1006D0008F86001430A200030002102390C300BCD8
63958+:1006E0003050000300B0282100031882307300014D
63959+:1006F0000013108000A228213C0308008C6331A065
63960+:100700008F8200483084FFFF0085202B004310219A
63961+:1007100010800011244200888F84002C1082000E6B
63962+:100720003C033F013C0208008C42779800431024B0
63963+:100730003C0325001443000630E500FF8C820000D6
63964+:10074000ACC200888C8200100A0018E9ACC2009884
63965+:100750000E001529000030219382001C8F850014A3
63966+:100760008F830040020238218F82003CA387001C47
63967+:1007700094A400E4006218218F82003434841000B5
63968+:10078000AF83004000503021A4A400E41260000EAA
63969+:10079000AF86003C24E20004A382001C94A200E483
63970+:1007A00024C30004AF83003C34422000A4A200E430
63971+:1007B0000A001906000020218F820040AF80003C13
63972+:1007C00000471021AF820040000020212414FFFFC9
63973+:1007D000109402112403FFFF3C0808008D0877A83D
63974+:1007E0003C0208008C4231B03C03080090637798CB
63975+:1007F00031043FFF0082102B1040001B3067003F88
63976+:100800003C0208008C4231A88F83004800042180FC
63977+:1008100000621821006418213062007F0342282101
63978+:100820003C02000C00A228213C020080344200015E
63979+:100830003066007800C230252402FF800062102458
63980+:10084000AF42002830640007AF4208048F820014D2
63981+:100850000344202124840940AF460814AF850024B6
63982+:10086000AF840030AC4301189383003824020003A6
63983+:10087000146201CF240200012402002610E201D1FB
63984+:1008800028E2002710400013240200322402002234
63985+:1008900010E201CC28E200231040000824020024CA
63986+:1008A0002402002010E201B82402002110E20147D6
63987+:1008B000024020210A001AFB2402000B10E201C1B1
63988+:1008C0002402002510E20010024020210A001AFB39
63989+:1008D0002402000B10E201AE28E2003310400006B3
63990+:1008E0002402003F2402003110E2009A024020213D
63991+:1008F0000A001AFB2402000B10E201A5024020218D
63992+:100900000A001AFB2402000B8F90002C3C03080005
63993+:100910008C6331B08F8500308E0400100000A82158
63994+:100920008CB3001430823FFF0043102B8CB10020A9
63995+:100930005040018F0240202190A3000D2402FF802F
63996+:1009400000431024304200FF504001890240202122
63997+:10095000000413823042000314400185024020212C
63998+:1009600094A3001C8F8200148E040028A443011459
63999+:100970008CA20010026218231064000302402021A0
64000+:100980000A00197C2402001F8F82003400621021AB
64001+:100990000262102B104000088F83002402402021A7
64002+:1009A000240200180E0016C5A382004410540174DE
64003+:1009B0002404FFFF8F8300248F8400348C62001096
64004+:1009C0000224882100441023AC6200108F8200149E
64005+:1009D000AC7100208C4200680051102B10400009BF
64006+:1009E0008F830030024020212402001D0E0016C516
64007+:1009F000A38200442403FFFF104301612404FFFF8E
64008+:100A00008F8300308E0200248C6300241043000783
64009+:100A1000024020212402001C0E0016C5A3820044BF
64010+:100A20002403FFFF104301562404FFFF8F8400249A
64011+:100A30008C82002424420001AC8200241233000482
64012+:100A40008F8200148C4200685622000E8E02000035
64013+:100A50008E0200003C030080004310241440000D6F
64014+:100A60002402001A024020210E0016C5A382004471
64015+:100A70002403FFFF104301422404FFFF0A0019BAB8
64016+:100A80008E0200143C0300800043102450400003F9
64017+:100A90008E020014AC8000208E0200142411FFFF8F
64018+:100AA0001051000E3C0308003C0208008C423190BB
64019+:100AB000004310242403001B14400007A3830044B8
64020+:100AC0000E0016C5024020211051012D2404FFFF05
64021+:100AD0000A0019CB8E030000A38000448E0300009F
64022+:100AE0003C02000100621024104000123C02008011
64023+:100AF0000062102414400008024020212402001A41
64024+:100B00000E0016C5A38200442403FFFF1043011CFE
64025+:100B10002404FFFF02402021020028210E0016E5D8
64026+:100B2000240600012403FFFF104301152404FFFFE6
64027+:100B3000241500018F83002402A0302102402021CF
64028+:100B40009462003624050001244200010A001ADFE5
64029+:100B5000A46200368F90002C3C0308008C6331B0F7
64030+:100B60008E13001032623FFF0043102B10400089AB
64031+:100B70008F8400302402FF809083000D00431024F6
64032+:100B8000304200FF104000842402000D0013138245
64033+:100B900030420003240300011443007F2402000DAF
64034+:100BA0009082000D30420008544000048F820034CF
64035+:100BB000024020210A001A102402002450400004A0
64036+:100BC0008E03000C024020210A001A102402002784
64037+:100BD0008C82002054620006024020218E0300080F
64038+:100BE0008C820024506200098E02001402402021F1
64039+:100BF000240200200E0016C5A38200441054007188
64040+:100C00002403FFFF0A001A458F8400242411FFFFEC
64041+:100C1000145100048F860014024020210A001A405B
64042+:100C2000240200258E0300188CC2007C1062000391
64043+:100C30002402000E0A001A40024020218E030024E4
64044+:100C40008C82002810620003240200210A001A404E
64045+:100C5000024020218E0500288C82002C10A2000367
64046+:100C60002402001F0A001A40024020218E03002C9B
64047+:100C700014600003240200230A001A4002402021CD
64048+:100C80008CC200680043102B104000032402002691
64049+:100C90000A001A40024020218C82001400651821AD
64050+:100CA0000043102B104000088F84002402402021B4
64051+:100CB000240200220E0016C5A382004410510041F8
64052+:100CC0002403FFFF8F8400242403FFF79082000D8C
64053+:100CD00000431024A082000D8F8600143C030800FE
64054+:100CE0008C6331AC8F82004894C400E08F8500246F
64055+:100CF0000043102130847FFF000420400044102175
64056+:100D00003043007F034320213C03000E0083202159
64057+:100D10002403FF8000431024AF42002CA493000062
64058+:100D20008CA2002824420001ACA200288CA2002C36
64059+:100D30008E03002C00431021ACA2002C8E02002C4C
64060+:100D4000ACA200308E020014ACA2003494A2003A8F
64061+:100D500024420001A4A2003A94C600E03C0208002C
64062+:100D60008C4231B024C4000130837FFF1462000F35
64063+:100D700000803021240280000082302430C2FFFF36
64064+:100D8000000213C2304200FF000210270A001A7E40
64065+:100D9000000233C02402000D024020210E0016C5BF
64066+:100DA000A38200440A001A84004018218F82001494
64067+:100DB00002402021240500010E0015F9A44600E0A0
64068+:100DC000000018210A001B16006088218F90002C5B
64069+:100DD0003C0308008C6331B08E05001030A23FFF49
64070+:100DE0000043102B104000612402FF808F840030EC
64071+:100DF0009083000D00431024304200FF5040005CFF
64072+:100E0000024020218F8200341040000B0005138225
64073+:100E10008F8200149763000A944200603042FFFF03
64074+:100E200014430005000513828F8200202404FFFD77
64075+:100E30000A001AF3AF82003C304200031440000E57
64076+:100E40000000000092020002104000058E03002402
64077+:100E500050600015920300030A001AAF02402021DF
64078+:100E60008C82002450620010920300030240202173
64079+:100E70000A001AB72402000F9082000D30420008C9
64080+:100E80005440000992030003024020212402001074
64081+:100E90000E0016C5A38200442403FFFF1043003850
64082+:100EA0002404FFFF92030003240200025462000C9A
64083+:100EB000920200038F820034544000099202000322
64084+:100EC000024020212402002C0E0016C5A3820044FB
64085+:100ED0002403FFFF1043002A2404FFFF92020003B3
64086+:100EE0000200282102402021384600102CC60001B3
64087+:100EF0002C4200010E0016E5004630252410FFFFAD
64088+:100F00001050001F2404FFFF8F8300341060001373
64089+:100F1000024020213C0208008C42318C0043102BFF
64090+:100F200014400007000000000000282124060001F2
64091+:100F30000E001646000000000A001AF300002021EF
64092+:100F40002402002D0E0016C5A38200441050000C90
64093+:100F50002404FFFF0A001AF3000020210E0015F9F7
64094+:100F6000240500010A001AF300002021024020217C
64095+:100F70002402000D0E0016C5A3820044004020216B
64096+:100F80000A001B16008088211514000E00000000C6
64097+:100F90000E00174C024020210A001B160040882139
64098+:100FA0000E0016C5A38200440A001B1600408821CB
64099+:100FB00014620017022018212402002314E2000505
64100+:100FC0002402000B0E0017C0024020210A001B164D
64101+:100FD0000040882102402021A38200440E0016C553
64102+:100FE0002411FFFF0A001B170220182130A500FF63
64103+:100FF0000E001529240600019783003A8F82003CD9
64104+:10100000A780003A00431023AF82003C0220182141
64105+:101010001220003E9782003A2402FFFD5462003EF7
64106+:101020008E4300208E4200048F830014005610234C
64107+:10103000AE420004906200633042007FA062006311
64108+:101040008E4200208F840014A780003A34420002B0
64109+:10105000AE420020A48000E4908200632403FFBF1E
64110+:1010600000431024A08200630A001B598E43002015
64111+:101070009082006300621024304200FF1040002381
64112+:101080009782003A90820088908300BD2485008872
64113+:101090003042003F2444FFE02C820020A383001C48
64114+:1010A00010400019AF85002C2402000100821804B2
64115+:1010B000306200191440000C3C02800034420002EF
64116+:1010C000006210241440000B306200201040000F1A
64117+:1010D0009782003A90A600010240202124050001D9
64118+:1010E0000A001B5330C60001024020210A001B5297
64119+:1010F00024050001024020210000282124060001CF
64120+:101100000E001646000000009782003A1440FD04CD
64121+:101110008F8400148E4300203062000410400012BF
64122+:101120008F84003C2402FFFB00621024AE420020AA
64123+:10113000274301808F4201B80440FFFE8F820048A0
64124+:10114000AC6200008F420124AC6200042402608380
64125+:10115000A462000824020002A062000B3C021000FE
64126+:10116000AF4201B88F84003C8F8300148FBF0034DE
64127+:101170008FB600308FB5002C8FB400288FB30024B9
64128+:101180008FB200208FB1001C8FB000182402000124
64129+:1011900027BD003803E00008AC6400C030A500FFA4
64130+:1011A0002403000124A900010069102B1040000C49
64131+:1011B00000004021240A000100A31023004A380443
64132+:1011C00024630001308200010069302B10400002CE
64133+:1011D000000420420107402554C0FFF800A310235B
64134+:1011E00003E00008010010213C020800244260A432
64135+:1011F0003C010800AC22738C3C02080024425308D6
64136+:101200003C010800AC2273902402000627BDFFE0D9
64137+:101210003C010800A02273943C021EDCAFB200180F
64138+:10122000AFB10014AFBF001CAFB0001034526F411B
64139+:1012300000008821240500080E001B7A02202021CE
64140+:10124000001180803C07080024E773980002160014
64141+:1012500002071821AC6200000000282124A200012E
64142+:101260003045FFFF8C6200002CA6000804410002FC
64143+:10127000000220400092202614C0FFF8AC64000059
64144+:10128000020780218E0400000E001B7A2405002036
64145+:10129000262300013071FFFF2E2301001460FFE5BB
64146+:1012A000AE0200008FBF001C8FB200188FB1001477
64147+:1012B0008FB0001003E0000827BD002027BDFFD835
64148+:1012C000AFB3001CAFB20018AFBF0020AFB1001425
64149+:1012D000AFB000108F5101408F48014800089402C0
64150+:1012E000324300FF311300FF8F4201B80440FFFE7C
64151+:1012F00027500180AE1100008F420144AE0200046D
64152+:1013000024020002A6120008A202000B240200140C
64153+:10131000AE1300241062002528620015104000085A
64154+:101320002402001524020010106200302402001272
64155+:10133000106200098FBF00200A001CB58FB3001C8B
64156+:101340001062007024020022106200378FBF00205C
64157+:101350000A001CB58FB3001C3C0208008C4231A06F
64158+:101360002403FF800222102100431024AF420024F6
64159+:101370003C0208008C4231A0022210213042007F42
64160+:10138000034218213C02000A00621821166000BCCA
64161+:10139000AF830014906200623042000F344200308C
64162+:1013A000A06200620A001CB48FBF00203C046000F1
64163+:1013B0008C832C083C02F0033442FFFF00621824A7
64164+:1013C000AC832C083C0208008C4231A08C832C0892
64165+:1013D000244200740002108200021480006218256A
64166+:1013E000AC832C080A001CB48FBF00203C0208000C
64167+:1013F0008C4231A02403FF800222102100431024DC
64168+:10140000AF4200243C0208008C4231A03C03000A99
64169+:10141000022210213042007F03421021004310219C
64170+:101420000A001CB3AF8200143C0208008C4231A0B9
64171+:101430002405FF800222102100451024AF42002421
64172+:101440003C0208008C4231A0022210213042007F71
64173+:10145000034218213C02000A0062182190620063D6
64174+:1014600000A21024304200FF10400085AF8300141A
64175+:1014700024620088944300123C0208008C4231A888
64176+:1014800030633FFF00031980022210210043102126
64177+:101490003043007F03432021004510243C03000C0F
64178+:1014A00000832021AF4200289082000D00A210246A
64179+:1014B000304200FF10400072AF8400249082000D83
64180+:1014C000304200101440006F8FBF00200E0015C87E
64181+:1014D000000000008F4201B80440FFFE0000000041
64182+:1014E000AE1100008F420144AE020004240200024B
64183+:1014F000A6120008A202000BAE1300240A001CB4BE
64184+:101500008FBF00202406FF8002261024AF42002057
64185+:101510003C0208008C4231A031043FFF00042180CE
64186+:101520000222102100461024AF4200243C03080090
64187+:101530008C6331A83C0208008C4231A03227007F26
64188+:101540000223182102221021006418213042007F5A
64189+:101550003064007F034228213C02000A0066182400
64190+:1015600000A22821034420213C02000C00822021FB
64191+:10157000AF4300283C020008034718210062902175
64192+:10158000AF850014AF8400240E0015C8010080212F
64193+:101590008F4201B80440FFFE8F8200248F84001424
64194+:1015A000274501809042000DACB10000A4B00006B8
64195+:1015B000000216000002160300021027000237C2C4
64196+:1015C00014C00016248200889442001232033FFFA8
64197+:1015D00030423FFF14430012240260829083006374
64198+:1015E0002402FF8000431024304200FF5040000CD2
64199+:1015F00024026082908200623042000F3442004038
64200+:10160000A082006224026084A4A200082402000DCB
64201+:10161000A0A200050A001C9E3C0227002402608252
64202+:10162000A4A20008A0A000053C02270000061C00A0
64203+:101630000062182524020002A0A2000BACA3001037
64204+:10164000ACA00014ACA00024ACA00028ACA0002CDE
64205+:101650008E42004C8F840024ACA200189083000DB1
64206+:101660002402FF8000431024304200FF1040000598
64207+:101670008FBF00209082000D3042007FA082000DBD
64208+:101680008FBF00208FB3001C8FB200188FB10014E1
64209+:101690008FB000103C02100027BD002803E00008B6
64210+:1016A000AF4201B80800343008003430080033A8D5
64211+:1016B000080033E0080034140800343808003438D7
64212+:1016C00008003438080033180A0001240000000024
64213+:1016D000000000000000000D747061362E322E33C1
64214+:1016E00000000000060203010000000000000000EE
64215+:1016F00000000000000000000000000000000000EA
64216+:1017000000000000000000000000000000000000D9
64217+:1017100000000000000000000000000000000000C9
64218+:1017200000000000000000000000000000000000B9
64219+:1017300000000000000000000000000000000000A9
64220+:101740000000000000000000000000000000000099
64221+:101750000000000000000000000000001000000376
64222+:10176000000000000000000D0000000D3C02080019
64223+:1017700024421C003C03080024632094AC40000079
64224+:101780000043202B1480FFFD244200043C1D080070
64225+:1017900037BD2FFC03A0F0213C1008002610049058
64226+:1017A0003C1C0800279C1C000E00015C000000008F
64227+:1017B0000000000D3084FFFF308200078F85001885
64228+:1017C00010400002248300073064FFF800853021B8
64229+:1017D00030C41FFF03441821247B4000AF85001C48
64230+:1017E000AF84001803E00008AF4400843084FFFF9A
64231+:1017F000308200078F8500208F860028104000026D
64232+:10180000248300073064FFF8008520210086182B10
64233+:1018100014600002AF8500240086202303442821A1
64234+:1018200034068000AF840020AF44008000A6202151
64235+:1018300003E00008AF84003827BDFFD8AFB3001C19
64236+:10184000AFB20018AFB00010AFBF0024AFB400209B
64237+:10185000AFB100143C0860088D1450002418FF7FBD
64238+:101860003C1A8000029898243672380CAD12500051
64239+:101870008F5100083C07601C3C08600036300001B6
64240+:10188000AF500008AF800018AF400080AF40008428
64241+:101890008CE600088D0F08083C0760168CEC0000F1
64242+:1018A00031EEFFF039CA00103C0DFFFF340B800011
64243+:1018B0003C030080034B48212D440001018D282466
64244+:1018C0003C0253533C010800AC230420AF8900388C
64245+:1018D000AF860028AF840010275B400014A20003ED
64246+:1018E00034E37C008CF90004032818218C7F007CF1
64247+:1018F0008C6500783C0280003C0B08008D6B048CEA
64248+:101900003C0A08008D4A048834520070AF85003CC0
64249+:10191000AF9F00403C13080026731C440240A021E6
64250+:101920008E4800008F46000038C30001306400017B
64251+:1019300010800017AF880034028048218D2F0000EE
64252+:101940003C0508008CA5045C3C1808008F1804585E
64253+:1019500001E8102300A280210000C8210202402BD0
64254+:1019600003198821022838213C010800AC30045CAE
64255+:101970003C010800AC2704588F4E000039CD00010F
64256+:1019800031AC00011580FFED01E04021AF8F003444
64257+:101990008E5100003C0708008CE7045C3C0D0800F9
64258+:1019A0008DAD04580228802300F0602100007021D2
64259+:1019B0000190302B01AE1821006620213C01080067
64260+:1019C000AC2C045C3C010800AC2404588F46010890
64261+:1019D0008F47010030C92000AF860000AF87000CA0
64262+:1019E0001120000A00C040213C1808008F18042C68
64263+:1019F000270800013C010800AC28042C3C184000DA
64264+:101A0000AF5801380A000196000000009749010410
64265+:101A100000002821014550213122FFFF0162582199
64266+:101A20000162F82B015F502130D902003C0108000F
64267+:101A3000AC2B048C3C010800AC2A0488172000154C
64268+:101A400024040F0010E400130000000024080D001F
64269+:101A500010E8023B30CD000611A0FFE93C18400021
64270+:101A6000936E00002409001031C400F01089027147
64271+:101A700024020070108202E58F880014250F0001F7
64272+:101A8000AF8F00143C184000AF5801380A0001968F
64273+:101A900000000000974C01041180FFD93C18400061
64274+:101AA00030C34000146000A1000000008F460178A0
64275+:101AB00004C0FFFE8F87003824100800240F0008A0
64276+:101AC0008CE30008AF500178A74F0140A7400142C6
64277+:101AD000974E01048F86000031C9FFFF30CD000111
64278+:101AE00011A002E1012040212531FFFE241800024F
64279+:101AF000A75801463228FFFFA75101483C190800AA
64280+:101B00008F39043C172002D08F8C000C30DF00206E
64281+:101B100017E00002240400092404000130C20C0074
64282+:101B2000240504005045000134840004A744014A00
64283+:101B30003C1108008E3104203C1800483C10000184
64284+:101B40000238182530CF00020070282511E000046B
64285+:101B5000000018213C19010000B9282524030001C8
64286+:101B600030DF000453E00005AF8300083C0600109E
64287+:101B700000A6282524030001AF830008AF4510000C
64288+:101B80000000000000000000000000000000000055
64289+:101B90008F83000810600023000000008F451000B4
64290+:101BA00004A1FFFE000000001060001E0000000005
64291+:101BB0008F4410003C0C0020008C102410400019B1
64292+:101BC0008F8E000031CD000211A000160000000031
64293+:101BD000974F101415E000130000000097591008EB
64294+:101BE0003338FFFF271100060011188200033080F0
64295+:101BF00000C7282132300001322300031200032CD9
64296+:101C00008CA200000000000D00C7F821AFE2000028
64297+:101C10003C0508008CA5043024A600013C01080006
64298+:101C2000AC2604308F6D00003402FFFFAF8D00043E
64299+:101C30008CEC0000118202A6000020218CED000037
64300+:101C400031AC01001180028A000000003C02080053
64301+:101C50008C4204743C0308008C63044C3C1F080055
64302+:101C60008FFF04703C1808008F1804480048382182
64303+:101C70000068802100E8282B03E430210208402B73
64304+:101C80000304882100C57021022878213C01080046
64305+:101C9000AC30044C3C010800AC2F04483C01080067
64306+:101CA000AC2704743C010800AC2E04708F8400182B
64307+:101CB0000120302131290007249F000833F91FFF3C
64308+:101CC00003594021AF84001CAF990018251B400028
64309+:101CD000AF590084112000038F83002024C2000725
64310+:101CE0003046FFF88F84002800C3282100A4302B41
64311+:101CF00014C00002AF83002400A428230345602100
64312+:101D0000340D8000018D10213C0F1000AF850020A4
64313+:101D1000AF820038AF450080AF4F01788F88001444
64314+:101D2000250F00010A0001EFAF8F00148F62000839
64315+:101D30008F670000240500300007760231C300F0F1
64316+:101D4000106500A7240F0040546FFF4C8F880014CB
64317+:101D50008F4B01780560FFFE0000000030CA0200D2
64318+:101D600015400003000612820000000D00061282DA
64319+:101D7000304D0003000D4900012D18210003808023
64320+:101D8000020D402100086080019380218E1F000019
64321+:101D900017E00002000000000000000D8F6E00043C
64322+:101DA00005C202BD92070006920E000592020004D1
64323+:101DB0003C090001000E18800070F8218FED00181A
64324+:101DC000277100082448000501A96021000830821D
64325+:101DD000AFEC0018022020210E00059E26050014FD
64326+:101DE000920A00068F7900043C0B7FFF000A2080D6
64327+:101DF000009178218DF800043566FFFF0326282422
64328+:101E000003053821ADE70004920E0005920D000491
64329+:101E1000960C0008000E10800051C8218F2300008E
64330+:101E2000974901043C07FFFF006758243128FFFF52
64331+:101E3000010DF82103EC50233144FFFF01643025EC
64332+:101E4000AF260000920300072418000110780275E5
64333+:101E5000240F0003106F0285000000008E050010A3
64334+:101E60002419000AA7590140A7450142921800040D
64335+:101E70008F860000240F0001A7580144A7400146A7
64336+:101E80009747010430D100023C050041A7470148B3
64337+:101E900000001821A74F014A1220000330CB000494
64338+:101EA0003C0501412403000151600005AF83000897
64339+:101EB0003C06001000A6282524030001AF8300087B
64340+:101EC000AF4510000000000000000000000000000E
64341+:101ED000000000008F8A000811400004000000008C
64342+:101EE0008F4410000481FFFE000000008F6B000093
64343+:101EF000920800043C1108008E310444AF8B0004AA
64344+:101F000097590104311800FF3C0E08008DCE0440A3
64345+:101F10003325FFFF0305382102276021000010212F
64346+:101F2000250F000A31E8FFFF0187482B01C2682115
64347+:101F300001A9F821311000073C010800AC2C044431
64348+:101F40003C010800AC3F0440120000038F8C0018D5
64349+:101F50002506000730C8FFF8010C682131BF1FFFBC
64350+:101F6000AF8C001CAF9F0018AF5F00849744010442
64351+:101F7000035F80213084FFFF308A00071140000397
64352+:101F8000261B4000248900073124FFF88F8200209F
64353+:101F90008F850028008220210085702B15C000024B
64354+:101FA000AF820024008520233C0B08008D6B048C3D
64355+:101FB0003C0A08008D4A04880344882134038000C9
64356+:101FC000022310213C0F1000AF840020AF820038A4
64357+:101FD000AF440080AF4F01780A0002968F8800144A
64358+:101FE0008F5001780600FFFE30D10200162000035A
64359+:101FF000000612820000000D00061282305F00030E
64360+:10200000001F1900007F302100062080009FC8219A
64361+:1020100000194880013380218E180000130000024F
64362+:10202000000000000000000D8F6C000C058001FB1B
64363+:102030008F870038240E0001AE0E00008CE30008EC
64364+:10204000A20000078F65000400055402314D00FF17
64365+:1020500025A80005000830822CCB00411560000245
64366+:10206000A20A00040000000D8F7800043C03FFFF6B
64367+:1020700000E02821330BFFFF256C000B000C1082C1
64368+:1020800000022080008748218D3F000026040014B4
64369+:10209000A618000803E3C8240E00059EAD39000011
64370+:1020A0008F4F01083C11100001F1382410E001AB02
64371+:1020B00000000000974D01049208000725AAFFECDC
64372+:1020C000350600023144FFFFA2060007960600080D
64373+:1020D0002CC7001354E0000592030007921100077B
64374+:1020E000362F0001A20F00079203000724180001F9
64375+:1020F000107801C224090003106901D58F880038C7
64376+:1021000030CBFFFF257100020011788331E400FF1E
64377+:1021100000042880A20F000500A848218D2D000092
64378+:10212000974A01043C0EFFFF01AEF8243143FFFF44
64379+:10213000006B1023244CFFFE03ECC825AD390000D2
64380+:10214000920600053C03FFF63462FFFF30D800FF23
64381+:102150000018388000F08821922F00143C04FF7F83
64382+:102160003487FFFF31EE000F01C65821316500FFB3
64383+:1021700000055080015068218DAC00200148F821F5
64384+:10218000A20B00060182C824AE0C000CAFF9000CB3
64385+:10219000920900068E11000C032778240009C080E4
64386+:1021A0000310702195C60026030828210227202449
64387+:1021B000AE04000CADCF0020ADC60024ACA60010CC
64388+:1021C0008F8800003C0B08008D6B048C3C0A0800D3
64389+:1021D0008D4A0488241F001024190002A75F0140C3
64390+:1021E000A7400142A7400144A7590146974901046D
64391+:1021F00024070001310600022538FFFEA7580148D8
64392+:102200003C050009A747014A10C00003000018213F
64393+:102210003C05010924030001310C00045180000534
64394+:10222000AF8300083C08001000A828252403000103
64395+:10223000AF830008AF451000000000000000000060
64396+:1022400000000000000000009205000424AE00021F
64397+:1022500031CD0007000D182330620007AE020010D8
64398+:102260008F90000812000004000000008F4F100043
64399+:1022700005E1FFFE000000008F7100008F8E001846
64400+:102280003C0308008C630444AF91000497450104AB
64401+:1022900025CF001031E61FFF30A2FFFFAF8E001CDC
64402+:1022A000AF860018AF4600842449FFFE3C0C0800AE
64403+:1022B0008D8C0440974D010401208021000947C303
64404+:1022C0000070C02131A9FFFF0310F82B0188C8213D
64405+:1022D000033F202103463821313100073C0108002B
64406+:1022E000AC3804443C010800AC2404401220000334
64407+:1022F00024FB40002527000730E9FFF88F860020E7
64408+:102300008F8400280126382100E4C02B170000022A
64409+:10231000AF86002400E438230347202134198000CD
64410+:10232000009910213C0F1000AF870020AF820038C9
64411+:10233000AF470080AF4F01780A0002968F880014E3
64412+:102340009747010410E0FDAE3C1840008F5801781B
64413+:102350000700FFFE30C5400010A000033C1F00082E
64414+:102360000000000D3C1F0008AF5F01402410080072
64415+:102370008F860000AF5001789744010430D90001E6
64416+:10238000132000ED3086FFFF24CCFFFE240D000259
64417+:10239000A74D0146A74C01488F9100182408000D55
64418+:1023A000A748014A8F630000262F000831E21FFF73
64419+:1023B0000342702130C90007AF830004AF91001CB5
64420+:1023C000AF82001800C03821AF4200841120000302
64421+:1023D00025DB400024D800073307FFF88F85002055
64422+:1023E0008F84002800E5302100C4382B14E000025F
64423+:1023F000AF85002400C430238F8400140346F821E5
64424+:10240000340C8000AF86002003EC8021AF460080B2
64425+:10241000249900013C0610003C184000AF460178AA
64426+:10242000AF900038AF990014AF5801380A000196F8
64427+:10243000000000008F630000975101043067FFFF28
64428+:102440003228FFFF8F4F017805E0FFFE30EC0007D8
64429+:10245000000CF82333F0000724F9FFFE2404000ADF
64430+:10246000A7440140A7500142A7590144A740014693
64431+:10247000A74801488F45010830B800201700000226
64432+:10248000240300092403000130CD0002A743014AC0
64433+:102490003C04004111A00003000018213C0401414C
64434+:1024A0002403000130C9000451200005AF83000857
64435+:1024B0003C0600100086202524030001AF8300089D
64436+:1024C000AF44100000000000000000000000000009
64437+:1024D000000000008F8E000811C000040000000002
64438+:1024E0008F4210000441FFFE000000008F7F0000BB
64439+:1024F000276400088F91003CAF9F0004948500087A
64440+:102500009490000A9499000C30AFFFFF0010C400B3
64441+:102510003323FFFF11F100A6030320253C0E080022
64442+:102520008DCE04443C0C08008D8C044000E88821CA
64443+:102530002626FFFE01C628210000682100A6F82BF0
64444+:10254000018D2021009F80213C010800AC2504441E
64445+:102550003C010800AC30044024E200083042FFFF98
64446+:102560003047000710E000038F830018244F000756
64447+:1025700031E2FFF83106FFFF30C800070043802139
64448+:1025800032191FFF0359C021AF83001CAF990018F7
64449+:10259000271B4000AF590084110000038F8C0020DE
64450+:1025A00024C5000730A6FFF88F84002800CC28211E
64451+:1025B00000A4F82B17E00002AF8C002400A428230D
64452+:1025C000AF850020AF4500803C0408008C840434B3
64453+:1025D00003454821340E8000012E6821108000053B
64454+:1025E000AF8D0038939100172406000E12260011BB
64455+:1025F0002407043F3C021000AF4201788F8800148A
64456+:10260000250F00010A0001EFAF8F00140E0005C472
64457+:1026100000E020218F8800143C0B08008D6B048C97
64458+:102620003C0A08008D4A0488250F00010A0001EFCA
64459+:10263000AF8F00143C021000A7470148AF42017859
64460+:102640000A0004CE8F88001424040F001184003D7A
64461+:1026500030CE002015C0000224030009240300012D
64462+:102660000A00021AA743014A0A00020DA7400146C8
64463+:1026700094EF000894F1000A94F0000C8F8C003C59
64464+:10268000001174003207FFFF31EDFFFF11AC00377E
64465+:1026900001C720253C1808008F1804443C0F08008F
64466+:1026A0008DEF0440000080210308682101A8382B29
64467+:1026B00001F0702101C760213C010800AC2D0444E9
64468+:1026C0003C010800AC2C04400A00027A8F840018F8
64469+:1026D0003C0208008C42047C3C0308008C630454D8
64470+:1026E0003C1F08008FFF04783C1808008F18045026
64471+:1026F000004838210068802100E8282B03E43021BD
64472+:102700000208402B0304882100C57021022878218B
64473+:102710003C010800AC3004543C010800AC2F0450CC
64474+:102720003C010800AC27047C3C010800AC2E047876
64475+:102730000A00027A8F840018A74001460A00043577
64476+:102740008F91001830CD002015A0FFC52403000D87
64477+:10275000240300050A00021AA743014A974E010408
64478+:1027600025C5FFF00A00038130A4FFFF8F980040C9
64479+:102770001498FFC8000010213C0508008CA5046CCB
64480+:102780003C1F08008FFF046800A8C8210328302BD5
64481+:1027900003E22021008640213C010800AC39046C92
64482+:1027A0003C010800AC2804680A00027A8F840018F3
64483+:1027B0008F8C0040148CFF5900E8C8213C18080099
64484+:1027C0008F18046C3C1108008E3104682723FFFE2B
64485+:1027D00003034821000010210123302B0222702125
64486+:1027E00001C668213C010800AC29046C3C010800CA
64487+:1027F000AC2D04680A0004A524E200088F88003884
64488+:102800003C03FFFF8D02000C0043F82403E4C825BD
64489+:10281000AD19000C0A00038F30CBFFFF0A0003C381
64490+:10282000AE000000974A0104920400048E26000CBA
64491+:10283000014458212579FFF200C7C0243325FFFF4A
64492+:1028400003053825AE27000C0A0002E68E050010AD
64493+:102850003C0DFFFF8D0A0010014D582401646025D6
64494+:10286000AD0C00100A00038F30CBFFFF974301042B
64495+:10287000920E00048E290010006E1021244DFFEEF0
64496+:102880000127602431A8FFFF0188F825AE3F001022
64497+:102890000A0002E68E0500108E0F000CAE0000004C
64498+:1028A00000078880023028210A0002B8ACAF00205F
64499+:1028B0001460000D3058FFFF3C04FFFF0044682403
64500+:1028C00001A47026000E602B000D102B004CF82484
64501+:1028D00013E00002000000000000000D8CAF0000BB
64502+:1028E0000A00025001E410253B03FFFF0003882B80
64503+:1028F0000018802B0211202410800002000000002C
64504+:102900000000000D8CB900000A0002503722FFFFC2
64505+:102910003084FFFF30A5FFFF108000070000182162
64506+:10292000308200011040000200042042006518219E
64507+:102930001480FFFB0005284003E000080060102120
64508+:1029400010C00007000000008CA2000024C6FFFF9A
64509+:1029500024A50004AC82000014C0FFFB2484000402
64510+:1029600003E000080000000010A0000824A3FFFFFF
64511+:10297000AC86000000000000000000002402FFFF01
64512+:102980002463FFFF1462FFFA2484000403E00008BC
64513+:1029900000000000308EFFFF30D8FFFF00057C00F4
64514+:1029A00001F8602539CDFFFF01AC5021014C582BB7
64515+:1029B000014B4821000944023127FFFF00E8302184
64516+:1029C0000006240230C5FFFF00A418213862FFFF73
64517+:1029D00003E000083042FFFF3C0C08008D8C0484AB
64518+:1029E000240BFF8027BDFFD001845021014B4824D8
64519+:1029F000AF4900203C0808008D080484AFB20020D5
64520+:102A0000AFB00018AFBF0028AFB30024AFB1001CB7
64521+:102A1000936600040104382130E4007F009A1021FD
64522+:102A20003C0300080043902130C500200360802152
64523+:102A30003C080111277B000814A000022646007004
64524+:102A40002646006C9213000497510104920F000473
64525+:102A50003267000F322EFFFF31ED004001C72823FF
64526+:102A600011A0000500004821925900BC3338000431
64527+:102A70001700009000000000924300BC307F00046B
64528+:102A800013E0000F0000000010A0000D0000000087
64529+:102A9000960E0002240AFF8000A7602125CDFFFECC
64530+:102AA000A74D1016920B0004014B2024308200FF2A
64531+:102AB00010400085010C40253C0F0400010F40250B
64532+:102AC0008F5301780660FFFE2404000AA7440140EA
64533+:102AD000960D00022404000931AC0007000C5823B5
64534+:102AE000316A0007A74A0142960200022443FFFE12
64535+:102AF000A7430144A7400146975F0104A75F01482F
64536+:102B00008F590108333800205300000124040001CC
64537+:102B1000920F000431EE001015C000023483001043
64538+:102B200000801821A743014A0000000000000000B7
64539+:102B30000000000000000000AF481000000000008E
64540+:102B40000000000000000000000000008F51100095
64541+:102B50000621FFFE3113FFFF12600003000000009A
64542+:102B60008F481018ACC8000096030006307FFFFFA6
64543+:102B700027F900020019988200138880023B302157
64544+:102B80008CD800001520005700183402920300046E
64545+:102B90002405FF8000A3F82433F100FF1220002C4D
64546+:102BA00000000000924700BC30F2000212400028F2
64547+:102BB00000000000974B100C2562FFFEA742101684
64548+:102BC000000000003C0A040035490030AF49100005
64549+:102BD00000000000000000000000000000000000F5
64550+:102BE0008F4C10000581FFFE000000009749100C7B
64551+:102BF0008F51101C00C020213127FFFF24F200302C
64552+:102C0000001218820003288000BBF8213226FFFF43
64553+:102C1000AFF100000E0005B300112C020013C880B4
64554+:102C2000033B98218E78000000027400AFB80010BA
64555+:102C30008FA80010310FFFFFAFAF00108FA400105E
64556+:102C400001C46825AFAD00108FA60010AE6600006D
64557+:102C500097730008976D000A9766000C8F8A003CF6
64558+:102C6000000D5C0030CCFFFF3262FFFF104A0036DF
64559+:102C7000016C2025960600023C10100024D30008A9
64560+:102C80000E00013B3264FFFF974C01040E00014926
64561+:102C90003184FFFFAF5001788FBF00288FB300242D
64562+:102CA0008FB200208FB1001C8FB0001803E0000825
64563+:102CB00027BD003010A0FF700000000024A5FFFC1D
64564+:102CC0000A0005EC240900048CD10000AF51101853
64565+:102CD0008F5301780660FF7A2404000A0A00060177
64566+:102CE0000000000000A7C8218F8800388F4E101CFC
64567+:102CF0000019C0820018788001E82021AC8E000005
64568+:102D0000000E2C0200C020210E0005B331C6FFFFCB
64569+:102D1000023B28218CAD000000025400004030210D
64570+:102D2000AFAD00108FAC0010318BFFFFAFAB0010C8
64571+:102D30008FA2001001424825AFA900108FA70010F4
64572+:102D40000A000631ACA700008F8F0040148FFFC926
64573+:102D50000000000097420104960B00023C050800A9
64574+:102D60008CA5046C3049FFFF316AFFFF3C1108005D
64575+:102D70008E310468012A382124F2FFFE00B240217E
64576+:102D80000012FFC30112C82B023FC02103192021EA
64577+:102D90003C010800AC28046C3C010800AC24046829
64578+:102DA0000A00066B0000000000A4102B1040000970
64579+:102DB000240300010005284000A4102B04A00003F8
64580+:102DC000000318405440FFFC000528401060000735
64581+:102DD000000000000085302B14C0000200031842E0
64582+:102DE000008520231460FFFB0005284203E0000853
64583+:102DF000008010218F85002C27BDFFE800053027BB
64584+:102E00002CC300012CA400020083102510400003F5
64585+:102E1000AFBF00102405007FAF85002C00052827D8
64586+:102E200030A5FFFF0E000592240426F58F830030A5
64587+:102E3000240402BD004030210083382B10E000093B
64588+:102E400024050001000420400083102B04800003AF
64589+:102E5000000528405440FFFC0004204010A000085A
64590+:102E600000C350210064402B1500000200052842D9
64591+:102E70000064182314A0FFFB0004204200C350216B
64592+:102E80008FBF0010000A4C02312200FF27BD00183E
64593+:102E9000AF8A002C03E00008AF8900300A00002A46
64594+:102EA00000000000000000000000000D7478703683
64595+:102EB0002E322E3300000000060203000000000046
64596+:102EC000000001360000EA60000000000000000081
64597+:102ED00000000000000000000000000000000000F2
64598+:102EE00000000000000000000000000000000000E2
64599+:102EF00000000000000000000000000000000016BC
64600+:102F000000000000000000000000000000000000C1
64601+:102F100000000000000000000000000000000000B1
64602+:102F200000000000000000000000000000000000A1
64603+:102F3000000000000000138800000000000005DC15
64604+:102F4000000000000000000010000003000000006E
64605+:102F50000000000D0000000D3C02080024423C204F
64606+:102F60003C03080024633DD4AC4000000043202B08
64607+:102F70001480FFFD244200043C1D080037BD7FFC87
64608+:102F800003A0F0213C100800261000A83C1C0800FB
64609+:102F9000279C3C200E0002BA000000000000000D3B
64610+:102FA0008F8300383C088000350700708CE50000F6
64611+:102FB000008330253C02900000C22025AF85003000
64612+:102FC000AF4400208F4900200520FFFE3C03800015
64613+:102FD000346200708C4500008F8600303C19080078
64614+:102FE0008F39007C3C0E08008DCE007800A620238F
64615+:102FF00003245821000078210164682B01CF60214F
64616+:10300000018D50213C010800AC2B007C3C010800E4
64617+:10301000AC2A007803E00008000000000A0000412C
64618+:10302000240400018F8400383C05800034A2000194
64619+:103030000082182503E00008AF43002003E00008E9
64620+:10304000000010213084FFFF30A5FFFF1080000733
64621+:1030500000001821308200011040000200042042CC
64622+:10306000006518211480FFFB0005284003E00008DC
64623+:103070000060102110C00007000000008CA20000BA
64624+:1030800024C6FFFF24A50004AC82000014C0FFFB8F
64625+:103090002484000403E000080000000010A00008E1
64626+:1030A00024A3FFFFAC860000000000000000000029
64627+:1030B0002402FFFF2463FFFF1462FFFA248400044C
64628+:1030C00003E0000800000000308AFFFF93A800130F
64629+:1030D000A74A014497490E1630C600FF3C02100073
64630+:1030E000A7490146AF450148A3460152A748015AE6
64631+:1030F000AF4701608FA400188FA30014A7440158A4
64632+:10310000AF43015403E00008AF42017803E0000838
64633+:10311000000000003C038000346200708C49000015
64634+:103120008F8800002484000727BDFFF83084FFF853
64635+:10313000AF890030974D008A31ACFFFFAFAC000083
64636+:103140008FAB0000016850232547FFFF30E61FFFCB
64637+:1031500000C4282B14A0FFF73C0C8000358B0070B6
64638+:103160008D6A00003C0708008CE700843C060800DC
64639+:103170008CC6008000081082014918230002788064
64640+:1031800000E370210000202101C3C82B00C4C0212E
64641+:1031900001FA4021031948212502400027BD0008FB
64642+:1031A0003C010800AC2E00843C010800AC290080E2
64643+:1031B00003E00008000000008F8200002486000762
64644+:1031C00030C5FFF800A2182130641FFF03E000089B
64645+:1031D000AF8400008F8700388F8A004027BDFFB87A
64646+:1031E0008F860044AFB60040AFBF0044AFB5003C8F
64647+:1031F000AFB40038AFB30034AFB20030AFB1002C81
64648+:10320000AFB000288F4501048D4900ACAF47008066
64649+:103210008CC8002000A938230000B021AF480E1050
64650+:103220008F440E1000004821AF440E148CC20024BD
64651+:10323000AF420E188F430E18AF430E1C10E001254D
64652+:103240002D230001936B0008116000D400000000E2
64653+:10325000976E001031CDFFFF00ED602B158000CF81
64654+:103260000000000097700010320FFFFFAF4F0E00FC
64655+:103270008F520000325100081220FFFD00000000B4
64656+:1032800097540E088F460E043285FFFF30B30001BD
64657+:1032900012600132000000000000000D30B8A040B4
64658+:1032A00024150040131500C030A9A0001120012DE5
64659+:1032B00000000000937F000813E0000800000000F9
64660+:1032C00097630010306BFFFF00CB402B1100000311
64661+:1032D00030AC00401180012300000000A785003CB5
64662+:1032E000AF8600349366000800E02821AFA70020D5
64663+:1032F00014C0012427B30020AF60000C9782003C6B
64664+:103300003047400014E00002240300162403000E9E
64665+:1033100024194007A363000AAF790014938A003E82
64666+:103320008F740014315800070018AA4002959025A8
64667+:10333000AF7200149784003C8F700014309100101D
64668+:1033400002117825AF6F0014978E003C31CD000834
64669+:1033500011A00147000028218F6700143C021000D3
64670+:103360003C0C810000E22825AF65001497460E0A48
64671+:103370002408000E3405FFFC30C3FFFF006C582505
64672+:10338000AF6B0004A3680002937F000A27E90004E2
64673+:10339000A369000A9786003C9363000A30CC1F00A3
64674+:1033A000000C598301634021251F0028A37F0009D9
64675+:1033B00097490E0CA769001093790009272A00028B
64676+:1033C000315800070018A82332B10007A371000B81
64677+:1033D00093740009976400108F910034978F003C1C
64678+:1033E000329200FF024480210205702131ED00403D
64679+:1033F00011A0000531C4FFFF0091282B3C12800072
64680+:1034000010A000140000A0210224382B14E0011B9E
64681+:103410008FA500208F4D0E14AF4D0E108F420E1C45
64682+:10342000AF420E18AF440E008F4F000031EE00087F
64683+:1034300011C0FFFD0000000097540E080080882195
64684+:1034400000009021A794003C8F500E04241400012A
64685+:10345000AF900034976400103095FFFF8E68000035
64686+:103460000111F82317E00009AE7F00008F650014FA
64687+:103470008F8B004434A60040AF6600148F4C0E10B2
64688+:10348000AD6C00208F430E18AD63002493670008D5
64689+:1034900014E000D2000000000E00009E2404001082
64690+:1034A0008F8900483C08320000402821312600FF67
64691+:1034B0000006FC0003E8502525390001AF990048BB
64692+:1034C000AC4A0000937800099370000A330400FFAF
64693+:1034D00000047400320F00FF01CF6825AC4D0004DA
64694+:1034E0008F820048064000EAACA20008ACA0000CA5
64695+:1034F0009783003C306B0008156000022628000608
64696+:1035000026280002974E0E148F450E1C8F6700046C
64697+:10351000936D000231C4FFFF31A200FFAFA2001083
64698+:103520008F6C0014AFA800180E00008BAFAC001415
64699+:10353000240400100E0000C7000000008E7200007E
64700+:1035400016400005000000008F6400142405FFBF32
64701+:1035500000859824AF7300148F79000C033538214F
64702+:10356000AF67000C9375000816A00008000000006B
64703+:1035700012800006000000008F7F00143C0BEFFF5C
64704+:103580003568FFFE03E84824AF690014A3740008FF
64705+:103590008FA500200A00024602202021AF470E001E
64706+:1035A0000A0000F5000000008F5901780720FFFE97
64707+:1035B000241F08008F840000AF5F0178974B008ABA
64708+:1035C000316AFFFF014448232528FFFF31021FFF16
64709+:1035D0002C4300081460FFF9000000008F8E0048A3
64710+:1035E0008F8D003800C048210344202125C60001EA
64711+:1035F000240C0F00AF86004800E9382324864000E1
64712+:1036000031CA00FF11AC0005240800019391003E6F
64713+:103610003230000700107A4035E80001000AAC00A3
64714+:103620003C18010002B8A025AC9440008F930048DC
64715+:1036300030B2003630A40008ACD3000410800097EC
64716+:1036400001123025974E0E0A8F8D00003C0281003A
64717+:1036500031CCFFFF25AB0008018240253C03100060
64718+:1036600031651FFF25390006241F000EAF48016099
64719+:1036700000C33025A75F015AAF850000A759015844
64720+:1036800014E0000A8F93003824120F0052720002D7
64721+:103690002416000134C600408F580E108F94004449
64722+:1036A000AE9800208F550E18AE9500248F450E144D
64723+:1036B000AF4501448F590E1CAF590148A34A01522E
64724+:1036C0003C0A1000AF460154AF4A017814E0FEDD19
64725+:1036D0002D2300010076A025128000178FBF004423
64726+:1036E0008F84003824160F0010960084000000001C
64727+:1036F0008F45017804A0FFFE24150F001095006E81
64728+:10370000000000008F470E14240202403C1F1000EE
64729+:10371000AF4701448F440E1CAF440148A3400152FF
64730+:10372000A740015AAF400160A7400158AF42015481
64731+:10373000AF5F01788FBF00448FB600408FB5003C6B
64732+:103740008FB400388FB300348FB200308FB1002CAB
64733+:103750008FB0002803E0000827BD004814C0FED049
64734+:1037600030B8A0408F420E148F84004400004821DE
64735+:10377000AC8200208F510E1CAC9100240A00020E76
64736+:103780002D2300018F910034978A003C3C12800069
64737+:103790000220A821315800401700FF300000A0216E
64738+:1037A000976900108F9200343139FFFF13320035D2
64739+:1037B00000002021008048211480FEA000A03821B4
64740+:1037C0008F420E148F840044AC8200208F510E1C57
64741+:1037D000AC9100240A00020E2D230001936A000917
64742+:1037E0009378000B315000FF330F00FF020F702160
64743+:1037F00025C2000A3050FFFF0E00009E020020216B
64744+:103800008F8600483C1F410024CD0001AF8D004849
64745+:10381000936C000930C600FF00064400318300FFAE
64746+:10382000246B0002010B4825013FC825AC5900005C
64747+:103830008F67000C97440E1400F22825AC45000455
64748+:103840008F450E1C8F670004936A00023084FFFFCF
64749+:10385000315800FFAFB800108F6F0014AFB10018DF
64750+:103860000E00008BAFAF00140A0001A60200202159
64751+:10387000AF6000040A00013EA36000020A00024695
64752+:1038800000002021000090210A0001702414000192
64753+:103890003C1280000A000195ACB2000C8F91000030
64754+:1038A00025240002A744015826300008320F1FFFCC
64755+:1038B0000A0001F9AF8F0000AF40014C1120002C2D
64756+:1038C000000000008F590E10AF5901448F430E18AD
64757+:1038D000240200403C1F1000AF430148A3400152A6
64758+:1038E000A740015AAF400160A7400158AF420154C0
64759+:1038F000AF5F01780A0002278FBF00441120000645
64760+:103900000000000097460E0830CC004015800002F1
64761+:10391000000000000000000D8F4D017805A0FFFEA3
64762+:103920000000000097530E103C120500240E2000EA
64763+:10393000326AFFFF0152C025AF58014C8F4F0E1461
64764+:103940003C021000AF4F01448F500E1CAF50014895
64765+:10395000A34001528F840038A740015AAF40016054
64766+:10396000A7400158AF4E01540A000215AF4201783A
64767+:103970008F490E14AF4901448F430E1C0A00028E7A
64768+:10398000240200403C0E20FF27BDFFE03C1A8000CF
64769+:103990003C0F800835CDFFFDAFBF001CAFB2001853
64770+:1039A000AFB10014AFB00010AF8F0040AF4D0E00AC
64771+:1039B0000000000000000000000000000000000007
64772+:1039C000000000003C0C00FF358BFFFDAF4B0E00EC
64773+:1039D0003C0660048CC95000240AFF7F3C11600043
64774+:1039E000012A40243507380CACC750008E24043817
64775+:1039F00024050009AF4500083083FFFF38622F71AE
64776+:103A00002450C0B3AF8000480E000068AF800000B3
64777+:103A100052000001AE20442C0E0004353C11800001
64778+:103A20000E000ED9363000708F8A00403C1208001C
64779+:103A300026523C88020088218E0800008F5F00001B
64780+:103A40003BF900013338000113000017AF88003044
64781+:103A5000022048218D2700003C0F08008DEF006CEC
64782+:103A60003C0C08008D8C006800E8C02301F8282178
64783+:103A70000000682100B8302B018D582101664021DB
64784+:103A80003C010800AC25006C3C010800AC28006833
64785+:103A90008F44000038830001306200011440FFEDC4
64786+:103AA00000E04021AF8700308E0C00003C0508008C
64787+:103AB0008CA5006C3C0408008C84006801883023CD
64788+:103AC00000A638210000102100E6402B00821821BA
64789+:103AD0000068F8213C010800AC27006C3C0108009C
64790+:103AE000AC3F00688F49010025590088AF99004418
64791+:103AF000AF890038AF4900208E070000AF87003043
64792+:103B00008F4D017805A0FFFE000000008E0600002A
64793+:103B10003C0B08008D6B00743C0408008C84007022
64794+:103B200000C728230165F8210000102103E5402B80
64795+:103B30000082382100E8C821240908003C0108005F
64796+:103B4000AC3F00743C010800AC390070AF4901780B
64797+:103B500093580108A398003E938F003E31EE000178
64798+:103B600015C000158F830038240E0D00106E00194B
64799+:103B7000240F0F00106F001D00000000915900007D
64800+:103B800024180050332900FF113800043C1F400066
64801+:103B9000AF5F01380A0002E7000000000E00090EC6
64802+:103BA000000000008F8A00403C1F4000AF5F0138DA
64803+:103BB0000A0002E700000000938D003E31AC0006D1
64804+:103BC000000C51000E0000CE0152D8210A00034320
64805+:103BD0008F8A00403C1B0800277B3D080E0000CE6A
64806+:103BE000000000000A0003438F8A00403C1B0800CD
64807+:103BF000277B3D280E0000CE000000000A00034392
64808+:103C00008F8A004090AA00018FAB00108CAC00108E
64809+:103C10003C0300FF8D680004AD6C00208CAD0014E7
64810+:103C200000E060213462FFFFAD6D00248CA7001816
64811+:103C30003C09FF000109C024AD6700288CAE001CC0
64812+:103C40000182C82403197825AD6F0004AD6E002CE5
64813+:103C50008CAD0008314A00FFAD6D001C94A9000234
64814+:103C60003128FFFFAD68001090A70000A56000029A
64815+:103C7000A1600004A167000090A30002306200FF71
64816+:103C80000002198210600005240500011065000E75
64817+:103C90000000000003E00008A16A00018CD80028A1
64818+:103CA000354A0080AD7800188CCF0014AD6F001439
64819+:103CB0008CCE0030AD6E00088CC4002CA16A0001CF
64820+:103CC00003E00008AD64000C8CCD001CAD6D001845
64821+:103CD0008CC90014AD6900148CC80024AD680008BC
64822+:103CE0008CC70020AD67000C8CC200148C8300646C
64823+:103CF0000043C82B13200007000000008CC20014F2
64824+:103D0000144CFFE400000000354A008003E0000886
64825+:103D1000A16A00018C8200640A000399000000007F
64826+:103D200090AA000027BDFFF88FA9001CA3AA0000DD
64827+:103D30008FAE00003C0FFF808FA8001835E2FFFF18
64828+:103D40008CCD002C01C26024AFAC0000A120000487
64829+:103D500000E06021A7A000028FB800008D270004BA
64830+:103D60000188182100A0582100C05021006D28268C
64831+:103D70003C06FF7F3C0F00FF2CAD000135EEFFFF3E
64832+:103D800034D9FFFF3C02FF0003193024000D1DC091
64833+:103D9000010EC82400E2C02400C370250319782551
64834+:103DA000AD2E0000AD2F00048D450024AFAE000005
64835+:103DB000AD2500088D4D00202405FFFFAD2D000C22
64836+:103DC000956800023107FFFFAD27001091660018CB
64837+:103DD00030C200FF000219C2506000018D4500345E
64838+:103DE000AD2500148D67000827BD0008AD27001C15
64839+:103DF0008C8B00CCAD2C0028AD20002CAD2B0024EA
64840+:103E0000AD20001803E00008AD20002027BDFFE032
64841+:103E1000AFB20018AFB10014AFB00010AFBF001CBC
64842+:103E20009098000000C088213C0D00FF330F007FF8
64843+:103E3000A0CF0000908E000135ACFFFF3C0AFF00D0
64844+:103E4000A0CE000194A6001EA22000048CAB00149A
64845+:103E50008E29000400A08021016C2824012A40241E
64846+:103E60000080902101052025A6260002AE24000432
64847+:103E700026050020262400080E00007624060002F5
64848+:103E800092470000260500282624001400071E0083
64849+:103E90000003160324060004044000032403FFFF6C
64850+:103EA000965900023323FFFF0E000076AE23001068
64851+:103EB000262400248FBF001C8FB200188FB100147D
64852+:103EC0008FB0001024050003000030210A0000809C
64853+:103ED00027BD002027BDFFD8AFB1001CAFB0001830
64854+:103EE000AFBF002090A80000240200018FB0003C6A
64855+:103EF0003103003F00808821106200148FAA00382F
64856+:103F0000240B0005506B0016AFAA001000A0202162
64857+:103F100000C028210E0003DC02003021922400BCE6
64858+:103F2000308300021060000326060030ACC00000A1
64859+:103F300024C600048FBF00208FB1001C8FB0001872
64860+:103F400000C0102103E0000827BD002801403821EF
64861+:103F50000E00035AAFB000100A0004200000000059
64862+:103F60000E0003A1AFB000140A00042000000000FE
64863+:103F70003C02000A034218213C04080024843D6CE2
64864+:103F80002405001A000030210A000080AF8300548D
64865+:103F90003C038000346200708C48000000A058216F
64866+:103FA00000C04821308A00FFAF8800308F4401787C
64867+:103FB0000480FFFE3C0C8000358600708CC500003C
64868+:103FC0003C0308008C6300743C1808008F180070D4
64869+:103FD00000A82023006468210000C82101A4782BD8
64870+:103FE0000319702101CF60213C010800AC2D007441
64871+:103FF0003C010800AC2C00708F480E14AF480144FF
64872+:10400000AF47014CA34A0152A74B01589346010800
64873+:1040100030C5000854A0000135291000934B090059
64874+:1040200024070050316A00FF11470007000000001C
64875+:104030008F450E1CAF450148AF4901543C091000A3
64876+:1040400003E00008AF490178934D010831A800084A
64877+:104050001100001000000000934F010831EE001025
64878+:1040600051C00001352900083C04080090843DD06F
64879+:10407000A34401508F4309A4AF4301488F4209A0D4
64880+:10408000AF420144AF4901543C09100003E000086D
64881+:10409000AF4901783C1908008F393D8C333800084E
64882+:1040A0005700FFF1352900080A00047300000000E2
64883+:1040B00024070040AF470814AF4008108F4209445E
64884+:1040C0008F4309508F4409548F45095C8F46094C32
64885+:1040D000AF820064AF830050AF84004CAF85005CBA
64886+:1040E00003E00008AF8600609346010930C5007FF9
64887+:1040F000000518C0000521400083102103E00008DE
64888+:10410000244200883C09080091293D9124A800021E
64889+:104110003C05110000093C0000E8302500C51825C9
64890+:1041200024820008AC83000003E00008AC80000497
64891+:104130009347010B8F4A002C974F09083C18000E3B
64892+:104140000358482131EEFFFF000E41C0AF48002C5C
64893+:1041500097430908952C001A008040212403000190
64894+:10416000318BFFFFAC8B00008D2D001C00A058216F
64895+:1041700000C06021AC8D00048D24002030E7004099
64896+:10418000AD04000891220019304400031083004858
64897+:104190002885000214A00062240600021086005642
64898+:1041A00024190003109900660000000010E0003A96
64899+:1041B000000000003C07080094E73D8624E200016F
64900+:1041C000934F0934934709219525002A31EE00FFCA
64901+:1041D000000E488230ED00FF978700580009360036
64902+:1041E000000D1C003044FFFF00C310250044C02513
64903+:1041F00000A778213C19400003197025000F4C00DE
64904+:10420000AD090004AD0E0000934D09203C030006EB
64905+:1042100025090014000D360000C32025AD04000858
64906+:104220008F59092C24E5000130A27FFFAD19000C45
64907+:104230008F580930A782005825020028AD180010B9
64908+:104240008F4F0938AD0F0014AD2B00048F4E09407D
64909+:10425000AD2E0008934D09373C05080090A53D9010
64910+:104260008F4409488F46094031A700FF00EC182110
64911+:10427000008678230003C7000005CC0003196025E1
64912+:1042800031E8FFFC01885825AD2B000CAD20001053
64913+:1042900003E00008AF4A002C3C0D080095AD3D86B8
64914+:1042A0003C0E080095CE3D800A0004C901AE1021E5
64915+:1042B0003C05080094A53D8A3C06080094C63D8054
64916+:1042C0003C18080097183D7C952E002400A6782104
64917+:1042D00001F86823000E240025A2FFF200821825B1
64918+:1042E00024190800AD03000CAD190014AD00001036
64919+:1042F0000A0004C4250800189526002495250028E6
64920+:104300000006C40000057C00370E810035ED080072
64921+:10431000AD0E000CAD0D00100A0004C425080014F9
64922+:104320001480FFA200000000952400240004140063
64923+:1043300034430800AD03000C0A0004C42508001033
64924+:104340003C03080094633D8A3C05080094A53D8029
64925+:104350003C06080094C63D7C953900249538002819
64926+:10436000006520210086782300196C000018740075
64927+:1043700025E2FFEE01C2202535A3810024190800A3
64928+:10438000AD03000CAD040010AD190018AD00001411
64929+:104390000A0004C42508001C03E00008240201F4FC
64930+:1043A00027BDFFE8AFB00010AFBF00140E000060E3
64931+:1043B0000080802124050040AF4508148F83005001
64932+:1043C0008F84004C8F85005C0070182100641023DE
64933+:1043D00018400004AF830050AF6300548F66005450
64934+:1043E000AF86004C1200000C000000008F440074E7
64935+:1043F000936800813409FA002D07000710E00005DA
64936+:1044000000891021936C0081240B01F4018B50046E
64937+:1044100001441021AF62000C8F4E095C01C5682376
64938+:1044200019A000048FBF00148F4F095CAF8F005C90
64939+:104430008FBF00148FB000100A00006227BD001863
64940+:104440008F8400648F8300508F82004CAF640044DF
64941+:10445000AF63005003E00008AF6200543C038000EB
64942+:10446000346200708C43000027BDFFF8308700FFE6
64943+:1044700030A900FF30C800FFAF8300308F440178BF
64944+:104480000480FFFE3C028000345900708F38000029
64945+:10449000A3A700033C0708008CE700748FAC000062
64946+:1044A0003C0608008CC60070030378233C0E7FFF97
64947+:1044B00000EFC82135CDFFFF00005021018D2824D9
64948+:1044C00000CA1821000847C0032F202B00A8102580
64949+:1044D0000064C021AFA200003C010800AC390074A8
64950+:1044E0003C010800AC380070934F010AA3A0000201
64951+:1044F0003C0E80FFA3AF00018FAC0000312B007F8A
64952+:1045000035CDFFFF018D4824000B5600012A4025C0
64953+:10451000240730002406FF803C05100027BD00085A
64954+:10452000AF48014CAF470154A7400158A346015280
64955+:1045300003E00008AF45017827BDFFE8AFBF0014D6
64956+:10454000AFB000108F6500743C068000309000FF13
64957+:1045500000A620250E000060AF6400749363000580
64958+:10456000346200080E000062A362000502002021F0
64959+:104570008FBF00148FB00010240500052406000131
64960+:104580000A00057027BD001827BDFFE03C0380002E
64961+:10459000AFB00010AFBF0018AFB1001434620070AC
64962+:1045A0008C470000309000FF30A800FFAF8700303C
64963+:1045B0008F4401780480FFFE3C18800037110070A2
64964+:1045C0008E2F00003C0D08008DAD00743C0A0800E1
64965+:1045D0008D4A007001E7702301AE282100005821A8
64966+:1045E00000AE302B014B4821012638213C01080048
64967+:1045F000AC250074000088213C010800AC27007045
64968+:104600001100000F000000008F6200742619FFFFE8
64969+:104610003208007F0002FE0233E5007F150000062D
64970+:10462000332200FF2407FF800207202624A3FFFF78
64971+:1046300000838025320200FF0040802124111008F1
64972+:104640000E000060000000008F49081831250004AA
64973+:1046500014A0FFFD3218007F001878C000187140C8
64974+:1046600001CF682125AC0088AF4C0818274A098083
64975+:104670008D4B0020AF4B01448D460024AF460148CE
64976+:10468000A35001500E000062A740015802201021E3
64977+:104690008FBF00188FB100148FB0001003E0000826
64978+:1046A00027BD002027BDFFE8308400FFAFBF00100A
64979+:1046B0000E0005BB30A500FF8F8300508FBF001098
64980+:1046C000344500402404FF903C02100027BD001830
64981+:1046D000AF43014CA3440152AF45015403E000082D
64982+:1046E000AF4201789343093E306200081040000D4C
64983+:1046F0003C0901013528080AAC8800008F47007486
64984+:10470000AC8700043C06080090C63D9030C5001000
64985+:1047100050A00006AC8000088F6A0060AC8A0008D8
64986+:104720002484000C03E00008008010210A00062207
64987+:104730002484000C27BDFFE8AFBF0014AFB0001009
64988+:104740009346093F00A050210005288000853823AA
64989+:1047500030C200FF240300063C09080095293D866D
64990+:1047600024E8FFD824050004104300372406000283
64991+:104770009750093C3C0F020400063400320EFFFF44
64992+:1047800001CF6825AC8D0000934C093E318B002091
64993+:104790001160000800000000934309363C02010349
64994+:1047A000345F0300307900FF033FC0252405000873
64995+:1047B000AC98000493430934935909210005F88209
64996+:1047C000306200FF0002C082332F00FF00186E002D
64997+:1047D000000F740001AE6025018920253C094000CE
64998+:1047E00000898025ACF0FFD8934309378F4F0948E3
64999+:1047F0008F580940306200FF004AC821033F7021F2
65000+:1048000001F86023000E6F0001A650253185FFFCE2
65001+:10481000001F58800145482501683821AD09002056
65002+:104820000E00006024F00028240400040E00006242
65003+:10483000A364003F020010218FBF00148FB000104E
65004+:1048400003E0000827BD00180A0006352406001200
65005+:1048500027BDFFD024090010AFB60028AFB5002453
65006+:10486000AFB40020AFB10014AFB000103C0108009D
65007+:10487000A0293D90AFBF002CAFB3001CAFB2001811
65008+:1048800097480908309400FF3C02000E3107FFFFF3
65009+:10489000000731C0AF46002C974409089344010B30
65010+:1048A00030B500FF03428021308300300000B0218A
65011+:1048B0001060012500008821240C00043C01080040
65012+:1048C000A02C3D90934B093E000B5600000A2E038E
65013+:1048D00004A0016000000000AF400048934F010BAE
65014+:1048E00031EE002011C00006000000009358093E80
65015+:1048F00000189E0000139603064001890000000086
65016+:104900009344010B30830040106000038F930050EC
65017+:104910008F8200502453FFFF9347093E30E6000882
65018+:1049200014C0000224120003000090219619002CEC
65019+:1049300093580934934F0937A7990058330C00FF57
65020+:1049400031EE00FF024E6821000D5880016C5021AD
65021+:10495000015140213C010800A4283D869205001821
65022+:1049600030A900FF010918213C010800A4233D885B
65023+:104970009211001816200002000000000000000D37
65024+:104980003C010800A4233D8A3C010800A4203D808E
65025+:104990003C010800A4203D7C935F010B3063FFFFC6
65026+:1049A00033F00040120000022464000A2464000B6B
65027+:1049B0003091FFFF0E00009E022020219358010B32
65028+:1049C0003C08080095083D8A0040202100185982C3
65029+:1049D000316700010E00049A01072821934C010B56
65030+:1049E0008F4B002C974E09083C0F000E034F4021BF
65031+:1049F00031CDFFFF000D51C0AF4A002C974309088D
65032+:104A00009505001A004038212404000130A9FFFF59
65033+:104A1000AC4900008D06001C00404821318A00404E
65034+:104A2000AC4600048D020020ACE20008910300199E
65035+:104A300030630003106400EC28790002172001188D
65036+:104A4000241000021070010C241F0003107F011EAF
65037+:104A500000000000114000DE000000003C090800DA
65038+:104A600095293D8625220001935F0934934E092143
65039+:104A70009504002A33F900FF0019C08231CF00FFEE
65040+:104A8000978E005800184600000F6C00010D80251D
65041+:104A90003045FFFF02051025008E50213C034000E9
65042+:104AA00000433025000A6400ACEC0004ACE60000D2
65043+:104AB000935F09203C19000624EC0014001FC60077
65044+:104AC00003197825ACEF00088F48092C25CD00018B
65045+:104AD00031A57FFFACE8000C8F500930A785005846
65046+:104AE00024E80028ACF000108F4409380100802130
65047+:104AF000ACE40014AD9300048F530940AD9300085B
65048+:104B0000934A09373C19080093393D908F4309486F
65049+:104B10008F460940314200FF0052F82100667023A1
65050+:104B2000001F7F000019C40001F8282531CDFFFCCB
65051+:104B300000AD2025AD84000CAD800010AF4B002CE3
65052+:104B4000934B093E317300081260000D3C060101D1
65053+:104B500034CC080AACEC00288F530074AD13000469
65054+:104B60003C0B0800916B3D903167001050E0000352
65055+:104B7000AD0000088F6A0060AD0A00082510000C27
65056+:104B800012C0003D000000009343093F24160006B8
65057+:104B900024060004306200FF105600C924070002FA
65058+:104BA0009758093C3C0F0204330DFFFF01AF40252D
65059+:104BB000AE0800009345093E30A400201080000894
65060+:104BC00000000000935309363C0B0103357F0300BE
65061+:104BD000327900FF033F7025AE0E00042406000862
65062+:104BE000934F093493480921312AFFFF31ED00FF2B
65063+:104BF000000D1082310300FF0002B60000032C00FC
65064+:104C000002C56025018A9825001220803C094000D9
65065+:104C10000204502302695825AD4BFFD8935F093732
65066+:104C20008F4F09488F58094033F900FF0332702134
65067+:104C30000006B08201D668210007440001F828234D
65068+:104C4000000D1F000068302530A2FFFC2547FFD86B
65069+:104C500000C260250016808002074821ACEC0020CD
65070+:104C6000253000280E00006024120004A372003FCB
65071+:104C70000E000062000000009347010B30F200407C
65072+:104C8000124000053C1900FF8E180000372EFFFF70
65073+:104C9000030E3024AE0600000E0000C702202021C3
65074+:104CA0003C10080092103D90321100031220000FBA
65075+:104CB00002A028218F89005025330001AF930050B6
65076+:104CC000AF7300508F6B00540173F8231BE0000298
65077+:104CD000026020218F640054AF6400548F4C007434
65078+:104CE000258401F4AF64000C02A028210280202159
65079+:104CF000A76000680E0005BB3C1410008F850050B3
65080+:104D000034550006AF45014C8F8A00488FBF002CF8
65081+:104D10008FB3001C25560001AF9600488FB20018D3
65082+:104D2000A34A01528FB60028AF5501548FB1001429
65083+:104D3000AF5401788FB500248FB400208FB00010DD
65084+:104D400003E0000827BD00309358093E00189E007C
65085+:104D500000139603064200362411000293440923EF
65086+:104D6000308300021060FEDD8F8600608F8200506D
65087+:104D700014C2FEDA000000000E0000600000000017
65088+:104D80009369003F24070016312800FF1107000C2B
65089+:104D9000240500083C0C0800918C3D90358B0001E7
65090+:104DA0003C010800A02B3D90936A003F314300FF77
65091+:104DB00010650065240D000A106D005E2402000CD1
65092+:104DC0000E000062000000000A00069000000000D3
65093+:104DD0003C09080095293D863C0A0800954A3D801B
65094+:104DE0000A0006F3012A10213C09080095293D8A92
65095+:104DF0003C04080094843D803C06080094C63D7C39
65096+:104E000095030024012410210046F8230003CC0060
65097+:104E100027F0FFF20330C025240F0800ACF8000C87
65098+:104E2000ACEF0014ACE000100A0006EE24E7001816
65099+:104E30003C010800A0313D90935F093E241600011B
65100+:104E400033F900201720FEA5241100080A0006905F
65101+:104E5000241100048F6E00848F4D094011A0FE9E26
65102+:104E6000AF8E0050240F00143C010800A02F3D908D
65103+:104E70000A00068F00000000950E0024950D002802
65104+:104E8000000E6400000D2C003589810034A6080056
65105+:104E9000ACE9000CACE600100A0006EE24E70014B2
65106+:104EA0001460FEEC000000009502002400021C00CB
65107+:104EB00034640800ACE4000C0A0006EE24E700109D
65108+:104EC0000A000741240700123C02080094423D8A70
65109+:104ED0003C06080094C63D803C03080094633D7C7A
65110+:104EE00095100024951900280046F82103E3C023FB
65111+:104EF00000106C0000197400270FFFEE01CF282569
65112+:104F000035AC8100ACEC000CACE5001024070800C7
65113+:104F1000AD2700182527001C0A0006EEAD2000145E
65114+:104F20008F7F004CAF7F00548F7900540A000699A0
65115+:104F3000AF790050A362003F0E0000620000000045
65116+:104F40000A00069000000000240200140A0008274E
65117+:104F5000A362003F27BDFFE8308400FFAFBF001011
65118+:104F60000E0005BB30A500FF9378007E9379007F8B
65119+:104F7000936E00809368007A332F00FF001866005C
65120+:104F8000000F6C0031CB00FF018D4825000B520053
65121+:104F90008FBF0010012A3825310600FF344470000D
65122+:104FA00000E628252402FF813C03100027BD0018DD
65123+:104FB000AF45014CAF440154A342015203E0000845
65124+:104FC000AF43017827BDFFD8AFB20018AFB10014CE
65125+:104FD000AFB00010AFBF0020AFB3001C9342010977
65126+:104FE000308600FF30B000FF000618C23204000215
65127+:104FF0003071000114800005305200FF93670005F6
65128+:1050000030E5000810A0000D30C80010024020213B
65129+:105010000E0005A702202821240400018FBF0020D4
65130+:105020008FB3001C8FB200188FB100148FB0001026
65131+:105030000080102103E0000827BD00281500003281
65132+:105040000000000093430109000028213062007F26
65133+:10505000000220C00002F94003E49821267900886C
65134+:10506000033B98218E7800248E6F0008130F0046B2
65135+:10507000000000008F640084241800020004FD82F8
65136+:1050800033F900031338007C0000000093660083AE
65137+:10509000934A0109514600043205007C10A00060CB
65138+:1050A000000000003205007C14A0005302402021C3
65139+:1050B00016200006320400018E7F00248F5901045F
65140+:1050C00017F9FFD600002021320400011080000AE9
65141+:1050D000024020218F4209408F9300641053000644
65142+:1050E000000000000E00066D022028218F430940B9
65143+:1050F000AF630044024020210E0006020220282156
65144+:105100000A000860240400013C0908008D2900649D
65145+:10511000252600013C010800AC26006416000012A0
65146+:10512000000000008F6D00843C0E00C001AE6024C2
65147+:1051300015800005024020210E00082E02202821A3
65148+:105140000A00086024040001240500040E00057014
65149+:1051500024060001024020210E00082E02202821F2
65150+:105160000A000860240400010E000041240400012C
65151+:10517000936B007D020B50250E000062A36A007D38
65152+:105180000A0008A38F6D00848F6600748F480104A5
65153+:105190008E67002400064E021507FFB63126007FF9
65154+:1051A000936B008326440001308A007F1146004340
65155+:1051B000316300FF5464FFB08F6400842645000112
65156+:1051C00030B1007F30A200FF122600042405000148
65157+:1051D000004090210A00087624110001240FFF806E
65158+:1051E000024F702401CF9026324200FF00409021F0
65159+:1051F0000A000876241100010E00066D0220282105
65160+:10520000321800301300FFAA321000820240202121
65161+:105210000E0005A7022028210A00086024040001CE
65162+:105220008F6E00743C0F80002405000301CF902591
65163+:10523000AF72007493710083240600010E000570A4
65164+:10524000322400FF0E00004124040001936D007D14
65165+:10525000020D60250E000062A36C007D3C0B08006F
65166+:105260008D6B0054257000013C010800AC300054E7
65167+:105270000A000860240400018F6800743C09800063
65168+:105280002405000401093825AF6700749363008387
65169+:10529000240600010E000570306400FF0E0000417E
65170+:1052A000240400019362007D020298250E00006232
65171+:1052B000A373007D0A00086024040001324D0080C1
65172+:1052C00039AC0080546CFF6C8F6400840A0008C9FC
65173+:1052D0002645000127BDFFC83C0A0008AFBF0030CB
65174+:1052E000AFB5002CAFB40028AFB30024AFB200209C
65175+:1052F000AFB1001CAFB00018034AD8212409004008
65176+:10530000AF490814AF4008108F4209448F43095039
65177+:105310008F4609548F47095C8F48094C9344010814
65178+:105320009345010BAF820064308400FF30A500FF7D
65179+:10533000AF830050AF86004CAF87005C0E00084A78
65180+:10534000AF8800601440017D8FBF0030A760006807
65181+:10535000934D0900240B00503C15080026B53D482C
65182+:1053600031AC00FF3C12080026523D58118B00035F
65183+:10537000000000000000A8210000902193510109C5
65184+:105380008F9F005024040010322E007F000E68C052
65185+:10539000000E6140018D282124B40088AF54081804
65186+:1053A0008F4901048F4A09A43C0B000E034BC02116
65187+:1053B000012A10233C010800AC223D6C8F430958A0
65188+:1053C0003C010800A0243D9097470908007F302346
65189+:1053D0003C010800AC263D7030E8FFFF0008C9C062
65190+:1053E0003C010800AC3F3D94AF59002C974209089E
65191+:1053F0009710002C8EB10000930F001803749821B1
65192+:10540000A7900058AF9300440220F80931F000FF44
65193+:10541000304E000215C001B2304F000111E0014FC3
65194+:10542000000000009343093E3066000814C00002EB
65195+:10543000241400030000A0218F5809A424130001A4
65196+:105440003C010800AC383D98934F0934935109371B
65197+:1054500031EC00FF322E00FF028E6821000D288003
65198+:1054600000AC5021015058213C010800A42B3D887C
65199+:105470003C010800A42A3D8693490934312200FFEB
65200+:1054800002022021249000103C010800A4303D8439
65201+:10549000240700068F9F00503C010800AC273D8C7C
65202+:1054A0008F88005C8F59095800008021011F282334
65203+:1054B00004A00149033F20230480014700A4302BAE
65204+:1054C00010C00149000000003C010800AC253D70FF
65205+:1054D0008E4200000040F809000000003043000246
65206+:1054E000146000F80040882130440001548000100E
65207+:1054F0008E4200043C0908008D293D743C0AC0001E
65208+:10550000012A8025AF500E008F45000030AB000807
65209+:105510001160FFFD00000000974D0E0824100001EF
65210+:10552000A78D003C8F4C0E04AF8C00348E420004DB
65211+:105530000040F8090000000002228825322E0002F7
65212+:1055400015C00180000000003C09080095293D7C41
65213+:105550003C06080094C63D883C0A0800954A3D7EFA
65214+:105560003C1908008F393D74012660213C18080061
65215+:105570008F183D983C03080094633D92018A2021D6
65216+:105580008F4E09400329F821248F000203E32821CC
65217+:10559000031968213C010800A42C3D8AAF8E0064E9
65218+:1055A0003C010800AC2D3D983C010800A4253D803D
65219+:1055B0000E00009E31E4FFFF8F870048004020214D
65220+:1055C0003C010800A0273D918E42000824E800011C
65221+:1055D000AF8800480040F809000000009344010B28
65222+:1055E0008F4C002C974A09083C0B000E034B4021BE
65223+:1055F0003149FFFF000919C08F8B0050AF43002CC9
65224+:10560000974309089506001A00403821308A004067
65225+:1056100030DFFFFFAC5F00008D19001C0040482107
65226+:10562000AC5900048D180020AC580008910F0019E7
65227+:1056300031E30003107300F0000000002862000254
65228+:105640001440010924050002106500FD240D00032B
65229+:10565000106D010D00000000114000D90000000095
65230+:105660003C0A0800954A3D8625420001934D0934C5
65231+:1056700093580921950E002A31A300FF00032082D0
65232+:10568000331F00FF9798005800047E00001FCC00D5
65233+:1056900001F940253049FFFF0109102501D83021CB
65234+:1056A0003C0540000045502500066C00ACED0004B0
65235+:1056B000ACEA0000934309203C04000624ED0014EA
65236+:1056C0000003FE0003E4C825ACF900088F49092C4B
65237+:1056D000270F000131EE7FFFACE9000C8F48093045
65238+:1056E000A78E005824E90028ACE800108F4509383F
65239+:1056F00001204021ACE50014ADAB00048F4209400D
65240+:10570000ADA20008934B09373C1F080093FF3D9062
65241+:105710008F4309488F4A0940316600FF00D4202199
65242+:10572000006A78230004C700001FCC000319282555
65243+:1057300031EEFFFC00AE1025ADA2000CADA00010B4
65244+:10574000AF4C002C934C093E318B00085160000F88
65245+:105750008E58000C3C06010134CA080AACEA002845
65246+:105760008F4B0074AD2B00043C0C0800918C3D90D5
65247+:105770003187001050E00003AD2000088F62006008
65248+:10578000AD2200082528000C8E58000C0300F809F3
65249+:10579000010020213C19080097393D8A3C1F080070
65250+:1057A00097FF3D7E033F782125E900020E0000C7E8
65251+:1057B0003124FFFF3C0E08008DCE3D6C3C080800F4
65252+:1057C0008D083D7401C828233C010800AC253D6CC0
65253+:1057D00014A00006000000003C0308008C633D8C10
65254+:1057E000346400403C010800AC243D8C1200007081
65255+:1057F0008F8C00448F470E108F900044AE0700201E
65256+:105800008F4D0E18AE0D00243C10080096103D8000
65257+:105810000E0000600000000024020040AF420814A7
65258+:105820008F8600508F8A004C00D01821006A5823C0
65259+:1058300019600004AF830050AF6300548F650054BB
65260+:10584000AF85004C1200000C000000008F44007473
65261+:10585000936800813409FA002D0E000711C000057D
65262+:1058600000891821937F0081241901F403F9780439
65263+:1058700001E41821AF63000C8F44095C8F83005C46
65264+:105880000083C0231B000003000000008F50095C50
65265+:10589000AF90005C0E000062000000008F8C005092
65266+:1058A0008E4700103C010800AC2C3D9400E0F80944
65267+:1058B000000000003C0D08008DAD3D6C55A0FEF5CC
65268+:1058C000240700068F450024975909088F8B006430
65269+:1058D0008F9400503C0F001F978200588F86005411
65270+:1058E0008F93004C3328FFFF35E9FF8000A9502437
65271+:1058F000000871C032320100AF4E0024A4C2002C57
65272+:10590000AF4A0024AF6B0044AF740050AF73005433
65273+:105910001640008032380010570000868EA4000424
65274+:10592000322300405460001B8EB100088EB0000C82
65275+:105930000200F809000000008FBF00308FB5002C76
65276+:105940008FB400288FB300248FB200208FB1001CC9
65277+:105950008FB0001803E0000827BD00389347010905
65278+:105960008F8800380007FE0003E8C825AF59008083
65279+:105970008F5809A08F5309A4AFB80010AF580E1468
65280+:105980008FB40010AF540E10AF530E1C0A00096202
65281+:10599000AF530E180220F809000000008EB0000C72
65282+:1059A0000200F809000000000A000AA88FBF0030BA
65283+:1059B000A5800020A59300220A000A5BAD93002475
65284+:1059C0003C09080095293D863C06080094C63D80A8
65285+:1059D0000A0009F4012610213C010800AC203D70AA
65286+:1059E0000A00098E8E4200003C010800AC243D7084
65287+:1059F0000A00098E8E4200003C03080094633D8A31
65288+:105A00003C04080094843D803C1F080097FF3D7CC7
65289+:105A1000951800240064C821033F782300186C0007
65290+:105A200025EEFFF201AE2825AC45000C240208004B
65291+:105A3000ACE20014ACE000100A0009EF24E7001803
65292+:105A400095060024950900280006240000091C0082
65293+:105A5000349F810034790800ACFF000CACF90010D1
65294+:105A60000A0009EF24E700141460FEFB00000000A8
65295+:105A70009518002400187C0035EE0800ACEE000CF0
65296+:105A80000A0009EF24E700103C07080094E73D8076
65297+:105A90003C04080094843D8A3C03080094633D7CE8
65298+:105AA00095190024951800280087F82103E378232E
65299+:105AB0002407080000192C0000186C0025EEFFEEEA
65300+:105AC00001AE302534A28100AD2700182527001C27
65301+:105AD000AD22000CAD2600100A0009EFAD20001425
65302+:105AE00093520109000028210E000602324400FFF3
65303+:105AF0008FBF00308FB5002C8FB400288FB30024E7
65304+:105B00008FB200208FB1001C8FB0001803E0000896
65305+:105B100027BD0038935F010933E400FF0E00066DD6
65306+:105B200000002821323800105300FF7E322300404D
65307+:105B30008EA400040080F809000000000A000AA2F8
65308+:105B4000322300401200FF5F000000008F540E144B
65309+:105B50008F920044AE5400208F530E1C0A000A8A14
65310+:105B6000AE5300248F82001C008040213C040100C1
65311+:105B70009047008530E3002010600009000000001D
65312+:105B80003C0708008CE73D948F83001800E3202336
65313+:105B9000048000089389000414E30003010020211D
65314+:105BA00003E00008008010213C04010003E000082D
65315+:105BB000008010211120000B006738238F8C0020FB
65316+:105BC00024090034918B00BC316A0002514000016D
65317+:105BD0002409003000E9682B15A0FFF10100202105
65318+:105BE00000E938232419FFFC00B9C02400F9782407
65319+:105BF00000F8702B15C0FFEA01E8202130C2000335
65320+:105C00000002182314C00012306900030000302184
65321+:105C100000A9702101C6682100ED602B1180FFE012
65322+:105C20003C0401002D2F00010006482B01053821FE
65323+:105C300001E9302414C0FFDA24E4FFFC2419FFFC3E
65324+:105C400000B9C0240308202103E0000800801021CF
65325+:105C50008F8B002024060004916A00BC31440004AC
65326+:105C60001480FFEC00A970210A000B5E00003021B7
65327+:105C700027BDFFE8AFBF00108F460100934A01091E
65328+:105C80003C1F08008FFF00902407FF80314F00FF6A
65329+:105C900031E8007F0008614003E6C821032CC021E1
65330+:105CA00027090120012770243C010800A02F3DD0C6
65331+:105CB000AF4E080C3C0D08008DAD00903C040080F8
65332+:105CC0003482000301A65821016C182124650120AB
65333+:105CD00030AA007801424025AF48081C3C1F08004C
65334+:105CE0008FFF00908F88004003E6C0213319000722
65335+:105CF00003074824033A7821AF49002825E909C061
65336+:105D0000952E00023C0D08008DAD008C3C0A080069
65337+:105D10008D4A009031CC3FFF01A61821000C59801C
65338+:105D2000006B282100A72024AF44002C95220002FC
65339+:105D30003C1F08008FFF008C9107008530593FFF02
65340+:105D400003E678210019C1800146702101F868211D
65341+:105D500031CC007F31AB007F019A2821017A50219C
65342+:105D60003C03000C3C04000E00A328210144102138
65343+:105D700030E6002027470980AF82002CAF88001C46
65344+:105D8000AF890024AF85002010C00006AF8700282F
65345+:105D90008D0200508CA4010C0044302318C0007701
65346+:105DA00000000000910C0085240DFFDF018D3824D8
65347+:105DB000A10700858F8B001C8F8900248F87002806
65348+:105DC0008D65004CAF850018912F000D31EE00203D
65349+:105DD00011C000170000000024090001A38900047D
65350+:105DE000AF80000C8CE400248F85000C240A00088E
65351+:105DF000AF800008AF8000103C010800A42A3D7E5F
65352+:105E00003C010800A4203D920E000B32000030211E
65353+:105E10008F8500248FBF0010AF82001490A8000D62
65354+:105E200027BD00180008394203E0000830E20001F5
65355+:105E3000913F00022418000133F900FF001921826C
65356+:105E400010980039240800021088005B8F86002C0F
65357+:105E50008CE5002414A0001B8F9F002091220000DD
65358+:105E6000240A00053046003F10CA00472404000100
65359+:105E70008F860008A3840004AF860010AF86000C54
65360+:105E80008CE400248F85000C240A00083C010800E3
65361+:105E9000A42A3D7E3C010800A4203D920E000B3256
65362+:105EA000000000008F8500248FBF0010AF82001417
65363+:105EB00090A8000D27BD00180008394203E0000833
65364+:105EC00030E200018CF800088CF900248FEE00C449
65365+:105ED000A38000048CE40024AF8E000C8F85000C9E
65366+:105EE0008F86000803197823240A0008AF8F00105A
65367+:105EF0003C010800A42A3D7E3C010800A4203D92FC
65368+:105F00000E000B32000000008F8500248FBF0010B0
65369+:105F1000AF82001490A8000D27BD00180008394278
65370+:105F200003E0000830E20001912300003062003FEE
65371+:105F3000104400278F8500208CE400241480002169
65372+:105F4000000000008D2E00183C187FFF8F85002078
65373+:105F5000370FFFFF01CF1824AF8300088F9F000881
65374+:105F60008CA8008403E8C82B1720000203E020213E
65375+:105F70008CA400840A000BEDAF8400088CA3010CF4
65376+:105F80000A000BCBAF8300188D2C00188F860008F9
65377+:105F90003C0D7FFF8F89002035A3FFFF018358242C
65378+:105FA00024040001AF8B0010AD2000CCA3840004BA
65379+:105FB0000A000BF9AF86000C8CCA00140A000BED26
65380+:105FC000AF8A00088CA300C80A000C30AF83000819
65381+:105FD0008F84002C8CAC00648C8D0014018D582BA8
65382+:105FE00011600004000000008CA200640A000C3064
65383+:105FF000AF8200088C8200140A000C30AF820008C7
65384+:106000008F85000C27BDFFE0AFBF0018AFB10014B3
65385+:1060100014A00007AFB000108F86002424020005F2
65386+:1060200090C400003083003F106200B68F840020CF
65387+:106030008F91000800A080218F8C00283C0508006B
65388+:106040008CA53D708D8B000431663FFF00C5502B41
65389+:106050005540000100C02821938D000411A0007359
65390+:1060600000B0F82B8F98002024040034930F00BC5C
65391+:1060700031EE000251C000012404003000A4C82BFE
65392+:10608000172000D10000000000A4282300B0F82B46
65393+:106090003C010800A4243D7C17E000680200202198
65394+:1060A0003C0308008C633D6C0083102B54400001BE
65395+:1060B000008018218F8800243C010800AC233D7427
65396+:1060C000000048219104000D308300205060000141
65397+:1060D0008F490E188F8300140123382B10E00059CC
65398+:1060E000000000003C0408008C843D7400895821A5
65399+:1060F000006B502B114000560090602B006930233C
65400+:1061000000C020213C010800AC263D7412000003B1
65401+:10611000241FFFFC1090008A32270003009FC82430
65402+:106120003C010800AC393D743C010800A4203D92BC
65403+:106130008F84000C120400078F830020AF910008A9
65404+:10614000020020218C7100CCAF90000C26300001A1
65405+:10615000AC7000CC3C0208008C423D748F8A001069
65406+:10616000240700180082202301422823AF84000C5A
65407+:1061700010800002AF850010240700108F86001CDD
65408+:106180003C010800A0273D902407004090CC0085EA
65409+:10619000318B00C0116700408F8D001414A00015D2
65410+:1061A00000002021934A01098F420974314500FF04
65411+:1061B0000002260224A300013090007F3071007F8E
65412+:1061C0001230007A2407FF80A0C300833C09080036
65413+:1061D0008D293D8C8F880024240D0002352C000869
65414+:1061E0003C010800A02D3DD13C010800AC2C3D8CA9
65415+:1061F00024040010910E000D31C6002010C00005CF
65416+:1062000000801821240800013C010800AC283D74DE
65417+:10621000348300018FBF00188FB100148FB00010BD
65418+:106220000060102103E0000827BD00203C010800A9
65419+:10623000A4203D7C13E0FF9A020020210A000C817B
65420+:1062400000A020213C0408008C843D740090602B49
65421+:106250001180FFAE000000003C0F080095EF3D7C70
65422+:1062600001E4702101C6682B11A000072C820004F4
65423+:106270003C1F60008FF954043338003F1700FFE5DE
65424+:10628000240300422C8200041040FFA0240300429B
65425+:106290000A000CDF8FBF0018152DFFC000000000A2
65426+:1062A0008CDF00743C0380002405FF8003E3C825D5
65427+:1062B000ACD9007490D80085240E0004240400108A
65428+:1062C000330F003F01E54025A0C800858F880024DA
65429+:1062D0003C010800A02E3DD1240300019106000DD1
65430+:1062E00030C9002015200003000000003C03080016
65431+:1062F0008C633D743C010800AC233D6C0A000CD655
65432+:10630000000000008F8700108C88008400E8282B94
65433+:1063100014A0000200E088218C910084240900016F
65434+:10632000A38900048F440E18022028210E000B328E
65435+:1063300002203021022080210A000C67AF82001465
65436+:1063400000071823306600033C010800A4263D9294
65437+:10635000122000058F8C0020918B00BC316A000454
65438+:106360001540001524CD00043C0F080095EF3D9228
65439+:1063700001E4702100AE302B50C0FF6E8F84000C02
65440+:106380002C85000514A0FFA32403004230980003CD
65441+:1063900017000002009818232483FFFC3C0108002A
65442+:1063A000AC233D740A000CA30000000000A7582491
65443+:1063B0000A000CCB016718263C010800A42D3D9271
65444+:1063C0000A000D33000000003C010800AC203D74C1
65445+:1063D0000A000CDE240300428F83001014600007C3
65446+:1063E000000010218F88002424050005910600007C
65447+:1063F00030C400FF108500030000000003E0000827
65448+:1064000000000000910A0018314900FF000939C25C
65449+:1064100014E0FFFA8F85001C3C04080094843D7C46
65450+:106420003C0308008C633D943C1908008F393D748F
65451+:106430003C0F080095EF3D920064C0218CAD0054E4
65452+:106440000319702101CF6021018D58231960001DAF
65453+:1064500000000000910E001C8F8C002C974B0E103A
65454+:1064600031CD00FF8D850004016D30238D88000043
65455+:1064700030CEFFFF000E510000AAC82100003821D5
65456+:1064800001072021032A182B0083C021AD990004A5
65457+:10649000AD980000918F000A01CF6821A18D000AFC
65458+:1064A0008F88002C974B0E12A50B0008950A003818
65459+:1064B00025490001A50900389107000D34E60008C0
65460+:1064C000A106000D03E000080000000027BDFFE06A
65461+:1064D000938700048F8F00248FAD00143C0E7FFF44
65462+:1064E0008F89000C35C8FFFFAFBF001CAFB000188C
65463+:1064F00001A8182491EA000D000717C03C1FBFFF38
65464+:10650000006258252D2E00018F90001837F9FFFFEB
65465+:106510003C1808008F183D943C0F080095EF3D8A09
65466+:1065200001796824000E47803C07EFFF3C05F0FF2F
65467+:1065300001A818253149002034E2FFFF34ACFFFFE9
65468+:106540000310582327A500102406000225EA0002A4
65469+:1065500000621824008080211520000200004021E4
65470+:106560008F480E1CA7AA0012056000372407000000
65471+:1065700030FF00FF001FCF008F8B001C00793825F3
65472+:10658000AFA70014916F00853C08080091083D9169
65473+:106590003C18DFFF31EE00C0370AFFFF000E182B5A
65474+:1065A0003C1F080097FF3D8400EA6824A3A800115F
65475+:1065B0000003174001A248258FB90010AFA90014AD
65476+:1065C0003C0A0800914A3D93A7BF00168FA800140B
65477+:1065D000032CC0243C0B01003C0F0FFF030B1825BC
65478+:1065E0003147000335EEFFFF010C68240007160059
65479+:1065F000006EF8243C09700001A2C82503E9582563
65480+:10660000AFB90014AFAB00100E000076A3A00015C8
65481+:106610008F8C0024260200089186000D30C40020D3
65482+:10662000108000068FBF001C3C05080094A53D802B
65483+:1066300024B0FFFF3C010800A4303D808FB000185B
65484+:1066400003E0000827BD00208F9800140118502B8C
65485+:106650005540FFC7240700010A000DB630FF00FFB8
65486+:106660009382000427BDFFE0AFBF00181040000F69
65487+:10667000008050218F880024240B00058F8900089A
65488+:10668000910700008F8400200100282130E3003FA3
65489+:106690008F86002C106B000800003821AFA9001075
65490+:1066A0000E00040EAFAA0014A38000048FBF0018D0
65491+:1066B00003E0000827BD00208D1900183C0F0800DA
65492+:1066C0008DEF3D748F9800103C027FFF8D08001401
65493+:1066D000345FFFFF033F682401F8702101AE60239F
65494+:1066E00001883821AFA900100E00040EAFAA0014D3
65495+:1066F0000A000E04A38000048F8700243C050800D4
65496+:1067000094A53D923C0208008C423D8C90E6000D21
65497+:106710000005240030C300201060002C00444025F8
65498+:106720008F85001C00006021240B000190A30085D0
65499+:1067300000004821240A00013C0F800035EE007063
65500+:106740008DC70000AF8700308F5801780700FFFE2B
65501+:106750003C038000347900708F3800003C0508004D
65502+:106760008CA500743C0D08008DAD007003077823E4
65503+:1067700000AF38210000102100EF302B01A22021B2
65504+:10678000008618213C010800AC2700743C01080079
65505+:10679000AC230070AF4B01483C1908008F393D9481
65506+:1067A000A7490144A74A0146AF59014C3C0B0800D8
65507+:1067B000916B3D91A34B0152AF4801543C0810002E
65508+:1067C000A74C015803E00008AF4801788F4B0E1C1E
65509+:1067D0003C0A08008D4A3D7497490E16974D0E14D9
65510+:1067E00001456021312AFFFF0A000E2731A9FFFF72
65511+:1067F0008F8300249064000D308200201040002917
65512+:10680000000000000000482100005021000040214D
65513+:106810003C07800034EB00708D670000AF870030CC
65514+:106820008F4C01780580FFFE3C0D800035AC007078
65515+:106830008D8B00003C0508008CA500743C0408000A
65516+:106840008C8400700167302300A67821000010219D
65517+:1068500001E6C82B0082C021031970213C01080009
65518+:10686000AC2F00743C010800AC2E0070AF49014809
65519+:106870003C0D08008DAD3D94A7480144240900401B
65520+:10688000A74A01463C081000240AFF91AF4D014C75
65521+:10689000A34A0152AF490154A740015803E0000840
65522+:1068A000AF4801788F490E1897460E1297450E1083
65523+:1068B00030CAFFFF0A000E5D30A8FFFF8F8300245F
65524+:1068C00027BDFFF89064000D308200201040003A90
65525+:1068D00000000000240B000100004821240A0001F0
65526+:1068E0003C088000350700708CE30000AF83003067
65527+:1068F0008F4C01780580FFFE3C0E80003C040800B0
65528+:1069000090843DD035C700708CEC00003C05080039
65529+:106910008CA50074A3A400033C1908008F390070F3
65530+:106920008FAD00000183302300A638210000102124
65531+:106930000322782100E6C02B01F8602101AE40253A
65532+:10694000AFA800003C010800AC2700743C0108001F
65533+:10695000AC2C00709346010A3C04080090843DD1A1
65534+:10696000A3A00002A3A600018FA300003C0580FFA6
65535+:106970003099007F34A2FFFF006278240019C6001E
65536+:1069800001F87025240D3000AF4E014C27BD0008E2
65537+:10699000AF4D0154A7400158AF4B0148A7490144EE
65538+:1069A000A74A01463C091000240AFF80A34A01526D
65539+:1069B00003E00008AF4901788F4B0E1897460E127E
65540+:1069C00097450E1030CAFFFF0A000E9130A9FFFF55
65541+:1069D0008F85001C2402008090A40085308300C0B5
65542+:1069E000106200058F8600208F8800088F87000CBA
65543+:1069F000ACC800C8ACC700C403E000080000000039
65544+:106A00003C0A0800254A39543C09080025293A2047
65545+:106A10003C08080025082DD43C07080024E73B3437
65546+:106A20003C06080024C637C43C05080024A5353CB4
65547+:106A30003C040800248431643C0308002463385C6F
65548+:106A40003C020800244236303C010800AC2A3D508C
65549+:106A50003C010800AC293D4C3C010800AC283D48F5
65550+:106A60003C010800AC273D543C010800AC263D64C5
65551+:106A70003C010800AC253D5C3C010800AC243D58BD
65552+:106A80003C010800AC233D683C010800AC223D609D
65553+:086A900003E000080000000013
65554+:00000001FF
65555diff --git a/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
65556new file mode 100644
65557index 0000000..43d7c4f
65558--- /dev/null
65559+++ b/firmware/bnx2/bnx2-mips-09-6.2.1b.fw.ihex
65560@@ -0,0 +1,6496 @@
65561+:10000000080001180800000000005594000000C816
65562+:1000100000000000000000000000000008005594EF
65563+:10002000000000380000565C080000A00800000036
65564+:100030000000574400005694080059200000008436
65565+:100040000000ADD808005744000001C00000AE5CBD
65566+:100050000800321008000000000092580000B01C98
65567+:10006000000000000000000000000000080092589E
65568+:100070000000033C000142740800049008000400E2
65569+:10008000000012FC000145B000000000000000006C
65570+:1000900000000000080016FC00000004000158AC3D
65571+:1000A000080000A80800000000003D00000158B052
65572+:1000B00000000000000000000000000008003D00FB
65573+:1000C00000000030000195B00A000046000000006A
65574+:1000D000000000000000000D636F6D362E322E31DF
65575+:1000E00062000000060201020000000000000003A0
65576+:1000F000000000C800000032000000030000000003
65577+:1001000000000000000000000000000000000000EF
65578+:1001100000000010000001360000EA600000000549
65579+:1001200000000000000000000000000000000008C7
65580+:1001300000000000000000000000000000000000BF
65581+:1001400000000000000000000000000000000000AF
65582+:10015000000000000000000000000000000000009F
65583+:10016000000000020000000000000000000000008D
65584+:10017000000000000000000000000000000000007F
65585+:10018000000000000000000000000010000000005F
65586+:10019000000000000000000000000000000000005F
65587+:1001A000000000000000000000000000000000004F
65588+:1001B000000000000000000000000000000000003F
65589+:1001C000000000000000000000000000000000002F
65590+:1001D000000000000000000000000000000000001F
65591+:1001E0000000000010000003000000000000000DEF
65592+:1001F0000000000D3C020800244256083C030800A1
65593+:1002000024635754AC4000000043202B1480FFFDB2
65594+:10021000244200043C1D080037BD9FFC03A0F021D0
65595+:100220003C100800261001183C1C0800279C5608AA
65596+:100230000E000256000000000000000D27BDFFB4B4
65597+:10024000AFA10000AFA20004AFA30008AFA4000C50
65598+:10025000AFA50010AFA60014AFA70018AFA8001CF0
65599+:10026000AFA90020AFAA0024AFAB0028AFAC002C90
65600+:10027000AFAD0030AFAE0034AFAF0038AFB8003C28
65601+:10028000AFB90040AFBC0044AFBF00480E001544FA
65602+:10029000000000008FBF00488FBC00448FB90040B1
65603+:1002A0008FB8003C8FAF00388FAE00348FAD003078
65604+:1002B0008FAC002C8FAB00288FAA00248FA90020C0
65605+:1002C0008FA8001C8FA700188FA600148FA5001000
65606+:1002D0008FA4000C8FA300088FA200048FA1000040
65607+:1002E00027BD004C3C1B60108F7A5030377B502864
65608+:1002F00003400008AF7A00008F82002427BDFFE092
65609+:10030000AFB00010AFBF0018AFB100148C42000CAA
65610+:100310003C1080008E110100104000348FBF001887
65611+:100320000E000D84000000008F85002024047FFF54
65612+:100330000091202BACB100008E030104960201084D
65613+:1003400000031C003042FFFF00621825ACA300042C
65614+:100350009202010A96030114304200FF3063FFFF4E
65615+:100360000002140000431025ACA200089603010C03
65616+:100370009602010E00031C003042FFFF00621825A8
65617+:10038000ACA3000C960301109602011200031C009E
65618+:100390003042FFFF00621825ACA300108E02011846
65619+:1003A000ACA200148E02011CACA20018148000083C
65620+:1003B0008F820024978200003C0420050044182509
65621+:1003C00024420001ACA3001C0A0000C6A782000062
65622+:1003D0003C0340189442001E00431025ACA2001CB0
65623+:1003E0000E000DB8240400018FBF00188FB1001457
65624+:1003F0008FB000100000102103E0000827BD00208E
65625+:100400003C0780008CE202B834E50100044100089A
65626+:10041000240300013C0208008C42006024420001D9
65627+:100420003C010800AC22006003E0000800601021DD
65628+:100430003C0208008C42005C8CA4002094A30016AF
65629+:100440008CA6000494A5000E24420001ACE40280B6
65630+:100450002463FFFC3C010800AC22005C3C0210005D
65631+:10046000A4E30284A4E5028600001821ACE6028819
65632+:10047000ACE202B803E000080060102127BDFFE0F5
65633+:100480003C028000AFB0001034420100AFBF001C3E
65634+:10049000AFB20018AFB100148C43000094450008BF
65635+:1004A0002462FE002C42038110400003000381C23D
65636+:1004B0000A00010226100004240201001462000553
65637+:1004C0003C1180003C02800890420004305000FF44
65638+:1004D0003C11800036320100964300143202000FB6
65639+:1004E00000021500004310253C0308008C63004403
65640+:1004F00030A40004AE220080246300013C01080007
65641+:10050000AC2300441080000730A200028FBF001C03
65642+:100510008FB200188FB100148FB000100A0000CE07
65643+:1005200027BD00201040002D0000182130A20080BF
65644+:1005300010400005362200708E44001C0E000C672F
65645+:10054000240500A0362200708C4400008F82000C2D
65646+:10055000008210232C43012C10600004AF82001095
65647+:10056000240300010A000145AF84000C8E42000400
65648+:100570003C036020AF84000CAC6200143C02080015
65649+:100580008C42005850400015000018218C62000475
65650+:10059000240301FE304203FF144300100000182121
65651+:1005A0002E020004104000032E0200080A00014041
65652+:1005B0000000802114400003000000000A000140F8
65653+:1005C0002610FFF90000000D2402000202021004B0
65654+:1005D0003C036000AC626914000018218FBF001C4E
65655+:1005E0008FB200188FB100148FB00010006010217E
65656+:1005F00003E0000827BD00203C0480008C8301003C
65657+:1006000024020100506200033C0280080000000D3B
65658+:100610003C02800890430004000010213063000F6A
65659+:1006200000031D0003E00008AC8300800004188074
65660+:100630002782FF9C00621821000410C00044102390
65661+:100640008C640000000210C03C030800246356E4E0
65662+:10065000004310213C038000AC64009003E00008DC
65663+:10066000AF8200243C0208008C42011410400019A3
65664+:100670003084400030A2007F000231C03C02020002
65665+:100680001080001400A218253C026020AC43001426
65666+:100690003C0408008C8456B83C0308008C630110AD
65667+:1006A0003C02800024050900AC4500200086202182
65668+:1006B000246300013C028008AC4400643C01080053
65669+:1006C000AC2301103C010800AC2456B803E000083C
65670+:1006D000000000003C02602003E00008AC4500146C
65671+:1006E00003E000080000102103E0000800001021D2
65672+:1006F00030A2000810400008240201003C0208005B
65673+:100700008C42010C244200013C010800AC22010C87
65674+:1007100003E0000800000000148200080000000050
65675+:100720003C0208008C4200FC244200013C0108000D
65676+:10073000AC2200FC0A0001A330A200203C02080009
65677+:100740008C420084244200013C010800AC22008459
65678+:1007500030A200201040000830A200103C02080027
65679+:100760008C420108244200013C010800AC2201082F
65680+:1007700003E0000800000000104000080000000036
65681+:100780003C0208008C420104244200013C010800A4
65682+:10079000AC22010403E00008000000003C02080055
65683+:1007A0008C420100244200013C010800AC220100FF
65684+:1007B00003E000080000000027BDFFE0AFB1001417
65685+:1007C0003C118000AFB20018AFBF001CAFB00010EA
65686+:1007D0003632010096500008320200041040000733
65687+:1007E000320300028FBF001C8FB200188FB10014BB
65688+:1007F0008FB000100A0000CE27BD00201060000B53
65689+:10080000020028218E2401000E00018A0000000051
65690+:100810003202008010400003240500A10E000C6786
65691+:100820008E44001C0A0001E3240200018E2301040F
65692+:100830008F82000810430006020028218E24010048
65693+:100840000E00018A000000008E220104AF82000821
65694+:10085000000010218FBF001C8FB200188FB1001450
65695+:100860008FB0001003E0000827BD00202C82000498
65696+:1008700014400002000018212483FFFD240200021E
65697+:10088000006210043C03600003E00008AC626914DD
65698+:1008900027BDFFE0AFBF001CAFB20018AFB100141E
65699+:1008A000AFB000103C048000948201083043700017
65700+:1008B000240220001062000A2862200154400052E5
65701+:1008C0008FBF001C24024000106200482402600018
65702+:1008D0001062004A8FBF001C0A0002518FB200183C
65703+:1008E00034820100904300098C5000189451000C90
65704+:1008F000240200091062001C0000902128620009F7
65705+:10090000144000218F8200242402000A5062001249
65706+:10091000323100FF2402000B1062000F00000000C3
65707+:100920002402000C146200188F8200243C0208008C
65708+:100930008C4256B824030900AC83002000501021DB
65709+:100940003C038008AC6200643C010800AC2256B84D
65710+:100950000A0002508FBF001C0E0001E900102602A1
65711+:100960000A0002308F8200240E0001E900102602E6
65712+:100970003C0380089462001A8C72000C3042FFFF26
65713+:10098000020280258F8200248C42000C5040001E01
65714+:100990008FBF001C0E000D84000000003C02800090
65715+:1009A00034420100944300088F82002400031C009D
65716+:1009B0009444001E8F82002000641825AC50000073
65717+:1009C00024040001AC510004AC520008AC40000CFF
65718+:1009D000AC400010AC400014AC4000180E000DB844
65719+:1009E000AC43001C0A0002508FBF001C0E000440E4
65720+:1009F000000000000A0002508FBF001C0E000C9F78
65721+:100A0000000000008FBF001C8FB200188FB10014CF
65722+:100A10008FB000100000102103E0000827BD002067
65723+:100A200027BDFFD8AFB400203C036010AFBF002447
65724+:100A3000AFB3001CAFB20018AFB10014AFB00010DC
65725+:100A40008C6450002402FF7F3C1408002694563822
65726+:100A5000008220243484380CAC6450003C028000B6
65727+:100A6000240300370E0014B0AC4300083C07080014
65728+:100A700024E70618028010212404001D2484FFFFAF
65729+:100A8000AC4700000481FFFD244200043C02080042
65730+:100A9000244207C83C010800AC2256403C02080032
65731+:100AA000244202303C030800246306203C04080072
65732+:100AB000248403B43C05080024A506F03C06080085
65733+:100AC00024C62C9C3C010800AC2256803C02080045
65734+:100AD000244205303C010800AC2756843C01080044
65735+:100AE000AC2656943C010800AC23569C3C010800FF
65736+:100AF000AC2456A03C010800AC2556A43C010800DB
65737+:100B0000AC2256A83C010800AC23563C3C0108002E
65738+:100B1000AC2456443C010800AC2056603C0108005F
65739+:100B2000AC2556643C010800AC2056703C0108001E
65740+:100B3000AC27567C3C010800AC2656903C010800CE
65741+:100B4000AC2356980E00056E00000000AF80000C2C
65742+:100B50003C0280008C5300008F8300043C0208009C
65743+:100B60008C420020106200213262000700008821C0
65744+:100B70002792FF9C3C100800261056E43C02080017
65745+:100B80008C42002024050001022518040043202483
65746+:100B90008F820004004310245044000C26310001D1
65747+:100BA00010800008AF9000248E4300003C028000BB
65748+:100BB000AC4300900E000D4BAE05000C0A0002C1C4
65749+:100BC00026310001AE00000C263100012E22000269
65750+:100BD000261000381440FFE9265200043C020800A9
65751+:100BE0008C420020AF820004326200071040FFD91F
65752+:100BF0003C028000326200011040002D326200028F
65753+:100C00003C0580008CA2010000002021ACA2002045
65754+:100C10008CA301042C42078110400008ACA300A85B
65755+:100C200094A2010824032000304270001443000302
65756+:100C30003C02800890420005304400FF0E0001593C
65757+:100C4000000000003C0280009042010B304300FF96
65758+:100C50002C62001E54400004000310800E00018628
65759+:100C60000A0002EC00000000005410218C42000039
65760+:100C70000040F80900000000104000043C02800021
65761+:100C80008C4301043C026020AC4300143C02080089
65762+:100C90008C4200343C0440003C03800024420001AC
65763+:100CA000AC6401383C010800AC220034326200021E
65764+:100CB00010400010326200043C1080008E0201409F
65765+:100CC000000020210E000159AE0200200E00038317
65766+:100CD000000000003C024000AE0201783C02080027
65767+:100CE0008C420038244200013C010800AC2200384C
65768+:100CF000326200041040FF973C0280003C108000EC
65769+:100D00008E020180000020210E000159AE02002059
65770+:100D10008E03018024020F00546200073C02800809
65771+:100D20008E0201883C0300E03042FFFF00431025A3
65772+:100D30000A000328AE020080344200809042000086
65773+:100D400024030050304200FF14430007000000005D
65774+:100D50000E000362000000001440000300000000C9
65775+:100D60000E000971000000003C0208008C42003CAB
65776+:100D70003C0440003C03800024420001AC6401B804
65777+:100D80003C010800AC22003C0A0002A33C028000A7
65778+:100D90003C02900034420001008220253C02800089
65779+:100DA000AC4400203C0380008C6200200440FFFE25
65780+:100DB0000000000003E00008000000003C0280008A
65781+:100DC000344300010083202503E00008AC440020E8
65782+:100DD00027BDFFE0AFB10014AFB000100080882144
65783+:100DE000AFBF00180E00033230B000FF8F83FF94B6
65784+:100DF000022020219062002502028025A07000259B
65785+:100E00008C7000183C0280000E00033D020280241A
65786+:100E10001600000B8FBF00183C0480008C8201F884
65787+:100E20000440FFFE348201C024030002AC510000E4
65788+:100E3000A04300043C021000AC8201F88FBF0018F0
65789+:100E40008FB100148FB0001003E0000827BD002010
65790+:100E500027BDFFE83C028000AFBF00103442018094
65791+:100E6000944300048C4400083063020010600005C5
65792+:100E7000000028210E00100C000000000A0003787A
65793+:100E8000240500013C02FF000480000700821824B2
65794+:100E90003C02040014620004240500018F82FF94C8
65795+:100EA00090420008240500018FBF001000A010210F
65796+:100EB00003E0000827BD00188F82FF982405000179
65797+:100EC000A040001A3C028000344201400A00034264
65798+:100ED0008C4400008F85FF9427BDFFE0AFBF001C4E
65799+:100EE000AFB20018AFB10014AFB0001090A2000074
65800+:100EF000304400FF38830020388200300003182B74
65801+:100F00000002102B0062182410600003240200501D
65802+:100F1000148200A88FBF001C90A20005304200017F
65803+:100F2000104000A48FBF001C3C02800034420140EE
65804+:100F3000904200082443FFFF2C6200051040009EF1
65805+:100F40008FB20018000310803C030800246355ACE6
65806+:100F5000004310218C420000004000080000000007
65807+:100F60003C028000345101400E0003328E24000008
65808+:100F70008F92FF948E2200048E50000C1602000205
65809+:100F800024020001AE42000C0E00033D8E2400003E
65810+:100F90008E220004145000068FBF001C8FB2001870
65811+:100FA0008FB100148FB000100A000F7827BD002009
65812+:100FB0008E42000C0A000419000000003C0480006E
65813+:100FC0003482014094A300108C4200043063FFFF80
65814+:100FD0001443001C0000000024020001A4A2001021
65815+:100FE0008C8202380441000F3C0380003C02003F29
65816+:100FF0003448F0003C0760003C06FFC08CE22BBC8C
65817+:1010000000461824004810240002130200031D8229
65818+:10101000106200583C0280008C8202380440FFF7C6
65819+:101020003C038000346201408C44000034620200C2
65820+:10103000AC4400003C021000AC6202380A00043BE1
65821+:101040008FBF001C94A200100A00041900000000C9
65822+:10105000240200201482000F3C0280003C03800028
65823+:1010600094A20012346301408C6300043042FFFFFD
65824+:10107000146200050000000024020001A4A2001276
65825+:101080000A0004028FBF001C94A200120A00041977
65826+:1010900000000000345101400E0003328E24000095
65827+:1010A0008F92FF948E230004964200123050FFFF6F
65828+:1010B0001603000224020001A64200120E00033DA6
65829+:1010C0008E2400008E220004160200068FBF001C32
65830+:1010D0008FB200188FB100148FB000100A00037C8B
65831+:1010E00027BD0020964200120A00041900000000EB
65832+:1010F0003C03800094A20014346301408C6300041C
65833+:101100003042FFFF14620008240200018FBF001C60
65834+:101110008FB200188FB100148FB00010A4A2001479
65835+:101120000A00146327BD002094A20014144000217B
65836+:101130008FBF001C0A000435000000003C03800043
65837+:1011400094A20016346301408C6300043042FFFF18
65838+:101150001462000D240200018FBF001C8FB2001822
65839+:101160008FB100148FB00010A4A200160A000B1457
65840+:1011700027BD00209442007824420004A4A200105D
65841+:101180000A00043B8FBF001C94A200162403000138
65842+:101190003042FFFF144300078FBF001C3C020800D1
65843+:1011A0008C420070244200013C010800AC22007017
65844+:1011B0008FBF001C8FB200188FB100148FB00010C9
65845+:1011C00003E0000827BD002027BDFFD8AFB20018FC
65846+:1011D0008F92FF94AFB10014AFBF0020AFB3001CDB
65847+:1011E000AFB000103C028000345101008C5001006F
65848+:1011F0009242000092230009304400FF2402001FA5
65849+:10120000106200AB28620020104000192402003850
65850+:101210002862000A1040000D2402000B286200081A
65851+:101220001040002E8F820024046001042862000216
65852+:101230001440002A8F820024240200061062002637
65853+:101240008FBF00200A00055F8FB3001C1062006092
65854+:101250002862000B144000FA8FBF00202402000E09
65855+:10126000106200788F8200240A00055F8FB3001C93
65856+:10127000106200D2286200391040000A2402008067
65857+:1012800024020036106200E528620037104000C3D7
65858+:1012900024020035106200D98FBF00200A00055FCC
65859+:1012A0008FB3001C1062002D2862008110400006E0
65860+:1012B000240200C824020039106200C98FBF002038
65861+:1012C0000A00055F8FB3001C106200A28FBF0020D0
65862+:1012D0000A00055F8FB3001C8F8200248C42000C33
65863+:1012E000104000D78FBF00200E000D8400000000CA
65864+:1012F0003C038000346301008C6200008F85002075
65865+:10130000946700089466000CACA200008C64000492
65866+:101310008F82002400063400ACA400049448001E10
65867+:101320008C62001800073C0000E83825ACA20008D9
65868+:101330008C62001C24040001ACA2000C9062000A24
65869+:1013400000C23025ACA60010ACA00014ACA0001860
65870+:10135000ACA7001C0A00051D8FBF00208F8200244F
65871+:101360008C42000C104000B68FBF00200E000D8490
65872+:10137000000000008F820024962400089625000CAF
65873+:101380009443001E000422029626000E8F82002045
65874+:10139000000426000083202500052C003C0300806B
65875+:1013A00000A6282500832025AC400000AC400004A6
65876+:1013B000AC400008AC40000CAC450010AC40001440
65877+:1013C000AC400018AC44001C0A00051C24040001B9
65878+:1013D0009622000C14400018000000009242000504
65879+:1013E0003042001014400014000000000E000332D0
65880+:1013F0000200202192420005020020213442001008
65881+:101400000E00033DA242000592420000240300208A
65882+:10141000304200FF10430089020020218FBF0020CE
65883+:101420008FB3001C8FB200188FB100148FB0001062
65884+:101430000A00107527BD00280000000D0A00055E97
65885+:101440008FBF00208C42000C1040007D8FBF002019
65886+:101450000E000D84000000008E2200048F84002006
65887+:101460009623000CAC8200003C0280089445002CBE
65888+:101470008F82002400031C0030A5FFFF9446001E4D
65889+:101480003C02400E0065182500C23025AC830004E4
65890+:10149000AC800008AC80000CAC800010AC80001464
65891+:1014A000AC800018AC86001C0A00051C2404000156
65892+:1014B0000E000332020020218F93FF9802002021AA
65893+:1014C0000E00033DA660000C020020210E00034226
65894+:1014D000240500018F8200248C42000C104000582B
65895+:1014E0008FBF00200E000D84000000009622000C2B
65896+:1014F0008F83002000021400AC700000AC62000476
65897+:10150000AC6000088E4400388F820024AC64000C6C
65898+:101510008E46003C9445001E3C02401FAC66001005
65899+:1015200000A228258E62000424040001AC6200148D
65900+:10153000AC600018AC65001C8FBF00208FB3001C8E
65901+:101540008FB200188FB100148FB000100A000DB8D0
65902+:1015500027BD0028240200201082003A8FB3001C0F
65903+:101560000E000F5E00000000104000358FBF00200D
65904+:101570003C0480008C8201F80440FFFE348201C0EC
65905+:1015800024030002AC500000A04300043C02100001
65906+:10159000AC8201F80A00055E8FBF00200200202106
65907+:1015A0008FBF00208FB3001C8FB200188FB10014C2
65908+:1015B0008FB000100A000EA727BD00289625000C4A
65909+:1015C000020020218FBF00208FB3001C8FB20018B3
65910+:1015D0008FB100148FB000100A000ECC27BD002878
65911+:1015E000020020218FB3001C8FB200188FB10014AD
65912+:1015F0008FB000100A000EF727BD00289225000DBD
65913+:10160000020020218FB3001C8FB200188FB100148C
65914+:101610008FB000100A000F4827BD002802002021CB
65915+:101620008FBF00208FB3001C8FB200188FB1001441
65916+:101630008FB000100A000F1F27BD00288FBF0020A9
65917+:101640008FB3001C8FB200188FB100148FB0001040
65918+:1016500003E0000827BD00283C0580008CA202782A
65919+:101660000440FFFE34A2024024030002AC44000008
65920+:10167000A04300043C02100003E00008ACA2027882
65921+:10168000A380001803E00008A38000193C03800039
65922+:101690008C6202780440FFFE8F82001CAC62024024
65923+:1016A00024020002A06202443C02100003E0000891
65924+:1016B000AC6202783C02600003E000088C425404F3
65925+:1016C0009083003024020005008040213063003FF9
65926+:1016D0000000482114620005000050219082004C57
65927+:1016E0009483004E304900FF306AFFFFAD00000CCC
65928+:1016F000AD000010AD000024950200148D05001C03
65929+:101700008D0400183042FFFF004910230002110031
65930+:10171000000237C3004038210086202300A2102B8E
65931+:101720000082202300A72823AD05001CAD0400186B
65932+:10173000A5090014A5090020A50A001603E0000869
65933+:10174000A50A002203E000080000000027BDFFD822
65934+:10175000AFB200183C128008AFB40020AFB3001C39
65935+:10176000AFB10014AFBF0024AFB00010365101007C
65936+:101770003C0260008C4254049222000C3C1408008D
65937+:10178000929400F7304300FF2402000110620032FF
65938+:101790000080982124020002146200353650008037
65939+:1017A0000E00143D000000009202004C2403FF8054
65940+:1017B0003C0480003042007F000211C024420240FD
65941+:1017C0000262102100431824AC8300949245000863
65942+:1017D0009204004C3042007F3C03800614850007D1
65943+:1017E000004380212402FFFFA22200112402FFFFF8
65944+:1017F000A62200120A0005D22402FFFF9602002052
65945+:10180000A222001196020022A62200128E020024BB
65946+:101810003C048008AE2200143485008090A2004C65
65947+:1018200034830100A06200108CA2003CAC6200185E
65948+:101830008C820068AC6200F48C820064AC6200F0C0
65949+:101840008C82006CAC6200F824020001A0A2006847
65950+:101850000A0005EE3C0480080E001456000000004B
65951+:1018600036420080A04000680A0005EE3C04800873
65952+:10187000A2000068A20000690A0006293C02800854
65953+:10188000348300808C62003834850100AC62006CC7
65954+:1018900024020001A062006990A200D59083000894
65955+:1018A000305100FF3072007F12320019001111C058
65956+:1018B00024420240026210212403FF8000431824C6
65957+:1018C0003C048000AC8300943042007F3C038006DF
65958+:1018D000004380218E02000C1040000D02002021E8
65959+:1018E0000E00057E0000000026220001305100FF9E
65960+:1018F0009203003C023410260002102B0002102339
65961+:101900003063007F022288240A0005F8A203003C0D
65962+:101910003C088008350401008C8200E03507008017
65963+:10192000ACE2003C8C8200E0AD02000090E5004C8F
65964+:10193000908600D590E3004C908400D52402FF806F
65965+:1019400000A228243063007F308400FF00A62825F1
65966+:101950000064182A1060000230A500FF38A500803E
65967+:10196000A0E5004CA10500093C0280089043000E50
65968+:10197000344400803C058000A043000A8C8300189A
65969+:101980003C027FFF3442FFFF00621824AC83001842
65970+:101990008CA201F80440FFFE00000000ACB301C0BF
65971+:1019A0008FBF00248FB400208FB3001C8FB20018AB
65972+:1019B0008FB100148FB0001024020002A0A201C455
65973+:1019C00027BD00283C02100003E00008ACA201F88B
65974+:1019D00090A2000024420001A0A200003C030800E5
65975+:1019E0008C6300F4304200FF144300020080302179
65976+:1019F000A0A0000090A200008F84001C000211C073
65977+:101A00002442024024830040008220212402FF80DF
65978+:101A1000008220243063007F3C02800A006218218B
65979+:101A20003C028000AC44002403E00008ACC300008A
65980+:101A300094820006908300058C85000C8C86001033
65981+:101A40008C8700188C88001C8C8400203C010800C6
65982+:101A5000A42256C63C010800A02356C53C0108003C
65983+:101A6000AC2556CC3C010800AC2656D03C01080001
65984+:101A7000AC2756D83C010800AC2856DC3C010800D5
65985+:101A8000AC2456E003E00008000000003C0280089F
65986+:101A9000344201008C4400343C038000346504006F
65987+:101AA000AC6400388C420038AF850028AC62003C42
65988+:101AB0003C020005AC6200300000000000000000A5
65989+:101AC00003E00008000000003C020006308400FF34
65990+:101AD000008220253C028000AC4400300000000061
65991+:101AE00000000000000000003C0380008C62000049
65992+:101AF000304200101040FFFD3462040003E0000893
65993+:101B0000AF82002894C200003C080800950800CA73
65994+:101B100030E7FFFF0080482101021021A4C200002D
65995+:101B200094C200003042FFFF00E2102B544000013D
65996+:101B3000A4C7000094A200003C0308008C6300CC02
65997+:101B400024420001A4A2000094A200003042FFFF42
65998+:101B5000144300073C0280080107102BA4A00000DA
65999+:101B60005440000101003821A4C700003C02800855
66000+:101B7000344601008CC3002894A200003C0480007D
66001+:101B80003042FFFE000210C000621021AC82003C17
66002+:101B90008C82003C006218231860000400000000E2
66003+:101BA0008CC200240A0006BA244200018CC2002420
66004+:101BB000AC8200383C020050344200103C038000EC
66005+:101BC000AC620030000000000000000000000000D7
66006+:101BD0008C620000304200201040FFFD0000000039
66007+:101BE00094A200003C04800030420001000210C0BA
66008+:101BF000004410218C430400AD2300008C420404F7
66009+:101C0000AD2200043C02002003E00008AC8200305A
66010+:101C100027BDFFE0AFB20018AFB10014AFB00010A5
66011+:101C2000AFBF001C94C2000000C080213C1208001D
66012+:101C3000965200C624420001A6020000960300004E
66013+:101C400094E2000000E03021144300058FB1003021
66014+:101C50000E00068F024038210A0006F10000000045
66015+:101C60008C8300048C82000424420040046100073D
66016+:101C7000AC8200048C8200040440000400000000D8
66017+:101C80008C82000024420001AC8200009602000019
66018+:101C90003042FFFF50520001A600000096220000D3
66019+:101CA00024420001A62200003C02800834420100C8
66020+:101CB000962300009442003C144300048FBF001C94
66021+:101CC00024020001A62200008FBF001C8FB2001862
66022+:101CD0008FB100148FB0001003E0000827BD002072
66023+:101CE00027BDFFE03C028008AFBF0018344201006E
66024+:101CF0008C4800343C03800034690400AC68003830
66025+:101D00008C42003830E700FFAF890028AC62003C0D
66026+:101D10003C020005AC620030000000000000000042
66027+:101D200000000000000000000000000000000000B3
66028+:101D30008C82000C8C82000C97830016AD22000070
66029+:101D40008C82001000604021AD2200048C820018BB
66030+:101D5000AD2200088C82001CAD22000C8CA2001465
66031+:101D6000AD2200108C820020AD220014908200056C
66032+:101D7000304200FF00021200AD2200188CA20018B1
66033+:101D8000AD22001C8CA2000CAD2200208CA2001001
66034+:101D9000AD2200248CA2001CAD2200288CA20020C1
66035+:101DA000AD22002C3402FFFFAD260030AD20003400
66036+:101DB000506200013408FFFFAD28003850E00011E8
66037+:101DC0003C0280083C048008348401009482005066
66038+:101DD0003042FFFFAD22003C9483004494850044D0
66039+:101DE000240200013063FFFF000318C200641821C1
66040+:101DF0009064006430A5000700A210040A00075C8C
66041+:101E00000044102534420100AD20003C94430044BE
66042+:101E1000944400443063FFFF000318C2006218219D
66043+:101E200030840007906500642402000100821004E1
66044+:101E30000002102700451024A0620064000000008A
66045+:101E400000000000000000003C0200063442004098
66046+:101E50003C038000AC620030000000000000000085
66047+:101E6000000000008C620000304200101040FFFDB6
66048+:101E70003C06800834C201503463040034C7014A70
66049+:101E800034C4013434C5014034C60144AFA200104B
66050+:101E90000E0006D2AF8300288FBF001803E00008B1
66051+:101EA00027BD00208F8300143C0608008CC600E884
66052+:101EB0008F82001C30633FFF000319800046102111
66053+:101EC000004310212403FF80004318243C068000B7
66054+:101ED000ACC300283042007F3C03800C004330211B
66055+:101EE00090C2000D30A500FF0000382134420010E0
66056+:101EF000A0C2000D8F8900143C028008344201000A
66057+:101F00009443004400091382304800032402000176
66058+:101F1000A4C3000E1102000B2902000210400005AC
66059+:101F2000240200021100000C240300010A0007A48F
66060+:101F30000000182111020006000000000A0007A49A
66061+:101F4000000018218CC2002C0A0007A424430001C1
66062+:101F50008CC20014244300018CC200180043102BD3
66063+:101F60005040000A240700012402002714A20003A5
66064+:101F70003C0380080A0007B1240700013463010014
66065+:101F80009462004C24420001A462004C00091382B8
66066+:101F9000304300032C620002104000090080282119
66067+:101FA000146000040000000094C200340A0007C15D
66068+:101FB0003046FFFF8CC600380A0007C10080282188
66069+:101FC000000030213C040800248456C00A000706A3
66070+:101FD0000000000027BDFF90AFB60068AFB50064F9
66071+:101FE000AFB40060AFB3005CAFB20058AFB1005403
66072+:101FF000AFBF006CAFB000508C9000000080B021EB
66073+:102000003C0208008C4200E8960400328F83001CDA
66074+:102010002414FF8030843FFF0062182100042180D7
66075+:1020200000641821007410243C13800000A090214B
66076+:1020300090A50000AE620028920400323C02800CA1
66077+:102040003063007F00628821308400C02402004099
66078+:10205000148200320000A8218E3500388E2200182C
66079+:102060001440000224020001AE2200189202003C3B
66080+:10207000304200201440000E8F83001C000511C068
66081+:102080002442024000621821306400783C02008043
66082+:102090000082202500741824AE630800AE64081086
66083+:1020A0008E2200188E03000800431021AE22001873
66084+:1020B0008E22002C8E230018244200010062182B6F
66085+:1020C0001060004300000000924200002442000122
66086+:1020D000A24200003C0308008C6300F4304200FF81
66087+:1020E00050430001A2400000924200008F84001C77
66088+:1020F000000211C024420240248300403063007F6C
66089+:10210000008220213C02800A0094202400621821D1
66090+:10211000AE6400240A0008D2AEC30000920300326D
66091+:102120002402FFC000431024304200FF1440000589
66092+:1021300024020001AE220018962200340A00084250
66093+:102140003055FFFF8E22001424420001AE220018F9
66094+:102150009202003000021600000216030441001C27
66095+:10216000000000009602003227A400100080282101
66096+:10217000A7A20016960200320000302124070001B9
66097+:102180003042FFFFAF8200140E000706AFA0001C14
66098+:10219000960200328F83001C3C0408008C8400E807
66099+:1021A00030423FFF000211800064182100621821B4
66100+:1021B00000741024AE62002C3063007F3C02800E5D
66101+:1021C000006218219062000D3042007FA062000D75
66102+:1021D0009222000D304200105040007892420000E0
66103+:1021E0003C028008344401009482004C8EC30000FD
66104+:1021F0003C130800967300C62442FFFFA482004CE3
66105+:10220000946200329623000E3054FFFF3070FFFFBF
66106+:102210003C0308008C6300D000701807A7A30038A7
66107+:102220009482003E3063FFFF3042FFFF14620007DC
66108+:10223000000000008C8200303C038000244200300B
66109+:10224000AC62003C0A00086A8C82002C9482004038
66110+:102250003042FFFF5462000927A400408C820038FE
66111+:102260003C03800024420030AC62003C8C8200348D
66112+:10227000AC6200380A0008793C03800027A50038CA
66113+:1022800027A60048026038210E00068FA7A000484C
66114+:102290008FA300403C02800024630030AC43003830
66115+:1022A0008FA30044AC43003C3C0380003C0200058B
66116+:1022B000AC6200303C028008344401009482004249
66117+:1022C000346304003042FFFF0202102B1440000769
66118+:1022D000AF8300289482004E9483004202021021B2
66119+:1022E000004310230A00088F3043FFFF9483004E01
66120+:1022F00094820042026318210050102300621823C8
66121+:102300003063FFFF3C028008344401009482003CAB
66122+:102310003042FFFF14430003000000000A00089F42
66123+:10232000240300019482003C3042FFFF0062102B26
66124+:10233000144000058F8200289482003C0062102324
66125+:102340003043FFFF8F820028AC550000AC400004F2
66126+:10235000AC540008AC43000C3C02000634420010B0
66127+:102360003C038000AC620030000000000000000070
66128+:10237000000000008C620000304200101040FFFDA1
66129+:102380003C04800834840100001018C20064182145
66130+:102390009065006432020007240600010046100424
66131+:1023A00000451025A0620064948300429622000E2E
66132+:1023B00050430001A386001892420000244200010D
66133+:1023C000A24200003C0308008C6300F4304200FF8E
66134+:1023D00050430001A2400000924200008F84001C84
66135+:1023E000000211C0244202402483004000822021C8
66136+:1023F0002402FF80008220243063007F3C02800A98
66137+:10240000006218213C028000AC440024AEC30000EE
66138+:102410008FBF006C8FB600688FB500648FB400600A
66139+:102420008FB3005C8FB200588FB100548FB0005052
66140+:1024300003E0000827BD007027BDFFD8AFB3001C24
66141+:10244000AFB20018AFB10014AFB00010AFBF0020A2
66142+:102450000080982100E0802130B1FFFF0E000D8444
66143+:1024600030D200FF0000000000000000000000006B
66144+:102470008F8200208F830024AC510000AC520004F6
66145+:10248000AC530008AC40000CAC400010AC40001451
66146+:10249000AC4000189463001E02038025AC50001C61
66147+:1024A0000000000000000000000000002404000103
66148+:1024B0008FBF00208FB3001C8FB200188FB10014A3
66149+:1024C0008FB000100A000DB827BD002830A5FFFF0F
66150+:1024D0000A0008DC30C600FF3C02800834430100DB
66151+:1024E0009462000E3C080800950800C63046FFFFC5
66152+:1024F00014C000043402FFFF946500EA0A000929B1
66153+:102500008F84001C10C20027000000009462004E5F
66154+:102510009464003C3045FFFF00A6102300A6182B52
66155+:102520003087FFFF106000043044FFFF00C5102318
66156+:1025300000E210233044FFFF0088102B1040000EF3
66157+:1025400000E810233C028008344401002403000109
66158+:1025500034420080A44300162402FFFFA482000E30
66159+:10256000948500EA8F84001C0000302130A5FFFF15
66160+:102570000A0009013C0760200044102A10400009AD
66161+:102580003C0280083443008094620016304200010F
66162+:10259000104000043C0280009442007E244200145B
66163+:1025A000A462001603E000080000000027BDFFE061
66164+:1025B0003C028008AFBF001CAFB0001834420100DD
66165+:1025C000944300429442004C104000193068FFFFD1
66166+:1025D0009383001824020001146200298FBF001C9D
66167+:1025E0003C06800834D00100000810C200501021C1
66168+:1025F000904200643103000734C70148304200FFB5
66169+:10260000006210073042000134C9014E34C4012C6D
66170+:1026100034C5013E1040001634C601420E0006D2F9
66171+:10262000AFA90010960200420A0009463048FFFF99
66172+:102630003C028008344401009483004494820042A8
66173+:102640001043000F8FBF001C94820044A4820042FC
66174+:1026500094820050A482004E8C820038AC820030FC
66175+:1026600094820040A482003E9482004AA4820048E2
66176+:102670008FBF001C8FB000180A00090427BD00207E
66177+:102680008FB0001803E0000827BD002027BDFFA081
66178+:10269000AFB1004C3C118000AFBF0058AFB3005445
66179+:1026A000AFB20050AFB000483626018890C2000398
66180+:1026B0003044007FA3A400108E32018090C200003D
66181+:1026C0003043007F240200031062003BAF92001CE5
66182+:1026D00028620004104000062402000424020002C4
66183+:1026E000106200098FBF00580A000B0F8FB300540F
66184+:1026F0001062004D240200051062014E8FBF005889
66185+:102700000A000B0F8FB30054000411C002421021C5
66186+:102710002404FF8024420240004410242643004049
66187+:10272000AE2200243063007F3C02800A0062182140
66188+:102730009062003CAFA3003C00441025A062003C26
66189+:102740008FA3003C9062003C304200401040016C7E
66190+:102750008FBF00583C108008A3800018361001007D
66191+:102760008E0200E08C63003427A4003C27A50010F3
66192+:10277000004310210E0007C3AE0200E093A2001038
66193+:102780003C038000A20200D58C6202780440FFFE68
66194+:102790008F82001CAC62024024020002A06202444C
66195+:1027A0003C021000AC6202780E0009390000000003
66196+:1027B0000A000B0E8FBF00583C05800890C3000133
66197+:1027C00090A2000B1443014E8FBF005834A4008028
66198+:1027D0008C8200189082004C90A200083C0260009D
66199+:1027E0008C4254048C8300183C027FFF3442FFFF6C
66200+:1027F000006218243C0208008C4200B4AC8300182C
66201+:102800003C038000244200013C010800AC2200B4DB
66202+:102810008C6201F80440FFFE8F82001CAC6201C094
66203+:102820000A000AD6240200023C10800890C300016E
66204+:102830009202000B144301328FBF005827A40018E6
66205+:1028400036050110240600033C0260008C4254044B
66206+:102850000E000E470000000027A40028360501F0F6
66207+:102860000E000E47240600038FA200283603010045
66208+:10287000AE0200648FA2002CAE0200688FA200306E
66209+:10288000AE02006C93A40018906300D52402FF8070
66210+:102890000082102400431025304900FF3084007F5F
66211+:1028A0003122007F0082102A544000013929008023
66212+:1028B000000411C0244202402403FF800242102180
66213+:1028C00000431024AE220094264200403042007F94
66214+:1028D0003C038006004340218FA3001C2402FFFF1D
66215+:1028E000AFA800403C130800927300F71062003359
66216+:1028F00093A2001995030014304400FF3063FFFFDA
66217+:102900000064182B106000100000000095040014F3
66218+:102910008D07001C8D0600183084FFFF0044202323
66219+:102920000004210000E438210000102100E4202BE5
66220+:1029300000C2302100C43021AD07001CAD060018D4
66221+:102940000A000A2F93A20019950400148D07001C99
66222+:102950008D0600183084FFFF008220230004210030
66223+:10296000000010210080182100C2302300E4202B39
66224+:1029700000C4302300E33823AD07001CAD06001867
66225+:1029800093A200198FA30040A462001497A2001A1A
66226+:10299000A46200168FA2001CAC6200108FA2001C63
66227+:1029A000AC62000C93A20019A462002097A2001A46
66228+:1029B000A46200228FA2001CAC6200243C048008A8
66229+:1029C000348300808C6200388FA20020012088218F
66230+:1029D000AC62003C8FA20020AC82000093A20018E1
66231+:1029E000A062004C93A20018A0820009A0600068B9
66232+:1029F00093A20018105100512407FF803229007F54
66233+:102A0000000911C024420240024210213046007FDA
66234+:102A10003C03800000471024AC6200943C02800616
66235+:102A200000C2302190C2003CAFA60040000020212F
66236+:102A300000471025A0C2003C8FA80040950200026C
66237+:102A4000950300148D07001C3042FFFF3063FFFF29
66238+:102A50008D060018004310230002110000E2382107
66239+:102A600000E2102B00C4302100C23021AD07001C51
66240+:102A7000AD06001895020002A5020014A50000167C
66241+:102A80008D020008AD0200108D020008AD02000C9E
66242+:102A900095020002A5020020A50000228D02000878
66243+:102AA000AD0200249102003C304200401040001A68
66244+:102AB000262200013C108008A3A90038A38000183A
66245+:102AC000361001008E0200E08D03003427A4004080
66246+:102AD00027A50038004310210E0007C3AE0200E016
66247+:102AE00093A200383C038000A20200D58C620278D9
66248+:102AF0000440FFFE8F82001CAC62024024020002F0
66249+:102B0000A06202443C021000AC6202780E00093957
66250+:102B100000000000262200013043007F14730004EF
66251+:102B2000004020212403FF8002231024004320269C
66252+:102B300093A200180A000A4B309100FF93A40018DA
66253+:102B40008FA3001C2402FFFF1062000A308900FFDF
66254+:102B500024820001248300013042007F14530005C9
66255+:102B6000306900FF2403FF800083102400431026F7
66256+:102B7000304900FF3C028008904200080120882173
66257+:102B8000305000FF123000193222007F000211C0C5
66258+:102B900002421021244202402403FF8000431824F3
66259+:102BA0003C048000AC8300943042007F3C038006EC
66260+:102BB000004310218C43000C004020211060000BCA
66261+:102BC000AFA200400E00057E000000002623000199
66262+:102BD0002405FF803062007F145300020225202468
66263+:102BE000008518260A000AAF307100FF3C048008F7
66264+:102BF000348400808C8300183C027FFF3442FFFF46
66265+:102C000000621824AC8300183C0380008C6201F839
66266+:102C10000440FFFE00000000AC7201C0240200026C
66267+:102C2000A06201C43C021000AC6201F80A000B0E65
66268+:102C30008FBF00583C04800890C300019082000BB5
66269+:102C40001443002F8FBF0058349000809202000878
66270+:102C500030420040104000200000000092020008B6
66271+:102C60000002160000021603044100050240202164
66272+:102C70000E000ECC240500930A000B0E8FBF0058E7
66273+:102C80009202000924030018304200FF1443000D93
66274+:102C900002402021240500390E000E64000030217E
66275+:102CA0000E0003328F84001C8F82FF9424030012D5
66276+:102CB000A04300090E00033D8F84001C0A000B0E88
66277+:102CC0008FBF0058240500360E000E64000030212E
66278+:102CD0000A000B0E8FBF00580E0003320240202165
66279+:102CE000920200058F84001C344200200E00033D38
66280+:102CF000A20200050E0010758F84001C8FBF0058C3
66281+:102D00008FB300548FB200508FB1004C8FB0004889
66282+:102D100003E0000827BD00603C0280083445010044
66283+:102D20003C0280008C42014094A3000E0000302140
66284+:102D300000402021AF82001C3063FFFF3402FFFF00
66285+:102D4000106200063C0760202402FFFFA4A2000ED0
66286+:102D500094A500EA0A00090130A5FFFF03E000087E
66287+:102D60000000000027BDFFC83C0280003C06800830
66288+:102D7000AFB5002CAFB1001CAFBF0030AFB400281E
66289+:102D8000AFB30024AFB20020AFB00018345101003F
66290+:102D900034C501008C4301008E2200148CA400E491
66291+:102DA0000000A821AF83001C0044102318400052EB
66292+:102DB000A38000188E22001400005021ACA200E471
66293+:102DC00090C3000890A200D53073007FA3A200102A
66294+:102DD0008CB200E08CB400E4304200FF1053003BA2
66295+:102DE00093A200108F83001C2407FF80000211C0F3
66296+:102DF0000062102124420240246300400047102456
66297+:102E00003063007F3C0980003C08800A006818217C
66298+:102E1000AD2200248C62003427A4001427A50010E2
66299+:102E2000024280210290102304400028AFA3001426
66300+:102E30009062003C00E21024304200FF1440001970
66301+:102E4000020090219062003C34420040A062003CAD
66302+:102E50008F86001C93A3001024C200403042007FE4
66303+:102E6000004828213C0208008C4200F42463000141
66304+:102E7000306400FF14820002A3A30010A3A000107E
66305+:102E800093A20010AFA50014000211C0244202401A
66306+:102E900000C2102100471024AD2200240A000B4577
66307+:102EA00093A200100E0007C3000000003C0280083F
66308+:102EB00034420100AC5000E093A30010240A00014A
66309+:102EC000A04300D50A000B4593A200102402000184
66310+:102ED000154200093C0380008C6202780440FFFE2A
66311+:102EE0008F82001CAC62024024020002A0620244F5
66312+:102EF0003C021000AC6202789222000B2403000214
66313+:102F0000304200FF144300720000000096220008C7
66314+:102F1000304300FF24020082146200402402008437
66315+:102F20003C028000344901008D22000C95230006EC
66316+:102F3000000216023063FFFF3045003F24020027E5
66317+:102F400010A2000FAF83001428A200281040000830
66318+:102F5000240200312402002110A2000924020025CD
66319+:102F600010A20007938200190A000BBD00000000A8
66320+:102F700010A20007938200190A000BBD0000000098
66321+:102F80000E000777012020210A000C3D0000000000
66322+:102F90003C0380008C6202780440FFFE8F82001C9C
66323+:102FA000AC62024024020002A06202443C02100013
66324+:102FB000AC6202780A000C3D000000009523000678
66325+:102FC000912400058D25000C8D2600108D270018FA
66326+:102FD0008D28001C8D290020244200013C0108009E
66327+:102FE000A42356C63C010800A02456C53C01080095
66328+:102FF000AC2556CC3C010800AC2656D03C0108005C
66329+:10300000AC2756D83C010800AC2856DC3C0108002F
66330+:10301000AC2956E00A000C3DA38200191462000A94
66331+:10302000240200813C02800834420100944500EAF9
66332+:10303000922600058F84001C30A5FFFF30C600FFDC
66333+:103040000A000BFE3C0760211462005C00000000D7
66334+:103050009222000A304300FF306200201040000737
66335+:10306000306200403C02800834420100944500EA8E
66336+:103070008F84001C0A000BFC24060040104000074F
66337+:10308000000316003C02800834420100944500EA27
66338+:103090008F84001C0A000BFC24060041000216036A
66339+:1030A000044100463C02800834420100944500EA95
66340+:1030B0008F84001C2406004230A5FFFF3C076019E6
66341+:1030C0000E000901000000000A000C3D0000000095
66342+:1030D0009222000B24040016304200FF1044000628
66343+:1030E0003C0680009222000B24030017304200FFB0
66344+:1030F000144300320000000034C5010090A2000B10
66345+:10310000304200FF1444000B000080218CA20020FC
66346+:103110008CA400202403FF800043102400021140EF
66347+:103120003084007F004410253C032000004310251C
66348+:10313000ACC2083094A2000800021400000214037C
66349+:10314000044200012410000194A2000830420080D3
66350+:103150005040001A0200A82194A20008304220002A
66351+:10316000504000160200A8218CA300183C021C2D20
66352+:10317000344219ED106200110200A8213C0208003F
66353+:103180008C4200D4104000053C0280082403000457
66354+:1031900034420100A04300FC3C028008344201009C
66355+:1031A000944500EA8F84001C2406000630A5FFFF2A
66356+:1031B0000E0009013C0760210200A8210E00093918
66357+:1031C000000000009222000A304200081040000473
66358+:1031D00002A010210E0013790000000002A01021AF
66359+:1031E0008FBF00308FB5002C8FB400288FB3002420
66360+:1031F0008FB200208FB1001C8FB0001803E00008D0
66361+:1032000027BD00382402FF80008220243C02900069
66362+:1032100034420007008220253C028000AC4400209C
66363+:103220003C0380008C6200200440FFFE0000000090
66364+:1032300003E00008000000003C0380002402FF803F
66365+:10324000008220243462000700822025AC64002024
66366+:103250008C6200200440FFFE0000000003E0000834
66367+:103260000000000027BDFFD8AFB3001CAFB10014B1
66368+:10327000AFB00010AFBF0020AFB200183C1180000B
66369+:103280003C0280088E32002034530100AE2400201E
66370+:10329000966300EA000514003C074000004738250B
66371+:1032A00000A08021000030210E0009013065FFFFE1
66372+:1032B000240200A1160200022402FFFFA2620009FC
66373+:1032C000AE3200208FBF00208FB3001C8FB20018D9
66374+:1032D0008FB100148FB0001003E0000827BD002854
66375+:1032E0003C0280082403000527BDFFE834420100AA
66376+:1032F000A04300FCAFBF00103C0280008C420100E4
66377+:10330000240500A1004020210E000C67AF82001CA4
66378+:103310003C0380008C6202780440FFFE8F82001C18
66379+:103320008FBF001027BD0018AC62024024020002CB
66380+:10333000A06202443C021000AC62027803E0000884
66381+:103340000000000027BDFFE83C068000AFBF001072
66382+:1033500034C7010094E20008304400FF3883008243
66383+:10336000388200842C6300012C4200010062182581
66384+:103370001060002D24020083938200195040003B0E
66385+:103380008FBF00103C020800904256CC8CC4010054
66386+:103390003C06080094C656C63045003F38A30032AC
66387+:1033A00038A2003F2C6300012C4200010062182566
66388+:1033B000AF84001CAF860014A380001914600007BE
66389+:1033C00000E020212402002014A2001200000000CE
66390+:1033D0003402FFFF14C2000F00000000240200208E
66391+:1033E00014A2000500E028218CE300142402FFFF52
66392+:1033F0005062000B8FBF00103C040800248456C0AC
66393+:10340000000030210E000706240700010A000CD638
66394+:103410008FBF00100E000777000000008FBF001064
66395+:103420000A00093927BD001814820004240200850F
66396+:103430008CC501040A000CE1000020211482000662
66397+:103440002482FF808CC50104240440008FBF00103B
66398+:103450000A00016727BD0018304200FF2C4200021D
66399+:1034600010400004240200228FBF00100A000B2726
66400+:1034700027BD0018148200048F8200248FBF001023
66401+:103480000A000C8627BD00188C42000C1040001E5C
66402+:1034900000E0282190E300092402001814620003D0
66403+:1034A000240200160A000CFC240300081462000722
66404+:1034B00024020017240300123C02800834420080DA
66405+:1034C000A04300090A000D0994A7000854620007F0
66406+:1034D00094A700088F82FF942404FFFE9043000508
66407+:1034E00000641824A043000594A7000890A6001BC0
66408+:1034F0008CA4000094A500068FBF001000073C00BC
66409+:103500000A0008DC27BD00188FBF001003E0000888
66410+:1035100027BD00188F8500243C04800094A2002A57
66411+:103520008CA30034000230C02402FFF000C210243B
66412+:1035300000621821AC83003C8CA200303C03800068
66413+:10354000AC8200383C02005034420010AC620030C3
66414+:103550000000000000000000000000008C6200007D
66415+:10356000304200201040FFFD30C20008104000062D
66416+:103570003C0280008C620408ACA200208C62040C27
66417+:103580000A000D34ACA200248C430400ACA300203C
66418+:103590008C420404ACA200243C0300203C028000C6
66419+:1035A000AC4300303C0480008C8200300043102487
66420+:1035B0001440FFFD8F8600243C020040AC820030A6
66421+:1035C00094C3002A94C2002894C4002C94C5002EF1
66422+:1035D00024630001004410213064FFFFA4C20028CE
66423+:1035E00014850002A4C3002AA4C0002A03E0000836
66424+:1035F000000000008F84002427BDFFE83C05800404
66425+:1036000024840010AFBF00100E000E472406000AED
66426+:103610008F840024948200129483002E3042000F85
66427+:10362000244200030043180424027FFF0043102BB0
66428+:1036300010400002AC8300000000000D0E000D13CE
66429+:10364000000000008F8300248FBF001027BD0018EA
66430+:10365000946200149463001A3042000F00021500B7
66431+:10366000006218253C02800003E00008AC4300A083
66432+:103670008F8300243C028004944400069462001A64
66433+:103680008C650000A4640016004410233042FFFF44
66434+:103690000045102B03E00008384200018F8400240D
66435+:1036A0003C0780049486001A8C85000094E2000692
66436+:1036B000A482001694E3000600C310233042FFFFEB
66437+:1036C0000045102B384200011440FFF8A483001677
66438+:1036D00003E00008000000008F8400243C02800406
66439+:1036E000944200069483001A8C850000A482001680
66440+:1036F000006210233042FFFF0045102B38420001CA
66441+:103700005040000D8F850024006030213C0780046C
66442+:1037100094E20006A482001694E3000600C310237E
66443+:103720003042FFFF0045102B384200011440FFF8E3
66444+:10373000A48300168F8500243C03800034620400BB
66445+:103740008CA40020AF820020AC6400388CA200243E
66446+:10375000AC62003C3C020005AC62003003E00008B3
66447+:10376000ACA000048F8400243C0300068C8200047B
66448+:1037700000021140004310253C038000AC62003081
66449+:103780000000000000000000000000008C6200004B
66450+:10379000304200101040FFFD34620400AC80000491
66451+:1037A00003E00008AF8200208F86002427BDFFE0E1
66452+:1037B000AFB10014AFB00010AFBF00188CC300044D
66453+:1037C0008CC500248F820020309000FF94C4001A22
66454+:1037D00024630001244200202484000124A7002047
66455+:1037E000ACC30004AF820020A4C4001AACC70024FC
66456+:1037F00004A100060000882104E2000594C2001A1A
66457+:103800008CC2002024420001ACC2002094C2001AE5
66458+:1038100094C300282E040001004310262C4200010E
66459+:10382000004410245040000594C2001A24020001F4
66460+:10383000ACC2000894C2001A94C300280010202BC8
66461+:10384000004310262C4200010044102514400007BC
66462+:10385000000000008CC20008144000042402001084
66463+:103860008CC300041462000F8F8500240E000DA786
66464+:10387000241100018F820024944300289442001AEE
66465+:1038800014430003000000000E000D1300000000B0
66466+:10389000160000048F8500240E000D840000000037
66467+:1038A0008F85002494A2001E94A4001C24420001D1
66468+:1038B0003043FFFF14640002A4A2001EA4A0001E57
66469+:1038C0001200000A3C02800494A2001494A3001A7F
66470+:1038D0003042000F00021500006218253C028000F3
66471+:1038E000AC4300A00A000E1EACA0000894420006E3
66472+:1038F00094A3001A8CA40000A4A200160062102356
66473+:103900003042FFFF0044102B384200011040000DF0
66474+:1039100002201021006030213C07800494E2000660
66475+:10392000A4A2001694E3000600C310233042FFFF58
66476+:103930000044102B384200011440FFF8A4A30016E5
66477+:10394000022010218FBF00188FB100148FB000101B
66478+:1039500003E0000827BD002003E00008000000008D
66479+:103960008F82002C3C03000600021140004310250A
66480+:103970003C038000AC62003000000000000000004A
66481+:10398000000000008C620000304200101040FFFD7B
66482+:1039900034620400AF82002803E00008AF80002CEE
66483+:1039A00003E000080000102103E000080000000010
66484+:1039B0003084FFFF30A5FFFF0000182110800007B2
66485+:1039C000000000003082000110400002000420428C
66486+:1039D000006518210A000E3D0005284003E000089C
66487+:1039E0000060102110C0000624C6FFFF8CA200005A
66488+:1039F00024A50004AC8200000A000E4724840004C1
66489+:103A000003E000080000000010A0000824A3FFFF4E
66490+:103A1000AC86000000000000000000002402FFFF50
66491+:103A20002463FFFF1462FFFA2484000403E000080B
66492+:103A3000000000003C0280083442008024030001A2
66493+:103A4000AC43000CA4430010A4430012A443001490
66494+:103A500003E00008A44300168F82002427BDFFD88E
66495+:103A6000AFB3001CAFB20018AFB10014AFB000107C
66496+:103A7000AFBF00208C47000C248200802409FF8007
66497+:103A80003C08800E3043007F008080213C0A80008B
66498+:103A9000004920240068182130B100FF30D200FF17
66499+:103AA00010E000290000982126020100AD44002CFE
66500+:103AB000004928243042007F004820219062000005
66501+:103AC00024030050304200FF1443000400000000B3
66502+:103AD000AD45002C948200EA3053FFFF0E000D84A8
66503+:103AE000000000008F8200248F83002000112C0032
66504+:103AF0009442001E001224003484000100A22825F4
66505+:103B00003C02400000A22825AC7000008FBF0020BE
66506+:103B1000AC6000048FB20018AC7300088FB10014C1
66507+:103B2000AC60000C8FB3001CAC6400108FB00010B0
66508+:103B3000AC60001424040001AC60001827BD00280C
66509+:103B40000A000DB8AC65001C8FBF00208FB3001CAD
66510+:103B50008FB200188FB100148FB0001003E000087E
66511+:103B600027BD00283C06800034C201009043000FAE
66512+:103B7000240200101062000E2865001110A000073A
66513+:103B800024020012240200082405003A10620006F4
66514+:103B90000000302103E0000800000000240500358B
66515+:103BA0001462FFFC000030210A000E6400000000D7
66516+:103BB0008CC200748F83FF9424420FA003E000089E
66517+:103BC000AC62000C27BDFFE8AFBF00100E0003423F
66518+:103BD000240500013C0480088FBF0010240200016E
66519+:103BE00034830080A462001227BD00182402000163
66520+:103BF00003E00008A080001A27BDFFE0AFB2001864
66521+:103C0000AFB10014AFB00010AFBF001C30B2FFFF67
66522+:103C10000E000332008088213C028008345000806E
66523+:103C20009202000924030004304200FF1443000CF8
66524+:103C30003C028008124000082402000A0E000E5BBD
66525+:103C400000000000920200052403FFFE0043102440
66526+:103C5000A202000524020012A20200093C02800810
66527+:103C600034420080022020210E00033DA0400027A6
66528+:103C700016400003022020210E000EBF00000000AD
66529+:103C800002202021324600FF8FBF001C8FB2001897
66530+:103C90008FB100148FB00010240500380A000E64A4
66531+:103CA00027BD002027BDFFE0AFBF001CAFB200184A
66532+:103CB000AFB10014AFB000100E00033200808021BD
66533+:103CC0000E000E5B000000003C02800834450080BE
66534+:103CD00090A2000924120018305100FF1232000394
66535+:103CE0000200202124020012A0A2000990A20005D7
66536+:103CF0002403FFFE004310240E00033DA0A2000594
66537+:103D00000200202124050020163200070000302187
66538+:103D10008FBF001C8FB200188FB100148FB000103D
66539+:103D20000A00034227BD00208FBF001C8FB200187D
66540+:103D30008FB100148FB00010240500390A000E6402
66541+:103D400027BD002027BDFFE83C028000AFB0001077
66542+:103D5000AFBF0014344201009442000C2405003629
66543+:103D60000080802114400012304600FF0E00033214
66544+:103D7000000000003C02800834420080240300124E
66545+:103D8000A043000990430005346300100E000E5B51
66546+:103D9000A04300050E00033D020020210200202167
66547+:103DA0000E000342240500200A000F3C0000000022
66548+:103DB0000E000E64000000000E00033202002021FD
66549+:103DC0003C0280089043001B2405FF9F0200202135
66550+:103DD000006518248FBF00148FB00010A043001B93
66551+:103DE0000A00033D27BD001827BDFFE0AFBF001844
66552+:103DF000AFB10014AFB0001030B100FF0E000332BD
66553+:103E0000008080213C02800824030012344200809C
66554+:103E10000E000E5BA04300090E00033D02002021AE
66555+:103E200002002021022030218FBF00188FB1001422
66556+:103E30008FB00010240500350A000E6427BD002055
66557+:103E40003C0480089083000E9082000A1443000B0B
66558+:103E5000000028218F82FF942403005024050001D4
66559+:103E600090420000304200FF1443000400000000B4
66560+:103E70009082000E24420001A082000E03E00008A0
66561+:103E800000A010213C0380008C6201F80440FFFE7A
66562+:103E900024020002AC6401C0A06201C43C02100014
66563+:103EA00003E00008AC6201F827BDFFE0AFB20018E4
66564+:103EB0003C128008AFB10014AFBF001CAFB00010BF
66565+:103EC00036510080922200092403000A304200FF8C
66566+:103ED0001443003E000000008E4300048E22003890
66567+:103EE000506200808FBF001C92220000240300500B
66568+:103EF000304200FF144300253C0280008C42014008
66569+:103F00008E4300043642010002202821AC43001CED
66570+:103F10009622005C8E2300383042FFFF00021040E2
66571+:103F200000621821AE23001C8E4300048E2400384A
66572+:103F30009622005C006418233042FFFF0003184300
66573+:103F4000000210400043102A10400006000000004C
66574+:103F50008E4200048E230038004310230A000FAA6B
66575+:103F6000000220439622005C3042FFFF0002204006
66576+:103F70003C0280083443010034420080ACA4002C91
66577+:103F8000A040002424020001A062000C0E000F5E7D
66578+:103F900000000000104000538FBF001C3C02800056
66579+:103FA0008C4401403C0380008C6201F80440FFFE19
66580+:103FB00024020002AC6401C0A06201C43C021000F3
66581+:103FC000AC6201F80A0010078FBF001C92220009A2
66582+:103FD00024030010304200FF144300043C02800020
66583+:103FE0008C4401400A000FEE0000282192220009B3
66584+:103FF00024030016304200FF14430006240200147C
66585+:10400000A22200093C0280008C4401400A001001F9
66586+:104010008FBF001C8E2200388E23003C00431023EB
66587+:10402000044100308FBF001C92220027244200016F
66588+:10403000A2220027922200272C42000414400016DE
66589+:104040003C1080009222000924030004304200FF4B
66590+:10405000144300093C0280008C4401408FBF001CC7
66591+:104060008FB200188FB100148FB000102405009398
66592+:104070000A000ECC27BD00208C440140240500938B
66593+:104080008FBF001C8FB200188FB100148FB00010CA
66594+:104090000A000F4827BD00208E0401400E000332A5
66595+:1040A000000000008E4200042442FFFFAE420004E4
66596+:1040B0008E22003C2442FFFFAE22003C0E00033D56
66597+:1040C0008E0401408E0401408FBF001C8FB2001887
66598+:1040D0008FB100148FB00010240500040A000342C1
66599+:1040E00027BD00208FB200188FB100148FB00010D0
66600+:1040F00003E0000827BD00203C0680008CC2018838
66601+:104100003C038008346500809063000E00021402B6
66602+:10411000304400FF306300FF1464000E3C0280084E
66603+:1041200090A20026304200FF104400098F82FF94C5
66604+:10413000A0A400262403005090420000304200FF5B
66605+:1041400014430006000000000A0005A18CC4018091
66606+:104150003C02800834420080A044002603E00008AE
66607+:104160000000000027BDFFE030E700FFAFB20018FD
66608+:10417000AFBF001CAFB10014AFB0001000809021A1
66609+:1041800014E0000630C600FF000000000000000D33
66610+:10419000000000000A001060240001163C038008A3
66611+:1041A0009062000E304200FF14460023346200800B
66612+:1041B00090420026304200FF1446001F000000001D
66613+:1041C0009062000F304200FF1446001B0000000008
66614+:1041D0009062000A304200FF144600038F90FF9463
66615+:1041E0000000000D8F90FF948F82FF983C1180009B
66616+:1041F000AE05003CAC450000A066000A0E0003328C
66617+:104200008E240100A20000240E00033D8E24010034
66618+:104210003C0380008C6201F80440FFFE240200028F
66619+:10422000AC7201C0A06201C43C021000AC6201F893
66620+:104230000A0010618FBF001C000000000000000D8C
66621+:10424000000000002400013F8FBF001C8FB2001847
66622+:104250008FB100148FB0001003E0000827BD0020CC
66623+:104260008F83FF943C0280008C44010034420100A3
66624+:104270008C65003C9046001B0A00102724070001B3
66625+:104280003C0280089043000E9042000A0043102632
66626+:10429000304200FF03E000080002102B27BDFFE0C2
66627+:1042A0003C028008AFB10014AFB00010AFBF0018DF
66628+:1042B0003450008092020005240300303042003068
66629+:1042C00014430085008088218F8200248C42000CDA
66630+:1042D000104000828FBF00180E000D840000000007
66631+:1042E0008F860020ACD100009202000892030009E2
66632+:1042F000304200FF00021200306300FF004310252F
66633+:10430000ACC200049202004D000216000002160327
66634+:1043100004410005000000003C0308008C630048D5
66635+:104320000A00109F3C1080089202000830420040B2
66636+:10433000144000030000182192020027304300FFC0
66637+:104340003C108008361100809222004D00031E00B0
66638+:10435000304200FF0002140000621825ACC30008C0
66639+:104360008E2400308F820024ACC4000C8E250034D3
66640+:104370009443001E3C02C00BACC50010006218251F
66641+:104380008E22003800002021ACC200148E22003C96
66642+:10439000ACC200180E000DB8ACC3001C8E020004A5
66643+:1043A0008F8400203C058000AC8200008E2200201B
66644+:1043B000AC8200048E22001CAC8200088E220058C1
66645+:1043C0008CA3007400431021AC82000C8E22002CC0
66646+:1043D000AC8200108E2200408E23004400021400A4
66647+:1043E00000431025AC8200149222004D240300806B
66648+:1043F000304200FF1443000400000000AC800018AD
66649+:104400000A0010E38F8200248E23000C2402000196
66650+:104410001062000E2402FFFF92220008304200408A
66651+:104420001440000A2402FFFF8E23000C8CA20074AB
66652+:10443000006218233C0208000062102414400002AD
66653+:10444000000028210060282100051043AC820018DC
66654+:104450008F820024000020219443001E3C02C00CE7
66655+:10446000006218258F8200200E000DB8AC43001C9E
66656+:104470003C038008346201008C4200008F850020DC
66657+:10448000346300808FBF0018ACA20000ACA0000411
66658+:104490008C6400488F8200248FB10014ACA4000803
66659+:1044A000ACA0000CACA00010906300059446001E68
66660+:1044B0003C02400D00031E0000C23025ACA30014D6
66661+:1044C0008FB00010ACA0001824040001ACA6001CA2
66662+:1044D0000A000DB827BD00208FBF00188FB100144F
66663+:1044E0008FB0001003E0000827BD00203C028000D0
66664+:1044F0009443007C3C02800834460100308400FF75
66665+:104500003065FFFF2402000524A34650A0C4000C20
66666+:104510005482000C3065FFFF90C2000D2C42000752
66667+:104520001040000724A30A0090C3000D24020014C9
66668+:104530000062100400A210210A00111F3045FFFF85
66669+:104540003065FFFF3C0280083442008003E0000831
66670+:10455000A44500143C03800834680080AD05003891
66671+:10456000346701008CE2001C308400FF00A210239D
66672+:104570001840000330C600FF24A2FFFCACE2001C80
66673+:1045800030820001504000083C0380088D02003C4E
66674+:1045900000A2102304410012240400058C620004D0
66675+:1045A00010A2000F3C0380088C62000414A2001EBD
66676+:1045B000000000003C0208008C4200D8304200207D
66677+:1045C000104000093C0280083462008090630008BB
66678+:1045D0009042004C144300043C0280082404000470
66679+:1045E0000A00110900000000344300803442010039
66680+:1045F000A040000C24020001A462001410C0000AB4
66681+:104600003C0280008C4401003C0380008C6201F875
66682+:104610000440FFFE24020002AC6401C0A06201C499
66683+:104620003C021000AC6201F803E00008000000004A
66684+:1046300027BDFFE800A61823AFBF00101860008058
66685+:10464000308800FF3C02800834470080A0E000244E
66686+:1046500034440100A0E000278C82001C00A210233B
66687+:1046600004400056000000008CE2003C94E3005C33
66688+:104670008CE4002C004530233063FFFF00C3182179
66689+:104680000083202B1080000400E018218CE2002C15
66690+:104690000A00117800A2102194E2005C3042FFFF72
66691+:1046A00000C2102100A21021AC62001C3C02800854
66692+:1046B000344400809482005C8C83001C3042FFFFF5
66693+:1046C0000002104000A210210043102B10400004F3
66694+:1046D000000000008C82001C0A00118B3C06800840
66695+:1046E0009482005C3042FFFF0002104000A21021C3
66696+:1046F0003C06800834C3010034C70080AC82001C33
66697+:10470000A060000CACE500388C62001C00A21023F5
66698+:104710001840000224A2FFFCAC62001C3102000120
66699+:10472000104000083C0380088CE2003C00A21023EB
66700+:1047300004410012240400058CC2000410A20010E1
66701+:104740008FBF00108C62000414A2004F8FBF0010B6
66702+:104750003C0208008C4200D8304200201040000A81
66703+:104760003C02800834620080906300089042004C54
66704+:10477000144300053C028008240400048FBF00108D
66705+:104780000A00110927BD001834430080344201009B
66706+:10479000A040000C24020001A46200143C0280002E
66707+:1047A0008C4401003C0380008C6201F80440FFFE51
66708+:1047B000240200020A0011D8000000008CE2001C54
66709+:1047C000004610230043102B54400001ACE5001CB0
66710+:1047D00094E2005C3042FFFF0062102B144000079F
66711+:1047E0002402000294E2005C8CE3001C3042FFFFD4
66712+:1047F00000621821ACE3001C24020002ACE5003882
66713+:104800000E000F5EA082000C1040001F8FBF001032
66714+:104810003C0280008C4401003C0380008C6201F863
66715+:104820000440FFFE24020002AC6401C0A06201C487
66716+:104830003C021000AC6201F80A0011F08FBF0010BA
66717+:1048400031020010104000108FBF00103C028008A1
66718+:10485000344500808CA3001C94A2005C00661823E1
66719+:104860003042FFFF006218213C023FFF3444FFFF4B
66720+:104870000083102B544000010080182100C3102138
66721+:10488000ACA2001C8FBF001003E0000827BD001879
66722+:1048900027BDFFE800C0402100A63023AFBF0010B5
66723+:1048A00018C00026308A00FF3C028008344900808E
66724+:1048B0008D24001C8D23002C008820230064182BDD
66725+:1048C0001060000F344701008CE2002000461021E8
66726+:1048D000ACE200208CE200200044102B1440000BBE
66727+:1048E0003C023FFF8CE2002000441023ACE2002099
66728+:1048F0009522005C3042FFFF0A0012100082202146
66729+:10490000ACE00020008620213C023FFF3443FFFF43
66730+:104910000064102B54400001006020213C028008FC
66731+:104920003442008000851821AC43001CA0400024C4
66732+:10493000A04000270A0012623C03800831420010A8
66733+:10494000104000433C0380083C06800834C40080CB
66734+:104950008C82003C004810235840003E34660080A2
66735+:104960009082002424420001A0820024908200242E
66736+:104970003C0308008C630024304200FF0043102BEE
66737+:10498000144000688FBF001034C201008C42001C2C
66738+:1049900000A2102318400063000000008CC3000434
66739+:1049A0009482005C006818233042FFFF0003184324
66740+:1049B000000210400043102A1040000500000000D3
66741+:1049C0008CC20004004810230A0012450002104364
66742+:1049D0009482005C3042FFFF000210403C068008D9
66743+:1049E000AC82002C34C5008094A2005C8CA4002C06
66744+:1049F00094A3005C3042FFFF00021040008220219F
66745+:104A00003063FFFF0083202101041021ACA2001CB1
66746+:104A10008CC2000434C60100ACC2001C2402000297
66747+:104A20000E000F5EA0C2000C1040003E8FBF0010B1
66748+:104A30003C0280008C4401003C0380008C6201F841
66749+:104A40000440FFFE240200020A001292000000004F
66750+:104A500034660080ACC50038346401008C82001CD0
66751+:104A600000A210231840000224A2FFFCAC82001C0C
66752+:104A7000314200015040000A3C0380088CC2003CD7
66753+:104A800000A2102304430014240400058C620004D7
66754+:104A900014A200033C0380080A00128424040005C9
66755+:104AA0008C62000414A2001F8FBF00103C0208009B
66756+:104AB0008C4200D8304200201040000A3C0280089E
66757+:104AC00034620080906300089042004C144300055B
66758+:104AD0003C028008240400048FBF00100A00110962
66759+:104AE00027BD00183443008034420100A040000C70
66760+:104AF00024020001A46200143C0280008C440100E6
66761+:104B00003C0380008C6201F80440FFFE2402000296
66762+:104B1000AC6401C0A06201C43C021000AC6201F8A8
66763+:104B20008FBF001003E0000827BD001827BDFFE875
66764+:104B30003C0A8008AFBF0010354900808D22003C40
66765+:104B400000C04021308400FF004610231840009D23
66766+:104B500030E700FF354701002402000100A63023A2
66767+:104B6000A0E0000CA0E0000DA522001418C0002455
66768+:104B7000308200108D23001C8D22002C0068182329
66769+:104B80000043102B1040000F000000008CE20020BA
66770+:104B900000461021ACE200208CE200200043102BE4
66771+:104BA0001440000B3C023FFF8CE200200043102326
66772+:104BB000ACE200209522005C3042FFFF0A0012C1E7
66773+:104BC00000621821ACE00020006618213C023FFF83
66774+:104BD0003446FFFF00C3102B5440000100C01821D1
66775+:104BE0003C0280083442008000651821AC43001C60
66776+:104BF000A0400024A04000270A00130F3C038008B7
66777+:104C0000104000403C0380088D22003C00481023E7
66778+:104C10005840003D34670080912200242442000166
66779+:104C2000A1220024912200243C0308008C6300246C
66780+:104C3000304200FF0043102B1440009A8FBF001039
66781+:104C40008CE2001C00A21023184000960000000017
66782+:104C50008D4300049522005C006818233042FFFF5A
66783+:104C600000031843000210400043102A10400005C2
66784+:104C7000012020218D420004004810230A0012F276
66785+:104C8000000210439522005C3042FFFF00021040FA
66786+:104C90003C068008AC82002C34C5008094A2005CE5
66787+:104CA0008CA4002C94A3005C3042FFFF0002104053
66788+:104CB000008220213063FFFF0083182101031021AF
66789+:104CC000ACA2001C8CC2000434C60100ACC2001CA3
66790+:104CD000240200020E000F5EA0C2000C1040007102
66791+:104CE0008FBF00103C0280008C4401003C03800018
66792+:104CF0008C6201F80440FFFE240200020A0013390E
66793+:104D00000000000034670080ACE500383466010024
66794+:104D10008CC2001C00A210231840000224A2FFFC39
66795+:104D2000ACC2001C30820001504000083C038008E7
66796+:104D30008CE2003C00A2102304430051240400052F
66797+:104D40008C62000410A2003E3C0380088C620004C8
66798+:104D500054A200548FBF00103C0208008C4200D8BF
66799+:104D600030420020104000063C028008346200807F
66800+:104D7000906300089042004C104300403C028008C1
66801+:104D80003443008034420100A040000C24020001A2
66802+:104D9000A46200143C0280008C4401003C038000AB
66803+:104DA0008C6201F80440FFFE24020002AC6401C0E2
66804+:104DB000A06201C43C021000AC6201F80A00137743
66805+:104DC0008FBF001024020005A120002714E2000A72
66806+:104DD0003C038008354301009062000D2C42000620
66807+:104DE000504000053C0380089062000D2442000101
66808+:104DF000A062000D3C03800834670080ACE50038F9
66809+:104E0000346601008CC2001C00A21023184000026E
66810+:104E100024A2FFFCACC2001C308200015040000AFA
66811+:104E20003C0380088CE2003C00A2102304410014E3
66812+:104E3000240400058C62000414A200033C038008D3
66813+:104E40000A00136E240400058C62000414A20015ED
66814+:104E50008FBF00103C0208008C4200D83042002076
66815+:104E60001040000A3C028008346200809063000811
66816+:104E70009042004C144300053C02800824040004C6
66817+:104E80008FBF00100A00110927BD001834430080AD
66818+:104E900034420100A040000C24020001A46200146E
66819+:104EA0008FBF001003E0000827BD00183C0B8008EE
66820+:104EB00027BDFFE83C028000AFBF00103442010074
66821+:104EC000356A00809044000A356901008C45001461
66822+:104ED0008D4800389123000C308400FF0105102319
66823+:104EE0001C4000B3306700FF2CE20006504000B1C8
66824+:104EF0008FBF00102402000100E2300430C2000322
66825+:104F00005440000800A8302330C2000C144000A117
66826+:104F100030C20030144000A38FBF00100A00143BC1
66827+:104F20000000000018C00024308200108D43001CD7
66828+:104F30008D42002C006818230043102B1040000FF6
66829+:104F4000000000008D22002000461021AD2200202C
66830+:104F50008D2200200043102B1440000B3C023FFF29
66831+:104F60008D22002000431023AD2200209542005CDA
66832+:104F70003042FFFF0A0013AF00621821AD2000206D
66833+:104F8000006618213C023FFF3446FFFF00C3102B90
66834+:104F90005440000100C018213C02800834420080C7
66835+:104FA00000651821AC43001CA0400024A04000274D
66836+:104FB0000A0013FD3C038008104000403C038008B9
66837+:104FC0008D42003C004810231840003D34670080AB
66838+:104FD0009142002424420001A14200249142002475
66839+:104FE0003C0308008C630024304200FF0043102B78
66840+:104FF000144000708FBF00108D22001C00A21023EF
66841+:105000001840006C000000008D6300049542005CB5
66842+:10501000006818233042FFFF0003184300021040CD
66843+:105020000043102A10400005014020218D62000439
66844+:10503000004810230A0013E0000210439542005C70
66845+:105040003042FFFF000210403C068008AC82002C7A
66846+:1050500034C5008094A2005C8CA4002C94A3005C56
66847+:105060003042FFFF00021040008220213063FFFF2A
66848+:105070000083182101031021ACA2001C8CC2000483
66849+:1050800034C60100ACC2001C240200020E000F5EF8
66850+:10509000A0C2000C104000478FBF00103C028000EF
66851+:1050A0008C4401003C0380008C6201F80440FFFE48
66852+:1050B000240200020A00142D000000003467008062
66853+:1050C000ACE50038346601008CC2001C00A210233D
66854+:1050D0001840000224A2FFFCACC2001C3082000178
66855+:1050E0005040000A3C0380088CE2003C00A21023E0
66856+:1050F00004430014240400058C62000414A200037D
66857+:105100003C0380080A00141F240400058C6200047C
66858+:1051100014A200288FBF00103C0208008C4200D867
66859+:10512000304200201040000A3C02800834620080B7
66860+:10513000906300089042004C144300053C02800834
66861+:10514000240400048FBF00100A00110927BD0018B5
66862+:105150003443008034420100A040000C24020001CE
66863+:10516000A46200143C0280008C4401003C038000D7
66864+:105170008C6201F80440FFFE24020002AC6401C00E
66865+:10518000A06201C43C021000AC6201F80A00143BAA
66866+:105190008FBF00108FBF0010010030210A00115A8C
66867+:1051A00027BD0018010030210A00129927BD001800
66868+:1051B0008FBF001003E0000827BD00183C038008E3
66869+:1051C0003464010024020003A082000C8C620004FD
66870+:1051D00003E00008AC82001C3C05800834A300807A
66871+:1051E0009062002734A501002406004324420001F8
66872+:1051F000A0620027906300273C0208008C42004810
66873+:10520000306300FF146200043C07602194A500EAAB
66874+:105210000A00090130A5FFFF03E0000800000000BC
66875+:1052200027BDFFE8AFBF00103C0280000E00144411
66876+:105230008C4401803C02800834430100A060000CD3
66877+:105240008C4200048FBF001027BD001803E0000847
66878+:10525000AC62001C27BDFFE03C028008AFBF001815
66879+:10526000AFB10014AFB000103445008034460100E7
66880+:105270003C0880008D09014090C3000C8CA4003CC8
66881+:105280008CA200381482003B306700FF9502007C3E
66882+:1052900090A30027146000093045FFFF2402000599
66883+:1052A00054E200083C04800890C2000D2442000132
66884+:1052B000A0C2000D0A00147F3C048008A0C0000DAD
66885+:1052C0003C048008348201009042000C2403000555
66886+:1052D000304200FF1443000A24A205DC348300801E
66887+:1052E000906200272C4200075040000524A20A00CB
66888+:1052F00090630027240200140062100400A2102111
66889+:105300003C108008361000803045FFFF012020212E
66890+:105310000E001444A60500149602005C8E030038AB
66891+:105320003C1180003042FFFF000210400062182153
66892+:10533000AE03001C0E0003328E24014092020025B1
66893+:1053400034420040A20200250E00033D8E2401409D
66894+:105350008E2401403C0380008C6201F80440FFFE73
66895+:1053600024020002AC6401C0A06201C43C0210002F
66896+:10537000AC6201F88FBF00188FB100148FB000101D
66897+:1053800003E0000827BD00203C0360103C02080039
66898+:1053900024420174AC62502C8C6250003C048000AA
66899+:1053A00034420080AC6250003C0208002442547C2D
66900+:1053B0003C010800AC2256003C020800244254384C
66901+:1053C0003C010800AC2256043C020002AC840008F8
66902+:1053D000AC82000C03E000082402000100A0302190
66903+:1053E0003C1C0800279C56083C0200023C050400B7
66904+:1053F00000852826008220260004102B2CA5000101
66905+:105400002C840001000210803C0308002463560035
66906+:105410000085202500431821108000030000102182
66907+:10542000AC6600002402000103E000080000000058
66908+:105430003C1C0800279C56083C0200023C05040066
66909+:1054400000852826008220260004102B2CA50001B0
66910+:105450002C840001000210803C03080024635600E5
66911+:105460000085202500431821108000050000102130
66912+:105470003C02080024425438AC62000024020001BF
66913+:1054800003E00008000000003C0200023C030400AE
66914+:1054900000821026008318262C4200012C63000194
66915+:1054A000004310251040000B000028213C1C080080
66916+:1054B000279C56083C0380008C62000824050001EC
66917+:1054C00000431025AC6200088C62000C00441025DB
66918+:1054D000AC62000C03E0000800A010213C1C080096
66919+:1054E000279C56083C0580008CA3000C0004202754
66920+:1054F000240200010064182403E00008ACA3000C9F
66921+:105500003C020002148200063C0560008CA208D018
66922+:105510002403FFFE0043102403E00008ACA208D0DF
66923+:105520003C02040014820005000000008CA208D098
66924+:105530002403FFFD00431024ACA208D003E00008C0
66925+:10554000000000003C02601A344200108C430080CE
66926+:1055500027BDFFF88C440084AFA3000093A3000094
66927+:10556000240200041462001AAFA4000493A20001F4
66928+:105570001040000797A300023062FFFC3C0380004C
66929+:10558000004310218C4200000A001536AFA200042F
66930+:105590003062FFFC3C03800000431021AC4400005B
66931+:1055A000A3A000003C0560008CA208D02403FFFEED
66932+:1055B0003C04601A00431024ACA208D08FA300045E
66933+:1055C0008FA2000034840010AC830084AC82008081
66934+:1055D00003E0000827BD000827BDFFE8AFBF0010AB
66935+:1055E0003C1C0800279C56083C0280008C43000CA1
66936+:1055F0008C420004004318243C0200021060001496
66937+:10560000006228243C0204003C04000210A00005B3
66938+:10561000006210243C0208008C4256000A00155B10
66939+:1056200000000000104000073C0404003C02080099
66940+:105630008C4256040040F809000000000A00156082
66941+:10564000000000000000000D3C1C0800279C5608CC
66942+:105650008FBF001003E0000827BD0018800802403B
66943+:1056600080080100800800808008000000000C8095
66944+:105670000000320008000E9808000EF408000F88A1
66945+:1056800008001028080010748008010080080080BD
66946+:10569000800800000A000028000000000000000050
66947+:1056A0000000000D6370362E322E316200000000C3
66948+:1056B00006020104000000000000000000000000DD
66949+:1056C000000000000000000038003C000000000066
66950+:1056D00000000000000000000000000000000020AA
66951+:1056E00000000000000000000000000000000000BA
66952+:1056F00000000000000000000000000000000000AA
66953+:10570000000000000000000021003800000000013F
66954+:105710000000002B000000000000000400030D400A
66955+:105720000000000000000000000000000000000079
66956+:105730000000000000000000100000030000000056
66957+:105740000000000D0000000D3C020800244259AC8E
66958+:105750003C03080024635BF4AC4000000043202BB2
66959+:105760001480FFFD244200043C1D080037BD9FFC4F
66960+:1057700003A0F0213C100800261000A03C1C0800EB
66961+:10578000279C59AC0E0002F6000000000000000D3E
66962+:1057900027BDFFB4AFA10000AFA20004AFA3000873
66963+:1057A000AFA4000CAFA50010AFA60014AFA700185F
66964+:1057B000AFA8001CAFA90020AFAA0024AFAB0028FF
66965+:1057C000AFAC002CAFAD0030AFAE0034AFAF00389F
66966+:1057D000AFB8003CAFB90040AFBC0044AFBF004819
66967+:1057E0000E000820000000008FBF00488FBC00445E
66968+:1057F0008FB900408FB8003C8FAF00388FAE0034B7
66969+:105800008FAD00308FAC002C8FAB00288FAA002406
66970+:105810008FA900208FA8001C8FA700188FA6001446
66971+:105820008FA500108FA4000C8FA300088FA2000486
66972+:105830008FA1000027BD004C3C1B60188F7A5030B0
66973+:10584000377B502803400008AF7A000000A01821E1
66974+:1058500000801021008028213C0460003C0760008B
66975+:105860002406000810600006348420788C42000072
66976+:10587000ACE220088C63000003E00008ACE3200CDD
66977+:105880000A000F8100000000240300403C02600079
66978+:1058900003E00008AC4320003C0760008F86000452
66979+:1058A0008CE520740086102100A2182B14600007DC
66980+:1058B000000028218F8AFDA024050001A1440013C7
66981+:1058C0008F89000401244021AF88000403E0000810
66982+:1058D00000A010218F84FDA08F8500049086001306
66983+:1058E00030C300FF00A31023AF82000403E00008D0
66984+:1058F000A08000138F84FDA027BDFFE8AFB000108B
66985+:10590000AFBF001490890011908700112402002875
66986+:10591000312800FF3906002830E300FF2485002CE1
66987+:105920002CD00001106200162484001C0E00006EB2
66988+:10593000000000008F8FFDA03C05600024020204DF
66989+:1059400095EE003E95ED003C000E5C0031ACFFFF93
66990+:10595000016C5025ACAA2010520000012402000462
66991+:10596000ACA22000000000000000000000000000C9
66992+:105970008FBF00148FB0001003E0000827BD00188F
66993+:105980000A0000A6000028218F85FDA027BDFFD8B2
66994+:10599000AFBF0020AFB3001CAFB20018AFB100140E
66995+:1059A000AFB000100080982190A4001124B0001C1A
66996+:1059B00024B1002C308300FF386200280E000090D4
66997+:1059C0002C5200010E00009800000000020020216F
66998+:1059D0001240000202202821000028210E00006E43
66999+:1059E000000000008F8DFDA03C0880003C05600099
67000+:1059F00095AC003E95AB003C02683025000C4C0095
67001+:105A0000316AFFFF012A3825ACA7201024020202C8
67002+:105A1000ACA6201452400001240200028FBF0020D7
67003+:105A20008FB3001C8FB200188FB100148FB000101C
67004+:105A300027BD002803E00008ACA2200027BDFFE03E
67005+:105A4000AFB20018AFB10014AFB00010AFBF001C70
67006+:105A50003C1160008E2320748F82000430D0FFFF41
67007+:105A600030F2FFFF1062000C2406008F0E00006E63
67008+:105A7000000000003C06801F0010440034C5FF00F9
67009+:105A80000112382524040002AE2720100000302126
67010+:105A9000AE252014AE2420008FBF001C8FB200184A
67011+:105AA0008FB100148FB0001000C0102103E0000877
67012+:105AB00027BD002027BDFFE0AFB0001030D0FFFFB2
67013+:105AC000AFBF0018AFB100140E00006E30F1FFFF41
67014+:105AD00000102400009180253C036000AC70201071
67015+:105AE0008FBF00188FB100148FB000102402000483
67016+:105AF000AC62200027BD002003E000080000102158
67017+:105B000027BDFFE03C046018AFBF0018AFB1001420
67018+:105B1000AFB000108C8850002403FF7F34028071E6
67019+:105B20000103382434E5380C241F00313C1980006F
67020+:105B3000AC8550003C11800AAC8253BCAF3F0008DA
67021+:105B40000E00054CAF9100400E00050A3C116000AC
67022+:105B50000E00007D000000008E3008083C0F570941
67023+:105B60002418FFF00218602435EEE00035EDF00057
67024+:105B7000018E5026018D58262D4600012D69000109
67025+:105B8000AF86004C0E000D09AF8900503C06601630
67026+:105B90008CC700003C0860148D0500A03C03FFFF8B
67027+:105BA00000E320243C02535300052FC2108200550D
67028+:105BB00034D07C00960201F2A780006C10400003F4
67029+:105BC000A780007C384B1E1EA78B006C960201F844
67030+:105BD000104000048F8D0050384C1E1EA78C007C96
67031+:105BE0008F8D005011A000058F83004C240E0020E3
67032+:105BF000A78E007CA78E006C8F83004C1060000580
67033+:105C00009785007C240F0020A78F007CA78F006C55
67034+:105C10009785007C2CB8008153000001240500808A
67035+:105C20009784006C2C91040152200001240404008C
67036+:105C30001060000B3C0260008FBF00188FB1001491
67037+:105C40008FB0001027BD0020A784006CA785007CC2
67038+:105C5000A380007EA780007403E00008A780009264
67039+:105C60008C4704382419103C30FFFFFF13F9000360
67040+:105C700030A8FFFF1100004624030050A380007EDF
67041+:105C80009386007E50C00024A785007CA780007CFE
67042+:105C90009798007CA780006CA7800074A780009272
67043+:105CA0003C010800AC3800800E00078700000000AF
67044+:105CB0003C0F60008DED0808240EFFF03C0B600ED9
67045+:105CC000260C0388356A00100000482100002821B6
67046+:105CD00001AE20243C105709AF8C0010AF8A004859
67047+:105CE000AF89001810900023AF8500148FBF0018F3
67048+:105CF0008FB100148FB0001027BD002003E0000812
67049+:105D0000AF80005400055080014648218D260004D4
67050+:105D10000A00014800D180219798007CA784006C7C
67051+:105D2000A7800074A78000923C010800AC38008076
67052+:105D30000E000787000000003C0F60008DED080892
67053+:105D4000240EFFF03C0B600E260C0388356A001011
67054+:105D5000000048210000282101AE20243C105709F2
67055+:105D6000AF8C0010AF8A0048AF8900181490FFDF95
67056+:105D7000AF85001424110001AF9100548FBF0018AB
67057+:105D80008FB100148FB0001003E0000827BD002081
67058+:105D90000A00017BA383007E3083FFFF8F880040D1
67059+:105DA0008F87003C000321403C0580003C020050EE
67060+:105DB000008248253C0660003C0A010034AC040027
67061+:105DC0008CCD08E001AA58241160000500000000F5
67062+:105DD0008CCF08E024E7000101EA7025ACCE08E092
67063+:105DE0008D19001001805821ACB900388D180014AD
67064+:105DF000ACB8003CACA9003000000000000000007E
67065+:105E00000000000000000000000000000000000092
67066+:105E100000000000000000003C0380008C640000D3
67067+:105E2000308200201040FFFD3C0F60008DED08E047
67068+:105E30003C0E010001AE18241460FFE100000000D8
67069+:105E4000AF87003C03E00008AF8B00588F8500400F
67070+:105E5000240BFFF03C06800094A7001A8CA90024B4
67071+:105E600030ECFFFF000C38C000EB5024012A402129
67072+:105E7000ACC8003C8CA400248CC3003C00831023DD
67073+:105E800018400033000000008CAD002025A2000166
67074+:105E90003C0F0050ACC2003835EE00103C068000CC
67075+:105EA000ACCE003000000000000000000000000048
67076+:105EB00000000000000000000000000000000000E2
67077+:105EC000000000003C0480008C9900003338002062
67078+:105ED0001300FFFD30E20008104000173C0980006D
67079+:105EE0008C880408ACA800108C83040CACA30014AC
67080+:105EF0003C1900203C188000AF19003094AE001807
67081+:105F000094AF001C01CF3021A4A6001894AD001A54
67082+:105F100025A70001A4A7001A94AB001A94AC001E98
67083+:105F2000118B00030000000003E0000800000000E7
67084+:105F300003E00008A4A0001A8D2A0400ACAA0010F7
67085+:105F40008D240404ACA400140A0002183C1900209B
67086+:105F50008CA200200A0002003C0F00500A0001EE53
67087+:105F60000000000027BDFFE8AFBF00100E000232A6
67088+:105F7000000000008F8900408FBF00103C038000AC
67089+:105F8000A520000A9528000A9527000427BD0018BF
67090+:105F90003105FFFF30E6000F0006150000A22025A6
67091+:105FA00003E00008AC6400803C0508008CA50020DC
67092+:105FB0008F83000C27BDFFE8AFB00010AFBF001407
67093+:105FC00010A300100000802124040001020430040A
67094+:105FD00000A6202400C3102450440006261000010F
67095+:105FE000001018802787FDA41480000A006718217C
67096+:105FF000261000012E0900025520FFF38F83000CAC
67097+:10600000AF85000C8FBF00148FB0001003E00008B4
67098+:1060100027BD00188C6800003C058000ACA8002457
67099+:106020000E000234261000013C0508008CA500205B
67100+:106030000A0002592E0900022405000100851804F7
67101+:106040003C0408008C84002027BDFFC8AFBF00348B
67102+:1060500000831024AFBE0030AFB7002CAFB60028CD
67103+:10606000AFB50024AFB40020AFB3001CAFB200182E
67104+:10607000AFB1001410400051AFB000108F84004049
67105+:10608000948700069488000A00E8302330D5FFFF8B
67106+:1060900012A0004B8FBF0034948B0018948C000A20
67107+:1060A000016C50233142FFFF02A2482B1520000251
67108+:1060B00002A02021004020212C8F000515E00002C5
67109+:1060C00000809821241300040E0001C102602021E9
67110+:1060D0008F87004002609021AF80004494F4000A52
67111+:1060E000026080211260004E3291FFFF3C1670006A
67112+:1060F0003C1440003C1E20003C1760008F99005863
67113+:106100008F380000031618241074004F0283F82BF8
67114+:1061100017E0003600000000107E00478F86004424
67115+:1061200014C0003A2403000102031023022320219B
67116+:106130003050FFFF1600FFF13091FFFF8F870040C6
67117+:106140003C1100203C108000AE11003094EB000A9E
67118+:106150003C178000024B5021A4EA000A94E9000A8F
67119+:1061600094E800043123FFFF3106000F00062D00E4
67120+:106170000065F025AEFE008094F3000A94F6001846
67121+:1061800012D30036001221408CFF00148CF4001052
67122+:1061900003E468210000C02101A4782B029870213B
67123+:1061A00001CF6021ACED0014ACEC001002B238233A
67124+:1061B00030F5FFFF16A0FFB88F8400408FBF00347A
67125+:1061C0008FBE00308FB7002C8FB600288FB500240B
67126+:1061D0008FB400208FB3001C8FB200188FB1001451
67127+:1061E0008FB0001003E0000827BD00381477FFCC03
67128+:1061F0008F8600440E000EE202002021004018218C
67129+:106200008F86004410C0FFC9020310230270702360
67130+:106210008F87004001C368210A0002E431B2FFFF0A
67131+:106220008F86004414C0FFC93C1100203C10800040
67132+:106230000A0002AEAE1100300E00046602002021FA
67133+:106240000A0002DB00401821020020210E0009395B
67134+:10625000022028210A0002DB004018210E0001EE76
67135+:10626000000000000A0002C702B2382327BDFFC8A1
67136+:10627000AFB7002CAFB60028AFB50024AFB40020F4
67137+:10628000AFB3001CAFB20018AFB10014AFB0001034
67138+:10629000AFBF00300E00011B241300013C047FFF40
67139+:1062A0003C0380083C0220003C010800AC20007048
67140+:1062B0003496FFFF34770080345200033C1512C03F
67141+:1062C000241400013C1080002411FF800E000245C0
67142+:1062D000000000008F8700488F8B00188F89001402
67143+:1062E0008CEA00EC8CE800E8014B302B01092823F4
67144+:1062F00000A6102314400006014B18231440000E82
67145+:106300003C05800002A3602B1180000B0000000000
67146+:106310003C0560008CEE00EC8CED00E88CA4180CC1
67147+:10632000AF8E001804800053AF8D00148F8F0010C3
67148+:10633000ADF400003C0580008CBF00003BF900017B
67149+:10634000333800011700FFE13C0380008C6201003C
67150+:1063500024060C0010460009000000008C680100B3
67151+:106360002D043080548000103C0480008C690100B2
67152+:106370002D2331811060000C3C0480008CAA0100A8
67153+:1063800011460004000020218CA6010024C5FF81D5
67154+:1063900030A400FF8E0B01000E000269AE0B00243A
67155+:1063A0000A00034F3C0480008C8D01002DAC3300AB
67156+:1063B00011800022000000003C0708008CE70098D4
67157+:1063C00024EE00013C010800AC2E00983C04800043
67158+:1063D0008C8201001440000300000000566000148D
67159+:1063E0003C0440008C9F01008C9801000000982123
67160+:1063F00003F1C82400193940330F007F00EF7025E6
67161+:1064000001D26825AC8D08308C8C01008C85010090
67162+:10641000258B0100017130240006514030A3007F1C
67163+:106420000143482501324025AC8808303C04400037
67164+:10643000AE0401380A00030E000000008C99010030
67165+:10644000240F0020AC99002092F80000330300FFD5
67166+:10645000106F000C241F0050547FFFDD3C048000AF
67167+:106460008C8401000E00154E000000000A00034F4E
67168+:106470003C04800000963824ACA7180C0A000327BF
67169+:106480008F8F00108C8501000E0008F72404008017
67170+:106490000A00034F3C04800000A4102B24030001D9
67171+:1064A00010400009000030210005284000A4102BF6
67172+:1064B00004A00003000318405440FFFC00052840DE
67173+:1064C0005060000A0004182B0085382B54E00004AB
67174+:1064D0000003184200C33025008520230003184222
67175+:1064E0001460FFF9000528420004182B03E000089F
67176+:1064F00000C310213084FFFF30C600FF3C0780003E
67177+:106500008CE201B80440FFFE00064C000124302557
67178+:106510003C08200000C820253C031000ACE00180AE
67179+:10652000ACE50184ACE4018803E00008ACE301B809
67180+:106530003C0660008CC5201C2402FFF03083020062
67181+:10654000308601001060000E00A2282434A500014E
67182+:106550003087300010E0000530830C0034A50004C3
67183+:106560003C04600003E00008AC85201C1060FFFDC7
67184+:106570003C04600034A5000803E00008AC85201C42
67185+:1065800054C0FFF334A500020A0003B03087300086
67186+:1065900027BDFFE8AFB00010AFBF00143C0760009C
67187+:1065A000240600021080001100A080218F83005873
67188+:1065B0000E0003A78C6400188F8200580000202171
67189+:1065C000240600018C45000C0E000398000000001A
67190+:1065D0001600000224020003000010218FBF0014E7
67191+:1065E0008FB0001003E0000827BD00188CE8201CC5
67192+:1065F0002409FFF001092824ACE5201C8F870058EE
67193+:106600000A0003CD8CE5000C3C02600E00804021A6
67194+:1066100034460100240900180000000000000000BA
67195+:10662000000000003C0A00503C0380003547020097
67196+:10663000AC68003834640400AC65003CAC670030E2
67197+:106640008C6C0000318B00201160FFFD2407FFFFE0
67198+:106650002403007F8C8D00002463FFFF248400044A
67199+:10666000ACCD00001467FFFB24C60004000000004E
67200+:10667000000000000000000024A402000085282B78
67201+:106680003C0300203C0E80002529FFFF010540212E
67202+:10669000ADC300301520FFE00080282103E0000892
67203+:1066A000000000008F82005827BDFFD8AFB3001C48
67204+:1066B000AFBF0020AFB20018AFB10014AFB00010F0
67205+:1066C00094460002008098218C5200182CC300814F
67206+:1066D0008C4800048C4700088C51000C8C49001039
67207+:1066E000106000078C4A00142CC4000414800013AE
67208+:1066F00030EB000730C5000310A0001000000000C0
67209+:106700002410008B02002021022028210E00039873
67210+:10671000240600031660000224020003000010217A
67211+:106720008FBF00208FB3001C8FB200188FB10014F0
67212+:106730008FB0001003E0000827BD00281560FFF1AE
67213+:106740002410008B3C0C80003C030020241F00011F
67214+:10675000AD830030AF9F0044000000000000000047
67215+:10676000000000002419FFF024D8000F031978243A
67216+:106770003C1000D0AD88003801F0702524CD000316
67217+:106780003C08600EAD87003C35850400AD8E0030BE
67218+:10679000000D38823504003C3C0380008C6B000007
67219+:1067A000316200201040FFFD0000000010E00008F2
67220+:1067B00024E3FFFF2407FFFF8CA800002463FFFFF2
67221+:1067C00024A50004AC8800001467FFFB24840004A7
67222+:1067D0003C05600EACA60038000000000000000080
67223+:1067E000000000008F8600543C0400203C0780001D
67224+:1067F000ACE4003054C000060120202102402021DA
67225+:106800000E0003A7000080210A00041D02002021C1
67226+:106810000E0003DD01402821024020210E0003A7C5
67227+:10682000000080210A00041D0200202127BDFFE096
67228+:10683000AFB200183092FFFFAFB10014AFBF001C21
67229+:10684000AFB000101640000D000088210A0004932C
67230+:106850000220102124050003508500278CE5000C40
67231+:106860000000000D262800013111FFFF24E2002066
67232+:106870000232802B12000019AF8200588F82004430
67233+:10688000144000168F8700583C0670003C0320001F
67234+:106890008CE5000000A62024148300108F84006083
67235+:1068A000000544023C09800000A980241480FFE90F
67236+:1068B000310600FF2CCA000B5140FFEB26280001D7
67237+:1068C000000668803C0E080025CE575801AE6021B6
67238+:1068D0008D8B0000016000080000000002201021E4
67239+:1068E0008FBF001C8FB200188FB100148FB0001042
67240+:1068F00003E0000827BD00200E0003982404008454
67241+:106900001600FFD88F8700580A000474AF8000601B
67242+:10691000020028210E0003BF240400018F870058C5
67243+:106920000A000474AF820060020028210E0003BF39
67244+:10693000000020210A0004A38F8700580E000404E1
67245+:10694000020020218F8700580A000474AF82006083
67246+:1069500030AFFFFF000F19C03C0480008C9001B8DD
67247+:106960000600FFFE3C1920043C181000AC83018097
67248+:10697000AC800184AC990188AC9801B80A00047518
67249+:106980002628000190E2000390E30002000020218D
67250+:106990000002FE0000033A0000FF2825240600083C
67251+:1069A0000E000398000000001600FFDC2402000324
67252+:1069B0008F870058000010210A000474AF82006025
67253+:1069C00090E8000200002021240600090A0004C308
67254+:1069D00000082E0090E4000C240900FF308500FF21
67255+:1069E00010A900150000302190F9000290F8000372
67256+:1069F000308F00FF94EB000400196E000018740043
67257+:106A0000000F62000186202501AE5025014B28258C
67258+:106A10003084FF8B0A0004C32406000A90E30002BE
67259+:106A200090FF0004000020210003360000DF28252D
67260+:106A30000A0004C32406000B0A0004D52406008BB8
67261+:106A4000000449C23127003F000443423C02800059
67262+:106A500000082040240316802CE60020AC43002CC4
67263+:106A600024EAFFE02482000114C0000330A900FFE3
67264+:106A700000801021314700FF000260803C0D800043
67265+:106A8000240A0001018D20213C0B000E00EA28049D
67266+:106A9000008B302111200005000538278CCE000026
67267+:106AA00001C5382503E00008ACC700008CD8000001
67268+:106AB0000307782403E00008ACCF000027BDFFE007
67269+:106AC000AFB10014AFB00010AFBF00183C076000BA
67270+:106AD0008CE408083402F0003C1160003083F000C0
67271+:106AE000240501C03C04800E000030211062000625
67272+:106AF000241000018CEA08083149F0003928E00030
67273+:106B00000008382B000780403C0D0200AE2D081411
67274+:106B1000240C16803C0B80008E2744000E000F8B47
67275+:106B2000AD6C002C120000043C02169124050001FB
67276+:106B3000120500103C023D2C345800E0AE384408E9
67277+:106B40003C1108008E31007C8FBF00183C066000AD
67278+:106B500000118540360F16808FB100148FB00010E1
67279+:106B60003C0E020027BD0020ACCF442003E000080B
67280+:106B7000ACCE08103C0218DA345800E0AE384408B5
67281+:106B80003C1108008E31007C8FBF00183C0660006D
67282+:106B900000118540360F16808FB100148FB00010A1
67283+:106BA0003C0E020027BD0020ACCF442003E00008CB
67284+:106BB000ACCE08100A0004EB240500010A0004EB27
67285+:106BC0000000282124020400A7820024A780001CC2
67286+:106BD000000020213C06080024C65A582405FFFF67
67287+:106BE00024890001000440803124FFFF01061821A0
67288+:106BF0002C87002014E0FFFAAC6500002404040098
67289+:106C0000A7840026A780001E000020213C06080063
67290+:106C100024C65AD82405FFFF248D0001000460809B
67291+:106C200031A4FFFF018658212C8A00201540FFFA6D
67292+:106C3000AD650000A7800028A7800020A780002263
67293+:106C4000000020213C06080024C65B582405FFFFF5
67294+:106C5000249900010004C0803324FFFF030678213B
67295+:106C60002C8E000415C0FFFAADE500003C05600065
67296+:106C70008CA73D002403E08F00E31024344601403C
67297+:106C800003E00008ACA63D002487007F000731C266
67298+:106C900024C5FFFF000518C2246400013082FFFFF5
67299+:106CA000000238C0A78400303C010800AC27003047
67300+:106CB000AF80002C0000282100002021000030219E
67301+:106CC0002489000100A728213124FFFF2CA81701E7
67302+:106CD000110000032C8300801460FFF924C600011A
67303+:106CE00000C02821AF86002C10C0001DA786002AF6
67304+:106CF00024CAFFFF000A11423C08080025085B581F
67305+:106D00001040000A00002021004030212407FFFF2E
67306+:106D1000248E00010004688031C4FFFF01A86021B7
67307+:106D20000086582B1560FFFAAD87000030A2001FC7
67308+:106D30005040000800043080240300010043C804D0
67309+:106D400000041080004878212738FFFF03E0000886
67310+:106D5000ADF8000000C820212405FFFFAC8500002D
67311+:106D600003E000080000000030A5FFFF30C6FFFF71
67312+:106D700030A8001F0080602130E700FF0005294295
67313+:106D80000000502110C0001D24090001240B000147
67314+:106D900025180001010B2004330800FF0126782686
67315+:106DA000390E00202DED00012DC2000101A2182591
67316+:106DB0001060000D014450250005C880032C4021BF
67317+:106DC0000100182110E0000F000A20278D040000A8
67318+:106DD000008A1825AD03000024AD00010000402109
67319+:106DE0000000502131A5FFFF252E000131C9FFFF12
67320+:106DF00000C9102B1040FFE72518000103E0000830
67321+:106E0000000000008D0A0000014440240A0005D162
67322+:106E1000AC68000027BDFFE830A5FFFF30C6FFFFCC
67323+:106E2000AFB00010AFBF001430E7FFFF00005021EB
67324+:106E30003410FFFF0000602124AF001F00C0482174
67325+:106E4000241800012419002005E0001601E010219B
67326+:106E50000002F943019F682A0009702B01AE40240B
67327+:106E600011000017000C18800064102110E00005CC
67328+:106E70008C4B000000F840040008382301675824B8
67329+:106E800000003821154000410000402155600016E7
67330+:106E90003169FFFF258B0001316CFFFF05E1FFEC3D
67331+:106EA00001E0102124A2003E0002F943019F682A5C
67332+:106EB0000009702B01AE40241500FFEB000C188078
67333+:106EC000154600053402FFFF020028210E0005B51B
67334+:106ED00000003821020010218FBF00148FB0001075
67335+:106EE00003E0000827BD00181520000301601821E9
67336+:106EF000000B1C0224080010306A00FF154000053A
67337+:106F0000306E000F250D000800031A0231A800FFA3
67338+:106F1000306E000F15C00005307F000325100004FF
67339+:106F200000031902320800FF307F000317E000055C
67340+:106F3000386900012502000200031882304800FF72
67341+:106F4000386900013123000110600004310300FFA3
67342+:106F5000250A0001314800FF310300FF000C6940A1
67343+:106F600001A34021240A000110CAFFD53110FFFF00
67344+:106F7000246E000131C800FF1119FFC638C9000195
67345+:106F80002D1F002053E0001C258B0001240D000163
67346+:106F90000A000648240E002051460017258B0001E8
67347+:106FA00025090001312800FF2D0900205120001281
67348+:106FB000258B000125430001010D5004014B1024D5
67349+:106FC000250900011440FFF4306AFFFF3127FFFF5D
67350+:106FD00010EE000C2582FFFF304CFFFF0000502117
67351+:106FE0003410FFFF312800FF2D0900205520FFF24B
67352+:106FF00025430001258B0001014648260A000602B0
67353+:10700000316CFFFF00003821000050210A000654B7
67354+:107010003410FFFF27BDFFD8AFB0001030F0FFFFE6
67355+:10702000AFB10014001039423211FFE000071080A8
67356+:10703000AFB3001C00B1282330D3FFFFAFB200185C
67357+:1070400030A5FFFF00809021026030210044202104
67358+:10705000AFBF00200E0005E03207001F022288218A
67359+:107060003403FFFF0240202102002821026030216A
67360+:1070700000003821104300093231FFFF02201021A7
67361+:107080008FBF00208FB3001C8FB200188FB1001487
67362+:107090008FB0001003E0000827BD00280E0005E0B7
67363+:1070A0000000000000408821022010218FBF002036
67364+:1070B0008FB3001C8FB200188FB100148FB0001076
67365+:1070C00003E0000827BD0028000424003C03600002
67366+:1070D000AC603D0810A00002348210063482101605
67367+:1070E00003E00008AC623D0427BDFFE0AFB0001034
67368+:1070F000309000FF2E020006AFBF001810400008BD
67369+:10710000AFB10014001030803C03080024635784A2
67370+:1071100000C328218CA400000080000800000000AB
67371+:10712000000020218FBF00188FB100148FB0001015
67372+:107130000080102103E0000827BD00209791002A5D
67373+:1071400016200051000020213C020800904200332C
67374+:107150000A0006BB00000000978D002615A0003134
67375+:10716000000020210A0006BB2402000897870024A3
67376+:1071700014E0001A00001821006020212402000100
67377+:107180001080FFE98FBF0018000429C2004530219C
67378+:1071900000A6582B1160FFE43C0880003C0720004B
67379+:1071A000000569C001A76025AD0C00203C038008E4
67380+:1071B0002402001F2442FFFFAC6000000441FFFDD9
67381+:1071C0002463000424A5000100A6702B15C0FFF560
67382+:1071D000000569C00A0006A58FBF00189787001C2C
67383+:1071E0003C04080024845A58240504000E0006605C
67384+:1071F00024060001978B002424440001308AFFFFFD
67385+:107200002569FFFF2D48040000402821150000409B
67386+:10721000A789002424AC3800000C19C00A0006B964
67387+:10722000A780001C9787001E3C04080024845AD8BD
67388+:10723000240504000E00066024060001979900262C
67389+:10724000244400013098FFFF272FFFFF2F0E04007A
67390+:107250000040882115C0002CA78F0026A780001EA3
67391+:107260003A020003262401003084FFFF0E00068D41
67392+:107270002C4500010011F8C027F00100001021C0CA
67393+:107280000A0006BB240200089785002E978700227B
67394+:107290003C04080024845B580E00066024060001AC
67395+:1072A0009787002A8F89002C2445000130A8FFFF12
67396+:1072B00024E3FFFF0109302B0040802114C0001897
67397+:1072C000A783002AA7800022978500300E000F7543
67398+:1072D00002002021244A05003144FFFF0E00068DE4
67399+:1072E000240500013C05080094A500320E000F752E
67400+:1072F00002002021244521003C0208009042003376
67401+:107300000A0006BB000521C00A0006F3A784001E80
67402+:1073100024AC3800000C19C00A0006B9A784001C70
67403+:107320000A00070DA7850022308400FF27BDFFE873
67404+:107330002C820006AFBF0014AFB000101040001543
67405+:1073400000A03821000440803C0308002463579CBF
67406+:10735000010328218CA40000008000080000000028
67407+:1073600024CC007F000751C2000C59C23170FFFFCE
67408+:107370002547C40030E5FFFF2784001C02003021B0
67409+:107380000E0005B52407000197860028020620217B
67410+:10739000A78400288FBF00148FB0001003E00008FE
67411+:1073A00027BD00183C0508008CA50030000779C2F5
67412+:1073B0000E00038125E4DF003045FFFF3C04080098
67413+:1073C00024845B58240600010E0005B52407000143
67414+:1073D000978E002A8FBF00148FB0001025CD0001BA
67415+:1073E00027BD001803E00008A78D002A0007C9C2C6
67416+:1073F0002738FF00001878C231F0FFFF3C04080076
67417+:1074000024845AD802002821240600010E0005B564
67418+:1074100024070001978D0026260E0100000E84002F
67419+:1074200025AC00013C0B6000A78C0026AD603D0838
67420+:1074300036040006000030213C0760008CE23D0469
67421+:10744000305F000617E0FFFD24C9000100061B00A5
67422+:10745000312600FF006440252CC50004ACE83D0443
67423+:1074600014A0FFF68FBF00148FB0001003E00008D7
67424+:1074700027BD0018000751C22549C8002406000195
67425+:10748000240700013C04080024845A580E0005B566
67426+:107490003125FFFF978700248FBF00148FB00010A5
67427+:1074A00024E6000127BD001803E00008A786002499
67428+:1074B0003C0660183C090800252900FCACC9502C8A
67429+:1074C0008CC850003C0580003C020002350700805B
67430+:1074D000ACC750003C04080024841FE03C030800B3
67431+:1074E00024631F98ACA50008ACA2000C3C01080066
67432+:1074F000AC2459A43C010800AC2359A803E00008BF
67433+:107500002402000100A030213C1C0800279C59AC3B
67434+:107510003C0C04003C0B0002008B3826008C4026FB
67435+:107520002CE200010007502B2D050001000A4880C5
67436+:107530003C030800246359A4004520250123182199
67437+:107540001080000300001021AC660000240200013E
67438+:1075500003E00008000000003C1C0800279C59AC18
67439+:107560003C0B04003C0A0002008A3026008B3826BF
67440+:107570002CC200010006482B2CE5000100094080C8
67441+:107580003C030800246359A4004520250103182169
67442+:1075900010800005000010213C0C0800258C1F986D
67443+:1075A000AC6C00002402000103E0000800000000B1
67444+:1075B0003C0900023C080400008830260089382677
67445+:1075C0002CC30001008028212CE400010083102539
67446+:1075D0001040000B000030213C1C0800279C59ACD7
67447+:1075E0003C0A80008D4E00082406000101CA68256F
67448+:1075F000AD4D00088D4C000C01855825AD4B000C9D
67449+:1076000003E0000800C010213C1C0800279C59AC76
67450+:107610003C0580008CA6000C0004202724020001F9
67451+:1076200000C4182403E00008ACA3000C3C020002D4
67452+:107630001082000B3C0560003C070400108700032B
67453+:107640000000000003E00008000000008CA908D042
67454+:10765000240AFFFD012A402403E00008ACA808D05A
67455+:107660008CA408D02406FFFE0086182403E000083E
67456+:10767000ACA308D03C05601A34A600108CC300806F
67457+:1076800027BDFFF88CC50084AFA3000093A40000C1
67458+:107690002402001010820003AFA5000403E00008DC
67459+:1076A00027BD000893A7000114E0001497AC000266
67460+:1076B00097B800023C0F8000330EFFFC01CF682119
67461+:1076C000ADA50000A3A000003C0660008CC708D058
67462+:1076D0002408FFFE3C04601A00E82824ACC508D04A
67463+:1076E0008FA300048FA200003499001027BD00086A
67464+:1076F000AF22008003E00008AF2300843C0B800031
67465+:10770000318AFFFC014B48218D2800000A00080C3B
67466+:10771000AFA8000427BDFFE8AFBF00103C1C080065
67467+:10772000279C59AC3C0580008CA4000C8CA2000462
67468+:107730003C0300020044282410A0000A00A31824DF
67469+:107740003C0604003C0400021460000900A610245A
67470+:107750001440000F3C0404000000000D3C1C080015
67471+:10776000279C59AC8FBF001003E0000827BD00180C
67472+:107770003C0208008C4259A40040F80900000000B7
67473+:107780003C1C0800279C59AC0A0008358FBF00102C
67474+:107790003C0208008C4259A80040F8090000000093
67475+:1077A0000A00083B000000003C0880008D0201B880
67476+:1077B0000440FFFE35090180AD2400003C031000A9
67477+:1077C00024040040AD250004A1240008A1260009DE
67478+:1077D000A527000A03E00008AD0301B83084FFFFCD
67479+:1077E0000080382130A5FFFF000020210A00084555
67480+:1077F000240600803087FFFF8CA400002406003898
67481+:107800000A000845000028218F8300788F860070C9
67482+:107810001066000B008040213C07080024E75B68ED
67483+:10782000000328C000A710218C440000246300013D
67484+:10783000108800053063000F5466FFFA000328C06B
67485+:1078400003E00008000010213C07080024E75B6CFF
67486+:1078500000A7302103E000088CC200003C03900028
67487+:1078600034620001008220253C038000AC640020CB
67488+:107870008C65002004A0FFFE0000000003E000086B
67489+:10788000000000003C0280003443000100832025FA
67490+:1078900003E00008AC44002027BDFFE0AFB10014B6
67491+:1078A0003091FFFFAFB00010AFBF001812200013DF
67492+:1078B00000A080218CA20000240400022406020003
67493+:1078C0001040000F004028210E0007250000000096
67494+:1078D00000001021AE000000022038218FBF0018E8
67495+:1078E0008FB100148FB0001000402021000028212B
67496+:1078F000000030210A00084527BD00208CA20000AE
67497+:10790000022038218FBF00188FB100148FB00010F3
67498+:107910000040202100002821000030210A000845F5
67499+:1079200027BD002000A010213087FFFF8CA5000498
67500+:107930008C4400000A000845240600068F83FD9C45
67501+:1079400027BDFFE8AFBF0014AFB00010906700087C
67502+:10795000008010210080282130E600400000202116
67503+:1079600010C000088C5000000E0000BD0200202155
67504+:10797000020020218FBF00148FB000100A000548BC
67505+:1079800027BD00180E0008A4000000000E0000BD76
67506+:1079900002002021020020218FBF00148FB00010B0
67507+:1079A0000A00054827BD001827BDFFE0AFB0001052
67508+:1079B0008F90FD9CAFBF001CAFB20018AFB1001498
67509+:1079C00092060001008088210E00087230D2000467
67510+:1079D00092040005001129C2A6050000348300406E
67511+:1079E000A20300050E00087C022020210E00054A9B
67512+:1079F0000220202124020001AE02000C02202821D6
67513+:107A0000A602001024040002A602001224060200AE
67514+:107A1000A60200140E000725A60200161640000F4D
67515+:107A20008FBF001C978C00743C0B08008D6B007896
67516+:107A30002588FFFF3109FFFF256A0001012A382B45
67517+:107A400010E00006A78800743C0F6006240E0016A4
67518+:107A500035ED0010ADAE00508FBF001C8FB2001886
67519+:107A60008FB100148FB0001003E0000827BD002084
67520+:107A700027BDFFE0AFB10014AFBF0018AFB00010DA
67521+:107A80001080000400A088212402008010820007DA
67522+:107A9000000000000000000D8FBF00188FB100141F
67523+:107AA0008FB0001003E0000827BD00200E00087210
67524+:107AB00000A020218F86FD9C0220202190C500057A
67525+:107AC0000E00087C30B000FF2403003E1603FFF1D7
67526+:107AD0003C0680008CC401780480FFFE34C801405D
67527+:107AE000240900073C071000AD11000002202021EE
67528+:107AF000A10900048FBF00188FB100148FB00010CF
67529+:107B0000ACC701780A0008C527BD002027BDFFE0EB
67530+:107B1000AFB00010AFBF0018AFB100143C10800030
67531+:107B20008E110020000000000E00054AAE04002067
67532+:107B3000AE1100208FBF00188FB100148FB000105D
67533+:107B400003E0000827BD00203084FFFF00803821BB
67534+:107B50002406003500A020210A0008450000282145
67535+:107B60003084FFFF008038212406003600A0202149
67536+:107B70000A0008450000282127BDFFD0AFB500242A
67537+:107B80003095FFFFAFB60028AFB40020AFBF002C88
67538+:107B9000AFB3001CAFB20018AFB10014AFB000100B
67539+:107BA00030B6FFFF12A000270000A0218F920058DE
67540+:107BB0008E4300003C0680002402004000033E0289
67541+:107BC00000032C0230E4007F006698241482001D1C
67542+:107BD00030A500FF8F8300682C68000A1100001098
67543+:107BE0008F8D0044000358803C0C0800258C57B84A
67544+:107BF000016C50218D4900000120000800000000A8
67545+:107C000002D4302130C5FFFF0E0008522404008446
67546+:107C1000166000028F920058AF8000688F8D00447C
67547+:107C20002659002026980001032090213314FFFFDD
67548+:107C300015A00004AF9900580295202B1480FFDC9A
67549+:107C400000000000028010218FBF002C8FB600289A
67550+:107C50008FB500248FB400208FB3001C8FB20018A2
67551+:107C60008FB100148FB0001003E0000827BD003072
67552+:107C70002407003414A70149000000009247000EB9
67553+:107C80008F9FFDA08F90FD9C24181600A3E700197C
67554+:107C90009242000D3C0880003C07800CA3E20018D3
67555+:107CA000964A00123C0D60003C117FFFA60A005C62
67556+:107CB000964400103623FFFF240200053099FFFF91
67557+:107CC000AE1900548E46001CAD1800288CEF000041
67558+:107CD0008DAE444801E6482601C93021AE06003881
67559+:107CE0008E05003824CB00013C0E7F00AE05003C21
67560+:107CF0008E0C003CAFEC0004AE0B00208E13002075
67561+:107D0000AE13001CA3E0001BAE03002CA3E2001284
67562+:107D10008E4A001424130050AE0A00348E0400343E
67563+:107D2000AFE400148E590018AE1900489258000CA8
67564+:107D3000A218004E920D000835AF0020A20F0008D7
67565+:107D40008E090018012E282434AC4000AE0C001817
67566+:107D5000920B0000317200FF1253027F2403FF8058
67567+:107D60003C04080024845BE80E0008AA0000000020
67568+:107D70003C1108008E315BE80E00087202202021C1
67569+:107D80002405000424080001A2050025022020216A
67570+:107D90000E00087CA20800053C0580008CB001782C
67571+:107DA0000600FFFE8F92005834AE0140240F0002FF
67572+:107DB0003C091000ADD10000A1CF0004ACA90178AE
67573+:107DC0000A000962AF8000682CAD003751A0FF9413
67574+:107DD0008F8D0044000580803C110800263157E05B
67575+:107DE000021178218DEE000001C0000800000000A3
67576+:107DF0002411000414B1008C3C0780003C080800EA
67577+:107E00008D085BE88F86FD9CACE800208E4500085D
67578+:107E10008F99FDA0240D0050ACC500308E4C000899
67579+:107E2000ACCC00508E4B000CACCB00348E43001019
67580+:107E3000ACC300388E4A0010ACCA00548E42001405
67581+:107E4000ACC2003C8E5F0018AF3F00048E50001C97
67582+:107E5000ACD0002090C40000309800FF130D024AFF
67583+:107E6000000000008CC400348CD00030009030231F
67584+:107E700004C000F12404008C126000EE2402000310
67585+:107E80000A000962AF8200682419000514B900666F
67586+:107E90003C0580003C0808008D085BE88F86FD9C4F
67587+:107EA000ACA800208E4C00048F8AFDA0240720007F
67588+:107EB000ACCC001C924B000824120008A14B001906
67589+:107EC0008F82005890430009A14300188F85005805
67590+:107ED00090BF000A33E400FF1092001028890009C7
67591+:107EE000152000BA240E0002240D0020108D000B76
67592+:107EF000340780002898002117000008240740005C
67593+:107F000024100040109000053C0700012419008057
67594+:107F1000109900023C070002240740008CC20018A0
67595+:107F20003C03FF00004350240147F825ACDF001854
67596+:107F300090B2000BA0D200278F8300589464000CED
67597+:107F4000108001FE000000009467000C3C1F8000C0
67598+:107F50002405FFBFA4C7005C9063000E2407000443
67599+:107F6000A0C300088F820058904A000FA0CA0009E1
67600+:107F70008F8900588D3200108FE400740244C823AA
67601+:107F8000ACD900588D300014ACD0002C95380018B6
67602+:107F9000330DFFFFACCD00409531001A322FFFFFAB
67603+:107FA000ACCF00448D2E001CACCE00489128000EB2
67604+:107FB000A0C8000890CC000801855824126001B6C2
67605+:107FC000A0CB00088F9200580A000962AF870068B2
67606+:107FD0002406000614A600143C0E80003C0F080086
67607+:107FE0008DEF5BE88F85FD98ADCF00208E4900189E
67608+:107FF0008F86FD9C8F8BFDA0ACA900008CC800383B
67609+:1080000024040005ACA800048CCC003C1260008164
67610+:10801000AD6C00000A000962AF84006824110007FB
67611+:1080200010B1004B240400063C05080024A55BE8C1
67612+:108030000E000881240400818F9200580013102B39
67613+:108040000A000962AF820068241F002314BFFFF6F4
67614+:108050003C0C80003C0508008CA55BE88F8BFDA0E4
67615+:10806000AD8500208F91FD9C8E4600042564002084
67616+:1080700026450014AE260028240600030E000F81BA
67617+:10808000257000308F87005802002021240600034D
67618+:108090000E000F8124E500083C04080024845BE8FE
67619+:1080A0000E0008AA0000000092230000240A0050DD
67620+:1080B000306200FF544AFFE18F9200580E000F6CAF
67621+:1080C000000000000A000A6A8F920058240800335A
67622+:1080D00014A800323C0380003C1108008E315BE89C
67623+:1080E0008F8FFDA0AC7100208E420008240D002867
67624+:1080F0008F89FD9CADE200308E4A000C24060009F9
67625+:10810000ADEA00348E5F0010ADFF00388E440014DD
67626+:10811000ADE400208E590018ADF900248E58001CE3
67627+:10812000ADF80028A1ED00118E4E00041260003160
67628+:10813000AD2E00288F9200580A000962AF860068B1
67629+:10814000240D002214ADFFB8000000002404000735
67630+:108150003C1008008E105BE83C188000AF10002037
67631+:108160005660FEAEAF8400683C04080024845BE8DF
67632+:108170000E0008AA241300508F84FD9C90920000EA
67633+:10818000325900FF1333014B000000008F9200585A
67634+:10819000000020210A000962AF8400683C05080045
67635+:1081A00024A55BE80E000858240400810A000A6A2E
67636+:1081B0008F92005802D498213265FFFF0E000852BA
67637+:1081C000240400840A0009628F920058108EFF5325
67638+:1081D000240704002887000310E00179241100041B
67639+:1081E000240F0001548FFF4D240740000A000A228B
67640+:1081F000240701003C05080024A55BE80E0008A444
67641+:10820000240400828F920058000030210A00096285
67642+:10821000AF8600683C04080024845BE88CC2003808
67643+:108220000E0008AA8CC3003C8F9200580A000AC0B6
67644+:1082300000002021240400823C05080024A55BE8FE
67645+:108240000E0008A4000000008F92005800001021CA
67646+:108250000A000962AF8200688E5000048F91FD9C75
67647+:108260003C078000ACF00020922C00050200282181
67648+:10827000318B0002156001562404008A8F92FDA004
67649+:108280002404008D9245001B30A6002014C001502C
67650+:1082900002002821922E00092408001231C900FF93
67651+:1082A0001128014B240400810E00087202002021D5
67652+:1082B0009258001B240F000402002021370D0042B9
67653+:1082C000A24D001B0E00087CA22F00253C0580005B
67654+:1082D0008CA401780480FFFE34B90140241F000201
67655+:1082E000AF300000A33F00048F9200583C101000F4
67656+:1082F000ACB001780A000A6B0013102B8E500004FA
67657+:108300008F91FD9C3C038000AC700020922A0005F8
67658+:108310000200282131420002144000172404008A80
67659+:10832000922C00092412000402002821318B00FF46
67660+:1083300011720011240400810E0008720200202135
67661+:108340008F89FDA0240800122405FFFE912F001B39
67662+:108350000200202135EE0020A12E001BA2280009DA
67663+:108360009226000500C538240E00087CA2270005CF
67664+:1083700002002821000020210E0009330000000027
67665+:108380000A000A6A8F9200588E4C00043C07800055
67666+:108390003C10080026105BE8ACEC00203C01080013
67667+:1083A000AC2C5BE8924B0003317100041220013BBE
67668+:1083B0008F84FD9C24020006A0820009924F001BBE
67669+:1083C000240EFFC031E9003F012E4025A08800089F
67670+:1083D0009245000330A6000114C0013200000000E5
67671+:1083E0008E420008AE0200083C0208008C425BF09E
67672+:1083F000104001318F90FDA0000219C28F8DFD9CAD
67673+:10840000A603000C8E4A000C24180001240400145A
67674+:10841000AE0A002C8E420010AE02001C965F0016C1
67675+:10842000A61F003C96590014A619003EADB8000CDA
67676+:10843000A5B80010A5B80012A5B80014A5B800167C
67677+:1084400012600144A2040011925100033232000272
67678+:108450002E5300018F920058266200080A0009621C
67679+:10846000AF8200688E4400043C1980003C068008FE
67680+:10847000AF2400208E45000890D80000240D005045
67681+:10848000331100FF122D009C2407008824060009E8
67682+:108490000E000845000000000A000A6A8F9200588A
67683+:1084A0008E5000043C0980003C118008AD30002053
67684+:1084B0009228000024050050310400FF10850110AF
67685+:1084C0002407008802002021000028210E00084512
67686+:1084D0002406000E922D00002418FF80020028219F
67687+:1084E00001B8802524040004240600300E0007256E
67688+:1084F000A23000000A000A6A8F9200588E500004D1
67689+:108500008F91FDA03C028000AC500020923F001BE8
67690+:1085100033F900101320006C240700810200202191
67691+:10852000000028212406001F0E000845000000005E
67692+:108530000A000A6A8F9200588E44001C0E00085DE3
67693+:1085400000000000104000E3004048218F880058E0
67694+:1085500024070089012020218D05001C240600012C
67695+:108560000E000845000000000A000A6A8F920058B9
67696+:10857000964900023C10080026105BE831280004F0
67697+:10858000110000973C0460008E4E001C3C0F8000E0
67698+:10859000ADEE00203C010800AC2E5BE896470002DF
67699+:1085A00030E40001148000E6000000008E42000468
67700+:1085B000AE0200083C1008008E105BF0120000ECC8
67701+:1085C0003C0F80008F92FD9C241000018E4E0018FD
67702+:1085D0008F8DFDA08F9FFD9801CF4825AE490018D3
67703+:1085E000A2400005AE50000C3C0808008D085BF06E
67704+:1085F0008F840058A6500010000839C2A6500012FF
67705+:10860000A6500014A6500016A5A7000C8C8C0008DC
67706+:108610008F8B00588F8A0058ADAC002C8D63000CF6
67707+:1086200024070002ADA3001C91460010A1A6001172
67708+:108630008F82005890450011A3E500088F990058DB
67709+:1086400093380012A258004E8F910058922F0013B9
67710+:10865000A1AF00128F920058964E0014A5AE003CB8
67711+:1086600096490016A5A9003E8E480018ADA8001432
67712+:108670005660FD6AAF8700683C05080024A55BE8EA
67713+:108680000E000881000020218F9200580000382140
67714+:108690000A000962AF8700683C05080024A55BE872
67715+:1086A0000E0008A4240400828F9200580A000A4D8C
67716+:1086B000000038210E000F6C000000008F9200585F
67717+:1086C0000A000AC0000020210E00087202002021CA
67718+:1086D0009223001B02002021346A00100E00087C47
67719+:1086E000A22A001B000038210200202100002821BE
67720+:1086F0000A000BA52406001F9242000C305F000107
67721+:1087000013E0000300000000964A000EA4CA002CEB
67722+:10871000924B000C316300025060000600003821CB
67723+:108720008E470014964C0012ACC7001CA4CC001A53
67724+:10873000000038210A000B7F240600093C050800D0
67725+:1087400024A55BE80E0008A42404008B8F92005837
67726+:108750000A000A4D0013382B3C0C08008D8C5BE896
67727+:1087600024DFFFFE25930100326B007F016790211B
67728+:1087700002638824AD110028AE4600E0AE4000E45C
67729+:108780000A0009B3AE5F001CACC000543C0D0800E9
67730+:108790008DAD5BE83C18800C37090100ACED00287A
67731+:1087A0008E510014AD3100E08E4F0014AD2F00E467
67732+:1087B0008E4E001025C7FFFE0A0009F4AD27001CED
67733+:1087C0005491FDD6240740000A000A222407100015
67734+:1087D0000E00092D000000000A000A6A8F9200585E
67735+:1087E0008C83442C3C12DEAD3651BEEF3C010800B8
67736+:1087F000AC205BE810710062000000003C196C6264
67737+:1088000037387970147800082404000297850074C2
67738+:108810009782006C2404009200A2F82B13E0001948
67739+:1088200002002821240400020E00069524050200FF
67740+:108830003C068000ACC200203C010800AC225BE892
67741+:108840001040000D8F8C0058240A002824040003D7
67742+:10885000918B0010316300FF546A00012404000171
67743+:108860000E0000810000000010400004240400837A
67744+:108870000A000BC28F920058240400833C050800B4
67745+:1088800024A55BE80E000881000000008F920058CC
67746+:108890000013382B0A000962AF8700680A000B49F1
67747+:1088A000240200128E4400080E00085D0000000043
67748+:1088B0000A000B55AE0200083C05080024A55BE841
67749+:1088C0000E000858240400878F9200580A000B728B
67750+:1088D0000013102B240400040E000695240500301C
67751+:1088E0001440002A004048218F8800582407008344
67752+:1088F000012020218D05001C0A000BB32406000175
67753+:108900008F8300788F8600701066FEEE000038219D
67754+:108910003C07080024E75B6C000320C00087282187
67755+:108920008CAE000011D0005D246F000131E3000F18
67756+:108930005466FFFA000320C00A000B8C00003821A7
67757+:108940008E4400040E00085D000000000A000BC801
67758+:10895000AE0200083C05080024A55BE80E0008A450
67759+:10896000240400828F9200580A000B72000010212C
67760+:108970003C05080024A55BE80A000C7C2404008761
67761+:108980008C83442C0A000C5B3C196C628F88005865
67762+:108990003C0780083C0C8000240B0050240A000196
67763+:1089A000AD820020A0EB0000A0EA000191030004CA
67764+:1089B000A0E3001891040005A0E400199106000648
67765+:1089C0003C04080024845B6CA0E6001A91020007B6
67766+:1089D0003C06080024C65B68A0E2001B9105000865
67767+:1089E000A0E5001C911F0009A0FF001D9119000ABD
67768+:1089F000A0F9001E9118000BA0F8001F9112000CA6
67769+:108A0000A0F200209111000DA0F100219110000EA4
67770+:108A1000A0F00022910F000FA0EF0023910E001094
67771+:108A2000A0EE0024910D0011A0ED0025950C00147E
67772+:108A3000A4EC0028950B00168F8A00708F920078A6
67773+:108A4000A4EB002A95030018000A10C02545000178
67774+:108A5000A4E3002C8D1F001C0044C0210046C82147
67775+:108A600030A5000FAF3F0000AF09000010B20006B4
67776+:108A7000AF850070000038218D05001C01202021E9
67777+:108A80000A000BB32406000124AD000131A7000F3A
67778+:108A9000AF8700780A000CF9000038213C06080076
67779+:108AA00024C65B680086902100003821ACA000003D
67780+:108AB0000A000B8CAE4000003C0482013C036000C5
67781+:108AC00034820E02AC603D68AF80009803E000087D
67782+:108AD000AC623D6C27BDFFE8AFB000103090FFFFE7
67783+:108AE000001018422C620041AFBF00141440000275
67784+:108AF00024040080240300403C010800AC300060E6
67785+:108B00003C010800AC2300640E000F7500602821B2
67786+:108B1000244802BF2409FF8001092824001039805D
67787+:108B2000001030408FBF00148FB0001000A720212C
67788+:108B300000861821AF8300803C010800AC25005856
67789+:108B40003C010800AC24005C03E0000827BD0018CD
67790+:108B5000308300FF30C6FFFF30E400FF3C08800098
67791+:108B60008D0201B80440FFFE000354000144382583
67792+:108B70003C09600000E920253C031000AD050180A0
67793+:108B8000AD060184AD04018803E00008AD0301B81F
67794+:108B90008F8500583C0A6012354800108CAC0004E8
67795+:108BA0003C0D600E35A60010318B00062D690001CA
67796+:108BB000AD0900C48CA70004ACC731808CA20008AA
67797+:108BC00094A40002ACC231848CA3001C0460000396
67798+:108BD000A784009003E00008000000008CAF00189C
67799+:108BE000ACCF31D08CAE001C03E00008ACCE31D449
67800+:108BF0008F8500588F87FF288F86FF308CAE00044A
67801+:108C00003C0F601235E80010ACEE00788CAD000827
67802+:108C1000ACED007C8CAC0010ACCC004C8CAB000CF0
67803+:108C2000ACCB004894CA00543C0208008C4200447B
67804+:108C300025490001A4C9005494C400543083FFFFA7
67805+:108C400010620017000000003C0208008C42004047
67806+:108C5000A4C200528CA30018ACE300308CA2001414
67807+:108C6000ACE2002C8CB90018ACF900388CB80014B8
67808+:108C700024050001ACF800348D0600BC50C5001975
67809+:108C80008D0200B48D0200B8A4E2004894E40048CC
67810+:108C9000A4E4004A94E800EA03E000083102FFFF80
67811+:108CA0003C0208008C420024A4C00054A4C200521C
67812+:108CB0008CA30018ACE300308CA20014ACE2002CB2
67813+:108CC0008CB90018ACF900388CB8001424050001E8
67814+:108CD000ACF800348D0600BC54C5FFEB8D0200B823
67815+:108CE0008D0200B4A4E2004894E40048A4E4004AE1
67816+:108CF00094E800EA03E000083102FFFF8F86005885
67817+:108D00003C0480008CC900088CC80008000929C0F8
67818+:108D1000000839C0AC87002090C30007306200040F
67819+:108D20001040003EAF85009490CB0007316A0008E8
67820+:108D30001140003D8F87FF2C8CCD000C8CCE001491
67821+:108D400001AE602B11800036000000008CC2000CC8
67822+:108D5000ACE200708CCB00188F85FF288F88FF3025
67823+:108D6000ACEB00748CCA00102402FFF8ACAA00D847
67824+:108D70008CC9000CAD0900608CC4001CACA400D0F0
67825+:108D800090E3007C0062C824A0F9007C90D8000722
67826+:108D9000330F000811E000040000000090ED007C9B
67827+:108DA00035AC0001A0EC007C90CF000731EE000153
67828+:108DB00011C000060000000090E3007C241800347D
67829+:108DC00034790002A0F9007CACB800DC90C2000746
67830+:108DD0003046000210C000040000000090E8007C53
67831+:108DE00035040004A0E4007C90ED007D3C0B600E97
67832+:108DF000356A001031AC003FA0EC007D8D4931D4C4
67833+:108E00003127000110E00002240E0001A0AE00098D
67834+:108E100094AF00EA03E0000831E2FFFF8F87FF2CE8
67835+:108E20000A000DAF8CC200140A000DB0ACE0007057
67836+:108E30008F8C005827BDFFD8AFB3001CAFB200180D
67837+:108E4000AFB00010AFBF0020AFB10014918F00157C
67838+:108E50003C13600E3673001031EB000FA38B009CA7
67839+:108E60008D8F00048D8B0008959F0012959900103E
67840+:108E70009584001A9598001E958E001C33EDFFFF17
67841+:108E8000332AFFFF3089FFFF3308FFFF31C7FFFFA1
67842+:108E90003C010800AC2D00243C010800AC29004432
67843+:108EA0003C010800AC2A0040AE683178AE67317CE6
67844+:108EB00091850015959100163C12601236520010F3
67845+:108EC00030A200FF3230FFFFAE623188AE5000B4F6
67846+:108ED00091830014959F0018240600010066C804C1
67847+:108EE00033F8FFFFAE5900B8AE5800BC918E0014A5
67848+:108EF000AF8F00843C08600631CD00FFAE4D00C04E
67849+:108F0000918A00159584000E3C07600A314900FFE4
67850+:108F1000AF8B00883084FFFFAE4900C835110010C8
67851+:108F20000E000D1034F004103C0208008C4200606A
67852+:108F30003C0308008C6300643C0608008CC60058A3
67853+:108F40003C0508008CA5005C8F8400808FBF00204A
67854+:108F5000AE23004CAE65319CAE030054AE4500DC40
67855+:108F6000AE6231A0AE6331A4AE663198AE22004845
67856+:108F70008FB3001CAE0200508FB10014AE4200E06F
67857+:108F8000AE4300E4AE4600D88FB000108FB2001898
67858+:108F90000A00057D27BD0028978500929783007CF5
67859+:108FA00027BDFFE8AFB0001000A3102BAFBF001427
67860+:108FB000240400058F900058104000552409000239
67861+:108FC0000E0006958F850080AF8200942404000374
67862+:108FD0001040004F240900023C0680000E00008172
67863+:108FE000ACC2002024070001240820001040004DDE
67864+:108FF00024040005978E00928F8AFF2C24090050CC
67865+:1090000025C50001A7850092A14900003C0D08007C
67866+:109010008DAD0064240380008F84FF28000D66005E
67867+:10902000AD4C0018A5400006954B000A8F85FF3017
67868+:109030002402FF8001633024A546000A915F000AE4
67869+:109040000000482103E2C825A159000AA0A0000899
67870+:10905000A140004CA08000D5961800029783009094
67871+:109060003C020004A49800EA960F00022418FFBFF7
67872+:1090700025EE2401A48E00BE8E0D0004ACAD00448C
67873+:109080008E0C0008ACAC0040A4A00050A4A000547A
67874+:109090008E0B000C240C0030AC8B00288E060010C8
67875+:1090A000AC860024A480003EA487004EA487005014
67876+:1090B000A483003CAD420074AC8800D8ACA800602A
67877+:1090C000A08700FC909F00D433F9007FA09900D4C2
67878+:1090D000909000D402187824A08F00D4914E007C88
67879+:1090E00035CD0001A14D007C938B009CAD480070F4
67880+:1090F000AC8C00DCA08B00D68F8800888F87008422
67881+:10910000AC8800C4AC8700C8A5400078A540007AB0
67882+:109110008FBF00148FB000100120102103E0000861
67883+:1091200027BD00188F8500940E0007258F860080CC
67884+:109130000A000E9F2409000227BDFFE0AFB0001017
67885+:109140008F900058AFB10014AFBF00188E09000413
67886+:109150000E00054A000921C08E0800048F84FF28F4
67887+:109160008F82FF30000839C03C068000ACC7002069
67888+:10917000948500EA904300131460001C30B1FFFF97
67889+:109180008F8CFF2C918B0008316A00401540000B3A
67890+:10919000000000008E0D0004022030218FBF001857
67891+:1091A0008FB100148FB00010240400220000382179
67892+:1091B000000D29C00A000D2F27BD00200E000098C9
67893+:1091C000000000008E0D0004022030218FBF001827
67894+:1091D0008FB100148FB00010240400220000382149
67895+:1091E000000D29C00A000D2F27BD00200E000090A1
67896+:1091F000000000008E0D0004022030218FBF0018F7
67897+:109200008FB100148FB00010240400220000382118
67898+:10921000000D29C00A000D2F27BD002027BDFFE04B
67899+:10922000AFB200183092FFFFAFB00010AFBF001C0C
67900+:10923000AFB100141240001E000080218F8600583C
67901+:109240008CC500002403000600053F02000514023F
67902+:1092500030E4000714830016304500FF2CA80006F8
67903+:1092600011000040000558803C0C0800258C58BCBB
67904+:10927000016C50218D490000012000080000000011
67905+:109280008F8E0098240D000111CD005024020002A1
67906+:10929000AF820098260900013130FFFF24C800206A
67907+:1092A0000212202B010030211480FFE5AF88005806
67908+:1092B000020010218FBF001C8FB200188FB1001464
67909+:1092C0008FB0001003E0000827BD00209387007EC8
67910+:1092D00054E00034000030210E000DE700000000D3
67911+:1092E0008F8600580A000EFF240200018F87009825
67912+:1092F0002405000210E50031240400130000282199
67913+:1093000000003021240700010E000D2F0000000096
67914+:109310000A000F008F8600588F83009824020002F5
67915+:109320001462FFF6240400120E000D9A00000000E3
67916+:109330008F85009400403021240400120E000D2F70
67917+:10934000000038210A000F008F8600588F83009894
67918+:109350002411000310710029241F0002107FFFCE8A
67919+:1093600026090001240400100000282100003021FB
67920+:109370000A000F1D240700018F91009824060002A7
67921+:109380001626FFF9240400100E000E410000000014
67922+:10939000144000238F9800588F8600580A000EFF53
67923+:1093A00024020003240400140E000D2F00002821C5
67924+:1093B0008F8600580A000EFF240200020E000EA93C
67925+:1093C000000000000A000F008F8600580E000D3FBD
67926+:1093D00000000000241900022404001400002821C9
67927+:1093E0000000302100003821AF9900980E000D2FA9
67928+:1093F000000000000A000F008F8600580E000D5775
67929+:10940000000000008F8500942419000200403021E4
67930+:1094100024040010000038210A000F56AF9900986C
67931+:109420000040382124040010970F0002000028217A
67932+:109430000E000D2F31E6FFFF8F8600580A000F0047
67933+:10944000AF9100988F84FF2C3C077FFF34E6FFFF2D
67934+:109450008C8500182402000100A61824AC83001893
67935+:1094600003E00008A08200053084FFFF30A5FFFF65
67936+:109470001080000700001821308200011040000217
67937+:1094800000042042006518211480FFFB00052840DD
67938+:1094900003E000080060102110C000070000000079
67939+:1094A0008CA2000024C6FFFF24A50004AC820000AB
67940+:1094B00014C0FFFB2484000403E000080000000047
67941+:1094C00010A0000824A3FFFFAC86000000000000ED
67942+:1094D000000000002402FFFF2463FFFF1462FFFA74
67943+:1094E0002484000403E0000800000000000411C010
67944+:1094F00003E000082442024027BDFFE8AFB000109F
67945+:1095000000808021AFBF00140E000F9600A0202124
67946+:1095100000504821240AFF808FBF00148FB0001034
67947+:10952000012A30243127007F3C08800A3C042100B6
67948+:1095300000E8102100C428253C03800027BD001846
67949+:10954000AC650024AF820038AC400000AC6500245C
67950+:1095500003E00008AC4000403C0D08008DAD005811
67951+:1095600000056180240AFF8001A45821016C482174
67952+:10957000012A30243127007F3C08800C3C04210064
67953+:1095800000E8102100C428253C038000AC650028B9
67954+:10959000AF82003403E00008AC40002430A5FFFF98
67955+:1095A0003C0680008CC201B80440FFFE3C086015F8
67956+:1095B00000A838253C031000ACC40180ACC0018475
67957+:1095C000ACC7018803E00008ACC301B83C0D08003B
67958+:1095D0008DAD005800056180240AFF8001A4582148
67959+:1095E000016C4021010A4824000931403107007F05
67960+:1095F00000C728253C04200000A418253C02800058
67961+:10960000AC43083003E00008AF80003427BDFFE81A
67962+:10961000AFB0001000808021AFBF00140E000F9685
67963+:1096200000A0202100504821240BFF80012B502452
67964+:10963000000A39403128007F3C0620008FBF00140B
67965+:109640008FB0001000E8282534C2000100A21825C0
67966+:109650003C04800027BD0018AC83083003E00008FC
67967+:10966000AF8000383C0580088CA700603C0680086D
67968+:109670000087102B144000112C8340008CA8006040
67969+:109680002D0340001060000F240340008CC90060CF
67970+:109690000089282B14A00002008018218CC30060D0
67971+:1096A00000035A42000B30803C0A0800254A59202A
67972+:1096B00000CA202103E000088C8200001460FFF340
67973+:1096C0002403400000035A42000B30803C0A08008B
67974+:1096D000254A592000CA202103E000088C8200009E
67975+:1096E0003C05800890A60008938400AB24C20001CA
67976+:1096F000304200FF3043007F1064000C0002382726
67977+:10970000A0A200083C0480008C85017804A0FFFE24
67978+:109710008F8A00A0240900023C081000AC8A014096
67979+:10972000A089014403E00008AC8801780A00101BFE
67980+:1097300030E2008027BDFFD8AFB200188F9200A49E
67981+:10974000AFBF0020AFB3001CAFB00010AFB100142A
67982+:109750008F9300348E5900283C1000803C0EFFEFA0
67983+:10976000AE7900008E580024A260000A35CDFFFFBC
67984+:10977000AE7800049251002C3C0BFF9F356AFFFF2E
67985+:10978000A271000C8E6F000C3C080040A271000B0F
67986+:1097900001F06025018D4824012A382400E8302595
67987+:1097A000AE66000C8E450004AE6000183C0400FF5D
67988+:1097B000AE6500148E43002C3482FFFFA6600008C3
67989+:1097C0000062F824AE7F00108E5900088F9000A030
67990+:1097D000964E0012AE7900208E51000C31D83FFF1A
67991+:1097E00000187980AE7100248E4D001401F06021C4
67992+:1097F00031CB0001AE6D00288E4A0018000C41C22A
67993+:10980000000B4B80AE6A002C8E46001C01093821EB
67994+:10981000A667001CAE660030964500028E4400200C
67995+:10982000A665001EAE64003492430033306200042B
67996+:1098300054400006924700003C0280083443010077
67997+:109840008C7F00D0AE7F0030924700008F860038BA
67998+:10985000A0C700309245003330A4000250800007BA
67999+:10986000925100018F880038240BFF80910A00304C
68000+:10987000014B4825A1090030925100018F9000381A
68001+:10988000240CFFBF2404FFDFA21100318F8D0038AC
68002+:109890003C1880083711008091AF003C31EE007F0A
68003+:1098A000A1AE003C8F890038912B003C016C502404
68004+:1098B000A12A003C8F9F00388E68001493E6003C7C
68005+:1098C0002D0700010007114000C4282400A218251C
68006+:1098D000A3E3003C8F87003896590012A4F90032A8
68007+:1098E0008E450004922E007C30B0000300107823D7
68008+:1098F00031ED000300AD102131CC000215800002D3
68009+:1099000024460034244600303C0280083443008062
68010+:10991000907F007C00BFC824333800041700000289
68011+:1099200024C2000400C010218F98003824190002BE
68012+:10993000ACE20034A3190000924F003F8F8E003834
68013+:109940003C0C8008358B0080A1CF00018F9100383E
68014+:10995000924D003F8E440004A62D0002956A005CE3
68015+:109960000E000FF43150FFFF00024B800209382532
68016+:109970003C08420000E82825AE2500048E4400384B
68017+:109980008F850038ACA400188E460034ACA6001CAD
68018+:10999000ACA0000CACA00010A4A00014A4A0001661
68019+:1099A000A4A00020A4A00022ACA000248E62001479
68020+:1099B00050400001240200018FBF00208FB3001C23
68021+:1099C0008FB200188FB100148FB00010ACA2000845
68022+:1099D0000A00101327BD002827BDFFC83C058008DA
68023+:1099E00034A40080AFBF0034AFBE0030AFB7002C4E
68024+:1099F000AFB60028AFB50024AFB40020AFB3001C51
68025+:109A0000AFB20018AFB10014AFB00010948300786B
68026+:109A10009482007A104300512405FFFF0080F0215A
68027+:109A20000A0011230080B821108B004D8FBF003435
68028+:109A30008F8600A03C1808008F18005C2411FF805E
68029+:109A40003C1680000306782101F18024AED0002C62
68030+:109A500096EE007A31EC007F3C0D800E31CB7FFF1B
68031+:109A6000018D5021000B4840012AA82196A4000036
68032+:109A70003C0808008D0800582405FF8030953FFF02
68033+:109A800001061821001539800067C8210325F82434
68034+:109A90003C02010003E290253338007F3C11800C2A
68035+:109AA000AED20028031190219250000D320F000415
68036+:109AB00011E0003702E0982196E3007A96E8007AF8
68037+:109AC00096E5007A2404800031077FFF24E300013B
68038+:109AD00030627FFF00A4F82403E2C825A6F9007ACB
68039+:109AE00096E6007A3C1408008E94006030D67FFF22
68040+:109AF00012D400C1000000008E5800188F8400A00E
68041+:109B000002A028212713FFFF0E000FCEAE53002C1A
68042+:109B100097D5007897D4007A12950010000028217C
68043+:109B20003C098008352401003C0A8008914800085F
68044+:109B3000908700D53114007F30E400FF0284302B81
68045+:109B400014C0FFB9268B0001938E00AB268C000158
68046+:109B5000008E682115ACFFB78F8600A08FBF003440
68047+:109B60008FBE00308FB7002C8FB600288FB5002431
68048+:109B70008FB400208FB3001C8FB200188FB1001477
68049+:109B80008FB0001000A0102103E0000827BD0038AE
68050+:109B900000C020210E000F99028028218E4B00105A
68051+:109BA0008E4C00308F84003824090002016C502351
68052+:109BB000AE4A0010A089000096E3005C8E4400309D
68053+:109BC0008F9100380E000FF43070FFFF00024380C9
68054+:109BD000020838253C02420000E22825AE25000498
68055+:109BE0008E5F00048F8A00388E590000240B000815
68056+:109BF000AD5F001CAD590018AD40000CAD40001029
68057+:109C00009246000A240400052408C00030D000FF5A
68058+:109C1000A550001496580008A55800169251000A45
68059+:109C20003C188008322F00FFA54F0020964E0008F8
68060+:109C300037110100A54E0022AD400024924D000BCB
68061+:109C400031AC00FFA54C0002A14B00018E49003051
68062+:109C50008F830038240BFFBFAC690008A06400307C
68063+:109C60008F9000382403FFDF9607003200E8282495
68064+:109C700000B51025A6020032921F003233F9003FD2
68065+:109C800037260040A20600328F8C0038AD800034A9
68066+:109C90008E2F00D0AD8F0038918E003C3C0F7FFF9F
68067+:109CA00031CD007FA18D003C8F84003835EEFFFF61
68068+:109CB000908A003C014B4824A089003C8F850038E5
68069+:109CC00090A8003C01033824A0A7003C8E42003439
68070+:109CD0008F9100383C038008AE2200408E59002C42
68071+:109CE0008E5F0030033F3023AE26004492300048A0
68072+:109CF0003218007FA23800488F8800388E4D00301F
68073+:109D00008D0C004801AE582401965024014B482583
68074+:109D1000AD0900489244000AA104004C964700088F
68075+:109D20008F850038A4A7004E8E5000308E4400303E
68076+:109D30000E0003818C65006092F9007C0002F940FE
68077+:109D4000004028210002110003E2302133360002D6
68078+:109D500012C00003020680210005B0800216802197
68079+:109D6000926D007C31B30004126000020005708027
68080+:109D7000020E80218E4B00308F8800382405800031
68081+:109D8000316A0003000A4823312400030204182129
68082+:109D9000AD03003496E4007A96F0007A96F1007AEA
68083+:109DA00032027FFF2447000130FF7FFF0225C824D5
68084+:109DB000033F3025A6E6007A96F8007A3C120800A8
68085+:109DC0008E520060330F7FFF11F200180000000078
68086+:109DD0008F8400A00E000FCE02A028218F8400A047
68087+:109DE0000E000FDE028028210E001013000000007C
68088+:109DF0000A00111F0000000096F1007A022480245E
68089+:109E0000A6F0007A92EF007A92EB007A31EE00FF32
68090+:109E1000000E69C2000D6027000C51C03169007F3F
68091+:109E2000012A20250A001119A2E4007A96E6007A98
68092+:109E300000C5C024A6F8007A92EF007A92F3007A67
68093+:109E400031F200FF001271C2000E6827000DB1C090
68094+:109E5000326C007F01962825A2E5007A0A0011D015
68095+:109E60008F8400A03C0380003084FFFF30A5FFFFFB
68096+:109E7000AC640018AC65001C03E000088C620014A0
68097+:109E800027BDFFA03C068008AFBF005CAFBE0058F6
68098+:109E9000AFB70054AFB60050AFB5004CAFB40048F8
68099+:109EA000AFB30044AFB20040AFB1003CAFB0003838
68100+:109EB00034C80100910500D590C700083084FFFF29
68101+:109EC00030A500FF30E2007F0045182AAFA4001043
68102+:109ED000A7A00018A7A0002610600055AFA000148E
68103+:109EE00090CA00083149007F00A9302324D3FFFF26
68104+:109EF0000013802B8FB400100014902B02128824C2
68105+:109F0000522000888FB300143C03800894790052DB
68106+:109F1000947E00508FB60010033EC0230018BC0092
68107+:109F2000001714030016FC0002C2A82A16A00002A3
68108+:109F3000001F2C030040282100133C0000072403CD
68109+:109F400000A4102A5440000100A020212885000907
68110+:109F500014A000020080A021241400083C0C8008FA
68111+:109F60008D860048001459808D88004C3C03800089
68112+:109F70003169FFFF3C0A0010012A202534710400DA
68113+:109F8000AC660038AF9100A4AC68003CAC64003013
68114+:109F900000000000000000000000000000000000C1
68115+:109FA00000000000000000000000000000000000B1
68116+:109FB0008C6E000031CD002011A0FFFD0014782A26
68117+:109FC00001F01024104000390000A8213C16800840
68118+:109FD00092D700083C1280008E44010032F6007FC8
68119+:109FE0000E000F9902C028218E3900108E44010006
68120+:109FF0000000902133373FFF0E000FB102E028210F
68121+:10A00000923800003302003F2C500008520000102C
68122+:10A0100000008821000210803C030800246358E4FB
68123+:10A020000043F8218FFE000003C00008000000007C
68124+:10A0300090CF0008938C00AB31EE007F00AE682318
68125+:10A04000018D58210A0012172573FFFF0000882197
68126+:10A050003C1E80008FC401000E000FCE02E02821BC
68127+:10A060008FC401000E000FDE02C028211220000F55
68128+:10A070000013802B8F8B00A426A400010004AC00E9
68129+:10A08000027298230015AC032578004002B4B02A70
68130+:10A090000013802B241700010300882102D0102414
68131+:10A0A000AF9800A41440FFC9AFB700143C07800864
68132+:10A0B00094E200508FAE00103C05800002A288217F
68133+:10A0C0003C060020A4F10050ACA6003094F40050EF
68134+:10A0D00094EF005201D51823306CFFFF11F4001EDD
68135+:10A0E000AFAC00108CEF004C001561808CF500487F
68136+:10A0F00001EC28210000202100AC582B02A4C02133
68137+:10A10000030BB021ACE5004CACF600488FB4001056
68138+:10A110000014902B021288241620FF7C3C03800838
68139+:10A120008FB300148FBF005C8FBE00583A620001ED
68140+:10A130008FB700548FB600508FB5004C8FB40048D5
68141+:10A140008FB300448FB200408FB1003C8FB0003815
68142+:10A1500003E0000827BD006094FE00548CF2004428
68143+:10A1600033C9FFFE0009C8C00259F821ACBF003C4A
68144+:10A170008CE800448CAD003C010D50231940003B9D
68145+:10A18000000000008CF7004026E20001ACA200387D
68146+:10A190003C05005034A700103C038000AC67003041
68147+:10A1A00000000000000000000000000000000000AF
68148+:10A1B000000000000000000000000000000000009F
68149+:10A1C0008C7800003316002012C0FFFD3C1180087F
68150+:10A1D000962200543C1580003C068008304E000159
68151+:10A1E000000E18C0007578218DEC04003C070800B3
68152+:10A1F0008CE700443C040020ACCC00488DF40404FF
68153+:10A20000240B0001ACD4004C10EB0260AEA4003073
68154+:10A21000963900523C0508008CA5004000B99021F9
68155+:10A22000A6320052963F005427ED0001A62D00549F
68156+:10A230009626005430C4FFFF5487FF2F8FB40010C0
68157+:10A2400030A5FFFF0E0011F4A62000543C070800C3
68158+:10A250008CE70024963E00520047B82303D74823DA
68159+:10A26000A62900520A0012198FB400108CE2004097
68160+:10A270000A0012BE00000000922400012407000121
68161+:10A280003085007F14A7001C97AD00268E2B00148C
68162+:10A29000240CC000316A3FFF01AC48243C06080092
68163+:10A2A0008CC60060012A402531043FFF0086882BC0
68164+:10A2B00012200011A7A800263C0508008CA5005814
68165+:10A2C0008F9100A0000439802402FF8000B1182182
68166+:10A2D0000067F82103E2F02433F8007F3C1280008D
68167+:10A2E0003C19800EAE5E002C0319702191D0000D38
68168+:10A2F000360F0004A1CF000D0E001028241200011B
68169+:10A30000241100013C1E80008FC401000E000FCEFE
68170+:10A3100002E028218FC401000E000FDE02C02821B8
68171+:10A320001620FF558F8B00A40A0012860013802B85
68172+:10A330008F8600A490C80001310400201080019194
68173+:10A34000241000013C048008348B0080916A007C5A
68174+:10A350008F9E0034AFA0002C314900011120000F66
68175+:10A36000AFB000288CCD00148C8E006001AE602B45
68176+:10A370001580000201A038218C8700603C188008FD
68177+:10A38000370300808C70007000F0782B15E000021D
68178+:10A3900000E020218C640070AFA4002C3C028008F7
68179+:10A3A000344500808CD200148CBF0070025FC82B33
68180+:10A3B00017200002024020218CA400708FA7002CDF
68181+:10A3C0000087182310600003AFA3003024050002AB
68182+:10A3D000AFA500288FA400280264882B162000BA9D
68183+:10A3E000000018218CD000388FCE000C3C0F00806C
68184+:10A3F000AFD000008CCD00343C0CFF9F01CF58251E
68185+:10A40000AFCD000490CA003F3586FFFF01662024CF
68186+:10A410003C0900203C08FFEFA3CA000B0089382547
68187+:10A420003511FFFF00F118243C0500088F8700A4B8
68188+:10A430000065C825AFD9000C8CE20014AFC000182D
68189+:10A440008FA60030AFC200148CF800188FB0002C1B
68190+:10A450003C1FFFFBAFD8001C8CEF000837F2FFFF5A
68191+:10A4600003326824AFCF00248CEC000C020670216C
68192+:10A47000AFCD000CA7C00038A7C0003AAFCE002C6B
68193+:10A48000AFCC0020AFC000288CEA00148FAB002CAA
68194+:10A49000014B48230126402311000011AFC80010D2
68195+:10A4A00090EB003D8FC900048FC80000000B5100E5
68196+:10A4B000012A28210000102100AA882B010218215E
68197+:10A4C0000071F821AFC50004AFDF000090F2003D3D
68198+:10A4D000A3D2000A8F9900A497380006A7D80008D5
68199+:10A4E0008F910038240800023C038008A228000055
68200+:10A4F0003465008094BF005C8FA4002C33F0FFFF14
68201+:10A500000E000FF48F9200380002CB808F8500A4DC
68202+:10A51000021978253C18420001F87025AE4E00045F
68203+:10A520008F8400388CAD0038AC8D00188CAC0034B2
68204+:10A53000AC8C001CAC80000CAC800010A48000141B
68205+:10A54000A4800016A4800020A4800022AC800024F7
68206+:10A5500090A6003F8FA7002CA486000250E0019235
68207+:10A56000240700018FA200305040000290A2003D5D
68208+:10A5700090A2003E244A0001A08A00018F84003886
68209+:10A580008FA9002CAC8900083C128008364D008051
68210+:10A5900091AC007C3186000214C000022407003414
68211+:10A5A000240700308F8500A43C198008373F0080C5
68212+:10A5B00090B0000093F9007C240E0004A0900030BD
68213+:10A5C0008F8F00A48FB8002C8F8D003891F200017E
68214+:10A5D0003304000301C46023A1B200318F8E003820
68215+:10A5E0008F8600A42402C00095CA003294C90012CC
68216+:10A5F0008FAB002C0142402431233FFF010388250B
68217+:10A60000A5D1003291D000323185000300EBF82152
68218+:10A610003218003F370F0040A1CF00328FA4002C2A
68219+:10A6200003E5382133280004108000028F850038AC
68220+:10A6300000E838213C0A8008ACA700343549010005
68221+:10A640008D2800D08FA3002C2419FFBFACA80038A0
68222+:10A6500090B1003C2C640001240FFFDF3227007F03
68223+:10A66000A0A7003C8F98003800049140931F003C45
68224+:10A6700003F98024A310003C8F8C0038918E003C9D
68225+:10A6800001CF682401B23025A186003C8F8900A447
68226+:10A690008F8800388D2B0020AD0B00408D220024C8
68227+:10A6A000AD0200448D2A0028AD0A00488D23002CFD
68228+:10A6B0000E001013AD03004C8FB1002824070002D8
68229+:10A6C000122700118FA300280003282B00058023E8
68230+:10A6D0000270982400608021006090210A00126FAF
68231+:10A6E0000010882B962900128F8400A00000902172
68232+:10A6F0003125FFFFA7A900180E000FC22411000189
68233+:10A700000A00131D3C1E80003C0B80003C12800898
68234+:10A710008D640100924900088F92FF340E000F995A
68235+:10A720003125007F8F9900388FA700288FA4003033
68236+:10A73000A3270000965F005C33F0FFFF0E000FF4CC
68237+:10A740008F91003800026B80020D80253C0842008A
68238+:10A750008F8D00A402085025AE2A00048DA5003874
68239+:10A760008F8A003800007821000F1100AD450018D5
68240+:10A770008DB800343C047FFF3488FFFFAD58001CC7
68241+:10A7800091A6003E8D4C001C8D4900180006190052
68242+:10A79000000677020183C821004E58250323882B29
68243+:10A7A000012B382100F1F821AD59001CAD5F0018D4
68244+:10A7B000AD40000CAD40001091B0003E8FA40030C1
68245+:10A7C00024090005A550001495A500042419C00013
68246+:10A7D00000884024A545001691B8003EA5580020E9
68247+:10A7E00095AF0004A54F0022AD40002491AE003F7C
68248+:10A7F000A54E000291A6003E91AC003D01861023BB
68249+:10A80000244B0001A14B00018F9100388FA3003031
68250+:10A810003C028008344B0100AE230008A22900301E
68251+:10A820008F8C00388F8700A4959F003294F000121F
68252+:10A830002407FFBF033FC02432053FFF03057825EF
68253+:10A84000A58F0032918E00322418FFDF31CD003FFA
68254+:10A8500035A60040A18600328F910038240DFFFFFD
68255+:10A86000240CFF80AE2000348D6A00D0AE2A003860
68256+:10A870009223003C3069007FA229003C8F90003871
68257+:10A880003C0380009219003C0327F824A21F003CDF
68258+:10A890008F8E003891C5003C00B87824A1CF003CD1
68259+:10A8A0008F8A00383C0E8008AD4D00408FA6002CEA
68260+:10A8B000AD46004491420048004C5825A14B004849
68261+:10A8C0008F9000388F9900A48E09004801238824B6
68262+:10A8D00002283825AE070048933F003EA21F004CD7
68263+:10A8E0008F9800A48F8F003897050004A5E5004ECF
68264+:10A8F0000E0003818DC500609246007C8FAC003055
68265+:10A9000000026940000291000040282130CB000283
68266+:10A9100001B21021156000AA018230213C0E80088E
68267+:10A9200035C20080904C007C31830004106000032D
68268+:10A930008FB900300005788000CF3021241F00043B
68269+:10A940008F910038332D000303ED8023320800037C
68270+:10A9500000C85021AE2A00343C188000A7C500383A
68271+:10A960003C0680088F04010090DE00080E000FDE18
68272+:10A9700033C5007F0E001013000000000A00140D04
68273+:10A980008FA300288F9800348CC90038241F00033F
68274+:10A99000A7000008AF0900008CC50034A300000A1E
68275+:10A9A0008F9900A4AF0500043C080080932D003F60
68276+:10A9B000A31F000C8F0A000C3C02FF9FA30D000B8D
68277+:10A9C0000148F0253451FFFF3C12FFEF8F9900A49E
68278+:10A9D00003D170243646FFFF01C61824AF03000CD4
68279+:10A9E0008F2C0014972900128F8400A0AF0C001048
68280+:10A9F0008F2F0014AF000018AF000020AF0F00141D
68281+:10AA0000AF0000248F270018312F3FFF000F59801F
68282+:10AA1000AF0700288F2500080164F821312D0001BF
68283+:10AA2000AF0500308F31000C8F920038001F51C2EB
68284+:10AA3000000D438001481021241E00023C068008BE
68285+:10AA4000A702001CA7000034AF11002CA25E00007A
68286+:10AA500034D20080964E005C8F9900383C0342004F
68287+:10AA600031CCFFFF01833825AF2700048F8B00A472
68288+:10AA7000240500012402C0008D640038240700343E
68289+:10AA8000AF2400188D690034AF29001CAF20000CE2
68290+:10AA9000AF200010A7200014A7200016A720002038
68291+:10AAA000A7200022AF200024A7300002A325000128
68292+:10AAB0008F8800388F9F00A4AD10000893ED000030
68293+:10AAC000A10D00308F8A00A48F98003891510001A9
68294+:10AAD000A31100318F8B0038957E003203C27024A1
68295+:10AAE00001CF6025A56C0032916300323064003FD5
68296+:10AAF000A16400329249007C3125000214A00002BA
68297+:10AB00008F840038240700303C198008AC8700345B
68298+:10AB1000373201008E5F00D0240AFFBF020090216F
68299+:10AB2000AC9F0038908D003C31A8007FA088003C8D
68300+:10AB30008F9E003893C2003C004A8824A3D1003C79
68301+:10AB40008F8300380010882B9066003C34CE0020A4
68302+:10AB5000A06E003C8F8400A48F9800388C8C00205D
68303+:10AB6000AF0C00408C8F0024AF0F00448C8700286E
68304+:10AB7000AF0700488C8B002CAF0B004C0E0010135D
68305+:10AB80003C1E80000A0012700000000094C80052B1
68306+:10AB90003C0A08008D4A002401488821A4D10052B3
68307+:10ABA0000A0012198FB40010A08700018F840038AA
68308+:10ABB000240B0001AC8B00080A0013BE3C12800875
68309+:10ABC000000520800A0014A200C4302127BDFFE048
68310+:10ABD0003C0D8008AFB20018AFB00010AFBF001C32
68311+:10ABE000AFB1001435B200808E4C001835A80100BA
68312+:10ABF000964B000695A70050910900FC000C5602E8
68313+:10AC0000016728233143007F312600FF240200031F
68314+:10AC1000AF8300A8AF8400A010C2001B30B0FFFFBC
68315+:10AC2000910600FC2412000530C200FF10520033D0
68316+:10AC300000000000160000098FBF001C8FB2001832
68317+:10AC40008FB100148FB00010240D0C003C0C80005C
68318+:10AC500027BD002003E00008AD8D00240E0011FB8D
68319+:10AC6000020020218FBF001C8FB200188FB100148A
68320+:10AC70008FB00010240D0C003C0C800027BD00207C
68321+:10AC800003E00008AD8D0024965800789651007AB4
68322+:10AC9000924E007D0238782631E8FFFF31C400C0B3
68323+:10ACA000148000092D11000116000037000000007B
68324+:10ACB0005620FFE28FBF001C0E0010D100000000E4
68325+:10ACC0000A00156A8FBF001C1620FFDA0000000082
68326+:10ACD0000E0010D1000000001440FFD88FBF001CF0
68327+:10ACE0001600002200000000925F007D33E2003F6A
68328+:10ACF000A242007D0A00156A8FBF001C950900EA78
68329+:10AD00008F86008000802821240400050E0007257E
68330+:10AD10003130FFFF978300923C0480002465FFFFE1
68331+:10AD2000A78500928C8A01B80540FFFE0000000054
68332+:10AD3000AC8001808FBF001CAC9001848FB20018E2
68333+:10AD40008FB100148FB000103C0760133C0B100053
68334+:10AD5000240D0C003C0C800027BD0020AC8701882E
68335+:10AD6000AC8B01B803E00008AD8D00240E0011FB90
68336+:10AD7000020020215040FFB18FBF001C925F007D78
68337+:10AD80000A00159733E2003F0E0011FB020020215C
68338+:10AD90001440FFAA8FBF001C122000070000000013
68339+:10ADA0009259007D3330003F36020040A242007DC0
68340+:10ADB0000A00156A8FBF001C0E0010D100000000B1
68341+:10ADC0005040FF9E8FBF001C9259007D3330003FE2
68342+:10ADD0000A0015C636020040000000000000001BFB
68343+:10ADE0000000000F0000000A00000008000000063C
68344+:10ADF0000000000500000005000000040000000441
68345+:10AE00000000000300000003000000030000000336
68346+:10AE10000000000300000002000000020000000229
68347+:10AE2000000000020000000200000002000000021A
68348+:10AE3000000000020000000200000002000000020A
68349+:10AE400000000002000000020000000200000002FA
68350+:10AE50000000000100000001000000018008010066
68351+:10AE6000800800808008000000000C000000308096
68352+:10AE7000080011D00800127C08001294080012A8E3
68353+:10AE8000080012BC080011D0080011D0080012F010
68354+:10AE90000800132C080013400800138808001A8CBF
68355+:10AEA00008001A8C08001AC408001AC408001AD82E
68356+:10AEB00008001AA808001D0008001CCC08001D5836
68357+:10AEC00008001D5808001DE008001D108008024001
68358+:10AED000080027340800256C0800275C080027F4C8
68359+:10AEE0000800293C0800298808002AAC080029B479
68360+:10AEF00008002A38080025DC08002EDC08002EA4F3
68361+:10AF000008002588080025880800258808002B20CF
68362+:10AF100008002B20080025880800258808002DD06F
68363+:10AF2000080025880800258808002588080025884D
68364+:10AF300008002E0C080025880800258808002588B0
68365+:10AF4000080025880800258808002588080025882D
68366+:10AF5000080025880800258808002588080025881D
68367+:10AF6000080025880800258808002588080029A8E9
68368+:10AF7000080025880800258808002E680800258814
68369+:10AF800008002588080025880800258808002588ED
68370+:10AF900008002588080025880800258808002588DD
68371+:10AFA00008002588080025880800258808002588CD
68372+:10AFB00008002588080025880800258808002588BD
68373+:10AFC00008002CF4080025880800258808002C6853
68374+:10AFD00008002BC408003CE408003CB808003C848E
68375+:10AFE00008003C5808003C3808003BEC8008010091
68376+:10AFF00080080080800800008008008008004C6401
68377+:10B0000008004C9C08004BE408004C6408004C64A9
68378+:10B01000080049B808004C64080050500A000C842D
68379+:10B0200000000000000000000000000D7278703683
68380+:10B030002E322E31620000000602010300000000E3
68381+:10B0400000000001000000000000000000000000FF
68382+:10B0500000000000000000000000000000000000F0
68383+:10B0600000000000000000000000000000000000E0
68384+:10B0700000000000000000000000000000000000D0
68385+:10B0800000000000000000000000000000000000C0
68386+:10B0900000000000000000000000000000000000B0
68387+:10B0A00000000000000000000000000000000000A0
68388+:10B0B0000000000000000000000000000000000090
68389+:10B0C0000000000000000000000000000000000080
68390+:10B0D0000000000000000000000000000000000070
68391+:10B0E0000000000000000000000000000000000060
68392+:10B0F0000000000000000000000000000000000050
68393+:10B10000000000000000000000000000000000003F
68394+:10B11000000000000000000000000000000000002F
68395+:10B12000000000000000000000000000000000001F
68396+:10B13000000000000000000000000000000000000F
68397+:10B1400000000000000000000000000000000000FF
68398+:10B1500000000000000000000000000000000000EF
68399+:10B1600000000000000000000000000000000000DF
68400+:10B1700000000000000000000000000000000000CF
68401+:10B1800000000000000000000000000000000000BF
68402+:10B1900000000000000000000000000000000000AF
68403+:10B1A000000000000000000000000000000000009F
68404+:10B1B000000000000000000000000000000000008F
68405+:10B1C000000000000000000000000000000000007F
68406+:10B1D000000000000000000000000000000000006F
68407+:10B1E000000000000000000000000000000000005F
68408+:10B1F000000000000000000000000000000000004F
68409+:10B20000000000000000000000000000000000003E
68410+:10B21000000000000000000000000000000000002E
68411+:10B22000000000000000000000000000000000001E
68412+:10B23000000000000000000000000000000000000E
68413+:10B2400000000000000000000000000000000000FE
68414+:10B2500000000000000000000000000000000000EE
68415+:10B2600000000000000000000000000000000000DE
68416+:10B2700000000000000000000000000000000000CE
68417+:10B2800000000000000000000000000000000000BE
68418+:10B2900000000000000000000000000000000000AE
68419+:10B2A000000000000000000000000000000000009E
68420+:10B2B000000000000000000000000000000000008E
68421+:10B2C000000000000000000000000000000000007E
68422+:10B2D000000000000000000000000000000000006E
68423+:10B2E000000000000000000000000000000000005E
68424+:10B2F000000000000000000000000000000000004E
68425+:10B30000000000000000000000000000000000003D
68426+:10B31000000000000000000000000000000000002D
68427+:10B32000000000000000000000000000000000001D
68428+:10B33000000000000000000000000000000000000D
68429+:10B3400000000000000000000000000000000000FD
68430+:10B3500000000000000000000000000000000000ED
68431+:10B3600000000000000000000000000000000000DD
68432+:10B3700000000000000000000000000000000000CD
68433+:10B3800000000000000000000000000000000000BD
68434+:10B3900000000000000000000000000000000000AD
68435+:10B3A000000000000000000000000000000000009D
68436+:10B3B000000000000000000000000000000000008D
68437+:10B3C000000000000000000000000000000000007D
68438+:10B3D000000000000000000000000000000000006D
68439+:10B3E000000000000000000000000000000000005D
68440+:10B3F000000000000000000000000000000000004D
68441+:10B40000000000000000000000000000000000003C
68442+:10B41000000000000000000000000000000000002C
68443+:10B42000000000000000000000000000000000001C
68444+:10B43000000000000000000000000000000000000C
68445+:10B4400000000000000000000000000000000000FC
68446+:10B4500000000000000000000000000000000000EC
68447+:10B4600000000000000000000000000000000000DC
68448+:10B4700000000000000000000000000000000000CC
68449+:10B4800000000000000000000000000000000000BC
68450+:10B4900000000000000000000000000000000000AC
68451+:10B4A000000000000000000000000000000000009C
68452+:10B4B000000000000000000000000000000000008C
68453+:10B4C000000000000000000000000000000000007C
68454+:10B4D000000000000000000000000000000000006C
68455+:10B4E000000000000000000000000000000000005C
68456+:10B4F000000000000000000000000000000000004C
68457+:10B50000000000000000000000000000000000003B
68458+:10B51000000000000000000000000000000000002B
68459+:10B52000000000000000000000000000000000001B
68460+:10B53000000000000000000000000000000000000B
68461+:10B5400000000000000000000000000000000000FB
68462+:10B5500000000000000000000000000000000000EB
68463+:10B5600000000000000000000000000000000000DB
68464+:10B5700000000000000000000000000000000000CB
68465+:10B5800000000000000000000000000000000000BB
68466+:10B5900000000000000000000000000000000000AB
68467+:10B5A000000000000000000000000000000000009B
68468+:10B5B000000000000000000000000000000000008B
68469+:10B5C000000000000000000000000000000000007B
68470+:10B5D000000000000000000000000000000000006B
68471+:10B5E000000000000000000000000000000000005B
68472+:10B5F000000000000000000000000000000000004B
68473+:10B60000000000000000000000000000000000003A
68474+:10B61000000000000000000000000000000000002A
68475+:10B62000000000000000000000000000000000001A
68476+:10B63000000000000000000000000000000000000A
68477+:10B6400000000000000000000000000000000000FA
68478+:10B6500000000000000000000000000000000000EA
68479+:10B6600000000000000000000000000000000000DA
68480+:10B6700000000000000000000000000000000000CA
68481+:10B6800000000000000000000000000000000000BA
68482+:10B6900000000000000000000000000000000000AA
68483+:10B6A000000000000000000000000000000000009A
68484+:10B6B000000000000000000000000000000000008A
68485+:10B6C000000000000000000000000000000000007A
68486+:10B6D000000000000000000000000000000000006A
68487+:10B6E000000000000000000000000000000000005A
68488+:10B6F000000000000000000000000000000000004A
68489+:10B700000000000000000000000000000000000039
68490+:10B710000000000000000000000000000000000029
68491+:10B720000000000000000000000000000000000019
68492+:10B730000000000000000000000000000000000009
68493+:10B7400000000000000000000000000000000000F9
68494+:10B7500000000000000000000000000000000000E9
68495+:10B7600000000000000000000000000000000000D9
68496+:10B7700000000000000000000000000000000000C9
68497+:10B7800000000000000000000000000000000000B9
68498+:10B7900000000000000000000000000000000000A9
68499+:10B7A0000000000000000000000000000000000099
68500+:10B7B0000000000000000000000000000000000089
68501+:10B7C0000000000000000000000000000000000079
68502+:10B7D0000000000000000000000000000000000069
68503+:10B7E0000000000000000000000000000000000059
68504+:10B7F0000000000000000000000000000000000049
68505+:10B800000000000000000000000000000000000038
68506+:10B810000000000000000000000000000000000028
68507+:10B820000000000000000000000000000000000018
68508+:10B830000000000000000000000000000000000008
68509+:10B8400000000000000000000000000000000000F8
68510+:10B8500000000000000000000000000000000000E8
68511+:10B8600000000000000000000000000000000000D8
68512+:10B8700000000000000000000000000000000000C8
68513+:10B8800000000000000000000000000000000000B8
68514+:10B8900000000000000000000000000000000000A8
68515+:10B8A0000000000000000000000000000000000098
68516+:10B8B0000000000000000000000000000000000088
68517+:10B8C0000000000000000000000000000000000078
68518+:10B8D0000000000000000000000000000000000068
68519+:10B8E0000000000000000000000000000000000058
68520+:10B8F0000000000000000000000000000000000048
68521+:10B900000000000000000000000000000000000037
68522+:10B910000000000000000000000000000000000027
68523+:10B920000000000000000000000000000000000017
68524+:10B930000000000000000000000000000000000007
68525+:10B9400000000000000000000000000000000000F7
68526+:10B9500000000000000000000000000000000000E7
68527+:10B9600000000000000000000000000000000000D7
68528+:10B9700000000000000000000000000000000000C7
68529+:10B9800000000000000000000000000000000000B7
68530+:10B9900000000000000000000000000000000000A7
68531+:10B9A0000000000000000000000000000000000097
68532+:10B9B0000000000000000000000000000000000087
68533+:10B9C0000000000000000000000000000000000077
68534+:10B9D0000000000000000000000000000000000067
68535+:10B9E0000000000000000000000000000000000057
68536+:10B9F0000000000000000000000000000000000047
68537+:10BA00000000000000000000000000000000000036
68538+:10BA10000000000000000000000000000000000026
68539+:10BA20000000000000000000000000000000000016
68540+:10BA30000000000000000000000000000000000006
68541+:10BA400000000000000000000000000000000000F6
68542+:10BA500000000000000000000000000000000000E6
68543+:10BA600000000000000000000000000000000000D6
68544+:10BA700000000000000000000000000000000000C6
68545+:10BA800000000000000000000000000000000000B6
68546+:10BA900000000000000000000000000000000000A6
68547+:10BAA0000000000000000000000000000000000096
68548+:10BAB0000000000000000000000000000000000086
68549+:10BAC0000000000000000000000000000000000076
68550+:10BAD0000000000000000000000000000000000066
68551+:10BAE0000000000000000000000000000000000056
68552+:10BAF0000000000000000000000000000000000046
68553+:10BB00000000000000000000000000000000000035
68554+:10BB10000000000000000000000000000000000025
68555+:10BB20000000000000000000000000000000000015
68556+:10BB30000000000000000000000000000000000005
68557+:10BB400000000000000000000000000000000000F5
68558+:10BB500000000000000000000000000000000000E5
68559+:10BB600000000000000000000000000000000000D5
68560+:10BB700000000000000000000000000000000000C5
68561+:10BB800000000000000000000000000000000000B5
68562+:10BB900000000000000000000000000000000000A5
68563+:10BBA0000000000000000000000000000000000095
68564+:10BBB0000000000000000000000000000000000085
68565+:10BBC0000000000000000000000000000000000075
68566+:10BBD0000000000000000000000000000000000065
68567+:10BBE0000000000000000000000000000000000055
68568+:10BBF0000000000000000000000000000000000045
68569+:10BC00000000000000000000000000000000000034
68570+:10BC10000000000000000000000000000000000024
68571+:10BC20000000000000000000000000000000000014
68572+:10BC30000000000000000000000000000000000004
68573+:10BC400000000000000000000000000000000000F4
68574+:10BC500000000000000000000000000000000000E4
68575+:10BC600000000000000000000000000000000000D4
68576+:10BC700000000000000000000000000000000000C4
68577+:10BC800000000000000000000000000000000000B4
68578+:10BC900000000000000000000000000000000000A4
68579+:10BCA0000000000000000000000000000000000094
68580+:10BCB0000000000000000000000000000000000084
68581+:10BCC0000000000000000000000000000000000074
68582+:10BCD0000000000000000000000000000000000064
68583+:10BCE0000000000000000000000000000000000054
68584+:10BCF0000000000000000000000000000000000044
68585+:10BD00000000000000000000000000000000000033
68586+:10BD10000000000000000000000000000000000023
68587+:10BD20000000000000000000000000000000000013
68588+:10BD30000000000000000000000000000000000003
68589+:10BD400000000000000000000000000000000000F3
68590+:10BD500000000000000000000000000000000000E3
68591+:10BD600000000000000000000000000000000000D3
68592+:10BD700000000000000000000000000000000000C3
68593+:10BD800000000000000000000000000000000000B3
68594+:10BD900000000000000000000000000000000000A3
68595+:10BDA0000000000000000000000000000000000093
68596+:10BDB0000000000000000000000000000000000083
68597+:10BDC0000000000000000000000000000000000073
68598+:10BDD0000000000000000000000000000000000063
68599+:10BDE0000000000000000000000000000000000053
68600+:10BDF0000000000000000000000000000000000043
68601+:10BE00000000000000000000000000000000000032
68602+:10BE10000000000000000000000000000000000022
68603+:10BE20000000000000000000000000000000000012
68604+:10BE30000000000000000000000000000000000002
68605+:10BE400000000000000000000000000000000000F2
68606+:10BE500000000000000000000000000000000000E2
68607+:10BE600000000000000000000000000000000000D2
68608+:10BE700000000000000000000000000000000000C2
68609+:10BE800000000000000000000000000000000000B2
68610+:10BE900000000000000000000000000000000000A2
68611+:10BEA0000000000000000000000000000000000092
68612+:10BEB0000000000000000000000000000000000082
68613+:10BEC0000000000000000000000000000000000072
68614+:10BED0000000000000000000000000000000000062
68615+:10BEE0000000000000000000000000000000000052
68616+:10BEF0000000000000000000000000000000000042
68617+:10BF00000000000000000000000000000000000031
68618+:10BF10000000000000000000000000000000000021
68619+:10BF20000000000000000000000000000000000011
68620+:10BF30000000000000000000000000000000000001
68621+:10BF400000000000000000000000000000000000F1
68622+:10BF500000000000000000000000000000000000E1
68623+:10BF600000000000000000000000000000000000D1
68624+:10BF700000000000000000000000000000000000C1
68625+:10BF800000000000000000000000000000000000B1
68626+:10BF900000000000000000000000000000000000A1
68627+:10BFA0000000000000000000000000000000000091
68628+:10BFB0000000000000000000000000000000000081
68629+:10BFC0000000000000000000000000000000000071
68630+:10BFD0000000000000000000000000000000000061
68631+:10BFE0000000000000000000000000000000000051
68632+:10BFF0000000000000000000000000000000000041
68633+:10C000000000000000000000000000000000000030
68634+:10C010000000000000000000000000000000000020
68635+:10C020000000000000000000000000000000000010
68636+:10C030000000000000000000000000000000000000
68637+:10C0400000000000000000000000000000000000F0
68638+:10C0500000000000000000000000000000000000E0
68639+:10C0600000000000000000000000000000000000D0
68640+:10C0700000000000000000000000000000000000C0
68641+:10C0800000000000000000000000000000000000B0
68642+:10C0900000000000000000000000000000000000A0
68643+:10C0A0000000000000000000000000000000000090
68644+:10C0B0000000000000000000000000000000000080
68645+:10C0C0000000000000000000000000000000000070
68646+:10C0D0000000000000000000000000000000000060
68647+:10C0E0000000000000000000000000000000000050
68648+:10C0F0000000000000000000000000000000000040
68649+:10C10000000000000000000000000000000000002F
68650+:10C11000000000000000000000000000000000001F
68651+:10C12000000000000000000000000000000000000F
68652+:10C1300000000000000000000000000000000000FF
68653+:10C1400000000000000000000000000000000000EF
68654+:10C1500000000000000000000000000000000000DF
68655+:10C1600000000000000000000000000000000000CF
68656+:10C1700000000000000000000000000000000000BF
68657+:10C1800000000000000000000000000000000000AF
68658+:10C19000000000000000000000000000000000009F
68659+:10C1A000000000000000000000000000000000008F
68660+:10C1B000000000000000000000000000000000007F
68661+:10C1C000000000000000000000000000000000006F
68662+:10C1D000000000000000000000000000000000005F
68663+:10C1E000000000000000000000000000000000004F
68664+:10C1F000000000000000000000000000000000003F
68665+:10C20000000000000000000000000000000000002E
68666+:10C21000000000000000000000000000000000001E
68667+:10C22000000000000000000000000000000000000E
68668+:10C2300000000000000000000000000000000000FE
68669+:10C2400000000000000000000000000000000000EE
68670+:10C2500000000000000000000000000000000000DE
68671+:10C2600000000000000000000000000000000000CE
68672+:10C2700000000000000000000000000000000000BE
68673+:10C2800000000000000000000000000000000000AE
68674+:10C29000000000000000000000000000000000009E
68675+:10C2A000000000000000000000000000000000008E
68676+:10C2B000000000000000000000000000000000007E
68677+:10C2C000000000000000000000000000000000006E
68678+:10C2D000000000000000000000000000000000005E
68679+:10C2E000000000000000000000000000000000004E
68680+:10C2F000000000000000000000000000000000003E
68681+:10C30000000000000000000000000000000000002D
68682+:10C31000000000000000000000000000000000001D
68683+:10C32000000000000000000000000000000000000D
68684+:10C3300000000000000000000000000000000000FD
68685+:10C3400000000000000000000000000000000000ED
68686+:10C3500000000000000000000000000000000000DD
68687+:10C3600000000000000000000000000000000000CD
68688+:10C3700000000000000000000000000000000000BD
68689+:10C3800000000000000000000000000000000000AD
68690+:10C39000000000000000000000000000000000009D
68691+:10C3A000000000000000000000000000000000008D
68692+:10C3B000000000000000000000000000000000007D
68693+:10C3C000000000000000000000000000000000006D
68694+:10C3D000000000000000000000000000000000005D
68695+:10C3E000000000000000000000000000000000004D
68696+:10C3F000000000000000000000000000000000003D
68697+:10C40000000000000000000000000000000000002C
68698+:10C41000000000000000000000000000000000001C
68699+:10C42000000000000000000000000000000000000C
68700+:10C4300000000000000000000000000000000000FC
68701+:10C4400000000000000000000000000000000000EC
68702+:10C4500000000000000000000000000000000000DC
68703+:10C4600000000000000000000000000000000000CC
68704+:10C4700000000000000000000000000000000000BC
68705+:10C4800000000000000000000000000000000000AC
68706+:10C49000000000000000000000000000000000009C
68707+:10C4A000000000000000000000000000000000008C
68708+:10C4B000000000000000000000000000000000007C
68709+:10C4C000000000000000000000000000000000006C
68710+:10C4D000000000000000000000000000000000005C
68711+:10C4E000000000000000000000000000000000004C
68712+:10C4F000000000000000000000000000000000003C
68713+:10C50000000000000000000000000000000000002B
68714+:10C51000000000000000000000000000000000001B
68715+:10C52000000000000000000000000000000000000B
68716+:10C5300000000000000000000000000000000000FB
68717+:10C5400000000000000000000000000000000000EB
68718+:10C5500000000000000000000000000000000000DB
68719+:10C5600000000000000000000000000000000000CB
68720+:10C5700000000000000000000000000000000000BB
68721+:10C5800000000000000000000000000000000000AB
68722+:10C59000000000000000000000000000000000009B
68723+:10C5A000000000000000000000000000000000008B
68724+:10C5B000000000000000000000000000000000007B
68725+:10C5C000000000000000000000000000000000006B
68726+:10C5D000000000000000000000000000000000005B
68727+:10C5E000000000000000000000000000000000004B
68728+:10C5F000000000000000000000000000000000003B
68729+:10C60000000000000000000000000000000000002A
68730+:10C61000000000000000000000000000000000001A
68731+:10C62000000000000000000000000000000000000A
68732+:10C6300000000000000000000000000000000000FA
68733+:10C6400000000000000000000000000000000000EA
68734+:10C6500000000000000000000000000000000000DA
68735+:10C6600000000000000000000000000000000000CA
68736+:10C6700000000000000000000000000000000000BA
68737+:10C6800000000000000000000000000000000000AA
68738+:10C69000000000000000000000000000000000009A
68739+:10C6A000000000000000000000000000000000008A
68740+:10C6B000000000000000000000000000000000007A
68741+:10C6C000000000000000000000000000000000006A
68742+:10C6D000000000000000000000000000000000005A
68743+:10C6E000000000000000000000000000000000004A
68744+:10C6F000000000000000000000000000000000003A
68745+:10C700000000000000000000000000000000000029
68746+:10C710000000000000000000000000000000000019
68747+:10C720000000000000000000000000000000000009
68748+:10C7300000000000000000000000000000000000F9
68749+:10C7400000000000000000000000000000000000E9
68750+:10C7500000000000000000000000000000000000D9
68751+:10C7600000000000000000000000000000000000C9
68752+:10C7700000000000000000000000000000000000B9
68753+:10C7800000000000000000000000000000000000A9
68754+:10C790000000000000000000000000000000000099
68755+:10C7A0000000000000000000000000000000000089
68756+:10C7B0000000000000000000000000000000000079
68757+:10C7C0000000000000000000000000000000000069
68758+:10C7D0000000000000000000000000000000000059
68759+:10C7E0000000000000000000000000000000000049
68760+:10C7F0000000000000000000000000000000000039
68761+:10C800000000000000000000000000000000000028
68762+:10C810000000000000000000000000000000000018
68763+:10C820000000000000000000000000000000000008
68764+:10C8300000000000000000000000000000000000F8
68765+:10C8400000000000000000000000000000000000E8
68766+:10C8500000000000000000000000000000000000D8
68767+:10C8600000000000000000000000000000000000C8
68768+:10C8700000000000000000000000000000000000B8
68769+:10C8800000000000000000000000000000000000A8
68770+:10C890000000000000000000000000000000000098
68771+:10C8A0000000000000000000000000000000000088
68772+:10C8B0000000000000000000000000000000000078
68773+:10C8C0000000000000000000000000000000000068
68774+:10C8D0000000000000000000000000000000000058
68775+:10C8E0000000000000000000000000000000000048
68776+:10C8F0000000000000000000000000000000000038
68777+:10C900000000000000000000000000000000000027
68778+:10C910000000000000000000000000000000000017
68779+:10C920000000000000000000000000000000000007
68780+:10C9300000000000000000000000000000000000F7
68781+:10C9400000000000000000000000000000000000E7
68782+:10C9500000000000000000000000000000000000D7
68783+:10C9600000000000000000000000000000000000C7
68784+:10C9700000000000000000000000000000000000B7
68785+:10C9800000000000000000000000000000000000A7
68786+:10C990000000000000000000000000000000000097
68787+:10C9A0000000000000000000000000000000000087
68788+:10C9B0000000000000000000000000000000000077
68789+:10C9C0000000000000000000000000000000000067
68790+:10C9D0000000000000000000000000000000000057
68791+:10C9E0000000000000000000000000000000000047
68792+:10C9F0000000000000000000000000000000000037
68793+:10CA00000000000000000000000000000000000026
68794+:10CA10000000000000000000000000000000000016
68795+:10CA20000000000000000000000000000000000006
68796+:10CA300000000000000000000000000000000000F6
68797+:10CA400000000000000000000000000000000000E6
68798+:10CA500000000000000000000000000000000000D6
68799+:10CA600000000000000000000000000000000000C6
68800+:10CA700000000000000000000000000000000000B6
68801+:10CA800000000000000000000000000000000000A6
68802+:10CA90000000000000000000000000000000000096
68803+:10CAA0000000000000000000000000000000000086
68804+:10CAB0000000000000000000000000000000000076
68805+:10CAC0000000000000000000000000000000000066
68806+:10CAD0000000000000000000000000000000000056
68807+:10CAE0000000000000000000000000000000000046
68808+:10CAF0000000000000000000000000000000000036
68809+:10CB00000000000000000000000000000000000025
68810+:10CB10000000000000000000000000000000000015
68811+:10CB20000000000000000000000000000000000005
68812+:10CB300000000000000000000000000000000000F5
68813+:10CB400000000000000000000000000000000000E5
68814+:10CB500000000000000000000000000000000000D5
68815+:10CB600000000000000000000000000000000000C5
68816+:10CB700000000000000000000000000000000000B5
68817+:10CB800000000000000000000000000000000000A5
68818+:10CB90000000000000000000000000000000000095
68819+:10CBA0000000000000000000000000000000000085
68820+:10CBB0000000000000000000000000000000000075
68821+:10CBC0000000000000000000000000000000000065
68822+:10CBD0000000000000000000000000000000000055
68823+:10CBE0000000000000000000000000000000000045
68824+:10CBF0000000000000000000000000000000000035
68825+:10CC00000000000000000000000000000000000024
68826+:10CC10000000000000000000000000000000000014
68827+:10CC20000000000000000000000000000000000004
68828+:10CC300000000000000000000000000000000000F4
68829+:10CC400000000000000000000000000000000000E4
68830+:10CC500000000000000000000000000000000000D4
68831+:10CC600000000000000000000000000000000000C4
68832+:10CC700000000000000000000000000000000000B4
68833+:10CC800000000000000000000000000000000000A4
68834+:10CC90000000000000000000000000000000000094
68835+:10CCA0000000000000000000000000000000000084
68836+:10CCB0000000000000000000000000000000000074
68837+:10CCC0000000000000000000000000000000000064
68838+:10CCD0000000000000000000000000000000000054
68839+:10CCE0000000000000000000000000000000000044
68840+:10CCF0000000000000000000000000000000000034
68841+:10CD00000000000000000000000000000000000023
68842+:10CD10000000000000000000000000000000000013
68843+:10CD20000000000000000000000000000000000003
68844+:10CD300000000000000000000000000000000000F3
68845+:10CD400000000000000000000000000000000000E3
68846+:10CD500000000000000000000000000000000000D3
68847+:10CD600000000000000000000000000000000000C3
68848+:10CD700000000000000000000000000000000000B3
68849+:10CD800000000000000000000000000000000000A3
68850+:10CD90000000000000000000000000000000000093
68851+:10CDA0000000000000000000000000000000000083
68852+:10CDB0000000000000000000000000000000000073
68853+:10CDC0000000000000000000000000000000000063
68854+:10CDD0000000000000000000000000000000000053
68855+:10CDE0000000000000000000000000000000000043
68856+:10CDF0000000000000000000000000000000000033
68857+:10CE00000000000000000000000000000000000022
68858+:10CE10000000000000000000000000000000000012
68859+:10CE20000000000000000000000000000000000002
68860+:10CE300000000000000000000000000000000000F2
68861+:10CE400000000000000000000000000000000000E2
68862+:10CE500000000000000000000000000000000000D2
68863+:10CE600000000000000000000000000000000000C2
68864+:10CE700000000000000000000000000000000000B2
68865+:10CE800000000000000000000000000000000000A2
68866+:10CE90000000000000000000000000000000000092
68867+:10CEA0000000000000000000000000000000000082
68868+:10CEB0000000000000000000000000000000000072
68869+:10CEC0000000000000000000000000000000000062
68870+:10CED0000000000000000000000000000000000052
68871+:10CEE0000000000000000000000000000000000042
68872+:10CEF0000000000000000000000000000000000032
68873+:10CF00000000000000000000000000000000000021
68874+:10CF10000000000000000000000000000000000011
68875+:10CF20000000000000000000000000000000000001
68876+:10CF300000000000000000000000000000000000F1
68877+:10CF400000000000000000000000000000000000E1
68878+:10CF500000000000000000000000000000000000D1
68879+:10CF600000000000000000000000000000000000C1
68880+:10CF700000000000000000000000000000000000B1
68881+:10CF800000000000000000000000000000000000A1
68882+:10CF90000000000000000000000000000000000091
68883+:10CFA0000000000000000000000000000000000081
68884+:10CFB0000000000000000000000000000000000071
68885+:10CFC0000000000000000000000000000000000061
68886+:10CFD0000000000000000000000000000000000051
68887+:10CFE0000000000000000000000000000000000041
68888+:10CFF0000000000000000000000000000000000031
68889+:10D000000000000000000000000000000000000020
68890+:10D010000000000000000000000000000000000010
68891+:10D020000000000000000000000000000000000000
68892+:10D0300000000000000000000000000000000000F0
68893+:10D0400000000000000000000000000000000000E0
68894+:10D0500000000000000000000000000000000000D0
68895+:10D0600000000000000000000000000000000000C0
68896+:10D0700000000000000000000000000000000000B0
68897+:10D0800000000000000000000000000000000000A0
68898+:10D090000000000000000000000000000000000090
68899+:10D0A0000000000000000000000000000000000080
68900+:10D0B0000000000000000000000000000000000070
68901+:10D0C0000000000000000000000000000000000060
68902+:10D0D0000000000000000000000000000000000050
68903+:10D0E0000000000000000000000000000000000040
68904+:10D0F0000000000000000000000000000000000030
68905+:10D10000000000000000000000000000000000001F
68906+:10D11000000000000000000000000000000000000F
68907+:10D1200000000000000000000000000000000000FF
68908+:10D1300000000000000000000000000000000000EF
68909+:10D1400000000000000000000000000000000000DF
68910+:10D1500000000000000000000000000000000000CF
68911+:10D1600000000000000000000000000000000000BF
68912+:10D1700000000000000000000000000000000000AF
68913+:10D18000000000000000000000000000000000009F
68914+:10D19000000000000000000000000000000000008F
68915+:10D1A000000000000000000000000000000000007F
68916+:10D1B000000000000000000000000000000000006F
68917+:10D1C000000000000000000000000000000000005F
68918+:10D1D000000000000000000000000000000000004F
68919+:10D1E000000000000000000000000000000000003F
68920+:10D1F000000000000000000000000000000000002F
68921+:10D20000000000000000000000000000000000001E
68922+:10D21000000000000000000000000000000000000E
68923+:10D2200000000000000000000000000000000000FE
68924+:10D2300000000000000000000000000000000000EE
68925+:10D2400000000000000000000000000000000000DE
68926+:10D2500000000000000000000000000000000000CE
68927+:10D2600000000000000000000000000000000000BE
68928+:10D2700000000000000000000000000000000000AE
68929+:10D28000000000000000000000000000000000009E
68930+:10D29000000000000000000000000000000000008E
68931+:10D2A000000000000000000000000000000000007E
68932+:10D2B000000000000000000000000000000000006E
68933+:10D2C000000000000000000000000000000000005E
68934+:10D2D000000000000000000000000000000000004E
68935+:10D2E000000000000000000000000000000000003E
68936+:10D2F000000000000000000000000000000000002E
68937+:10D30000000000000000000000000000000000001D
68938+:10D31000000000000000000000000000000000000D
68939+:10D3200000000000000000000000000000000000FD
68940+:10D3300000000000000000000000000000000000ED
68941+:10D3400000000000000000000000000000000000DD
68942+:10D3500000000000000000000000000000000000CD
68943+:10D3600000000000000000000000000000000000BD
68944+:10D3700000000000000000000000000000000000AD
68945+:10D38000000000000000000000000000000000009D
68946+:10D39000000000000000000000000000000000008D
68947+:10D3A000000000000000000000000000000000007D
68948+:10D3B000000000000000000000000000000000006D
68949+:10D3C000000000000000000000000000000000005D
68950+:10D3D000000000000000000000000000000000004D
68951+:10D3E000000000000000000000000000000000003D
68952+:10D3F000000000000000000000000000000000002D
68953+:10D40000000000000000000000000000000000001C
68954+:10D41000000000000000000000000000000000000C
68955+:10D4200000000000000000000000000000000000FC
68956+:10D4300000000000000000000000000000000000EC
68957+:10D4400000000000000000000000000000000000DC
68958+:10D4500000000000000000000000000000000000CC
68959+:10D4600000000000000000000000000000000000BC
68960+:10D4700000000000000000000000000000000000AC
68961+:10D48000000000000000000000000000000000009C
68962+:10D49000000000000000000000000000000000008C
68963+:10D4A000000000000000000000000000000000007C
68964+:10D4B000000000000000000000000000000000006C
68965+:10D4C000000000000000000000000000000000005C
68966+:10D4D000000000000000000000000000000000004C
68967+:10D4E000000000000000000000000000000000003C
68968+:10D4F000000000000000000000000000000000002C
68969+:10D50000000000000000000000000000000000001B
68970+:10D51000000000000000000000000000000000000B
68971+:10D5200000000000000000000000000000000000FB
68972+:10D5300000000000000000000000000000000000EB
68973+:10D5400000000000000000000000000000000000DB
68974+:10D5500000000000000000000000000000000000CB
68975+:10D5600000000000000000000000000000000000BB
68976+:10D5700000000000000000000000000000000000AB
68977+:10D58000000000000000000000000000000000009B
68978+:10D59000000000000000000000000000000000008B
68979+:10D5A000000000000000000000000000000000007B
68980+:10D5B000000000000000000000000000000000006B
68981+:10D5C000000000000000000000000000000000005B
68982+:10D5D000000000000000000000000000000000004B
68983+:10D5E000000000000000000000000000000000003B
68984+:10D5F000000000000000000000000000000000002B
68985+:10D60000000000000000000000000000000000001A
68986+:10D61000000000000000000000000000000000000A
68987+:10D6200000000000000000000000000000000000FA
68988+:10D6300000000000000000000000000000000000EA
68989+:10D6400000000000000000000000000000000000DA
68990+:10D6500000000000000000000000000000000000CA
68991+:10D6600000000000000000000000000000000000BA
68992+:10D6700000000000000000000000000000000000AA
68993+:10D68000000000000000000000000000000000009A
68994+:10D69000000000000000000000000000000000008A
68995+:10D6A000000000000000000000000000000000007A
68996+:10D6B000000000000000000000000000000000006A
68997+:10D6C000000000000000000000000000000000005A
68998+:10D6D000000000000000000000000000000000004A
68999+:10D6E000000000000000000000000000000000003A
69000+:10D6F000000000000000000000000000000000002A
69001+:10D700000000000000000000000000000000000019
69002+:10D710000000000000000000000000000000000009
69003+:10D7200000000000000000000000000000000000F9
69004+:10D7300000000000000000000000000000000000E9
69005+:10D7400000000000000000000000000000000000D9
69006+:10D7500000000000000000000000000000000000C9
69007+:10D7600000000000000000000000000000000000B9
69008+:10D7700000000000000000000000000000000000A9
69009+:10D780000000000000000000000000000000000099
69010+:10D790000000000000000000000000000000000089
69011+:10D7A0000000000000000000000000000000000079
69012+:10D7B0000000000000000000000000000000000069
69013+:10D7C0000000000000000000000000000000000059
69014+:10D7D0000000000000000000000000000000000049
69015+:10D7E0000000000000000000000000000000000039
69016+:10D7F0000000000000000000000000000000000029
69017+:10D800000000000000000000000000000000000018
69018+:10D810000000000000000000000000000000000008
69019+:10D8200000000000000000000000000000000000F8
69020+:10D8300000000000000000000000000000000000E8
69021+:10D8400000000000000000000000000000000000D8
69022+:10D8500000000000000000000000000000000000C8
69023+:10D8600000000000000000000000000000000000B8
69024+:10D8700000000000000000000000000000000000A8
69025+:10D880000000000000000000000000000000000098
69026+:10D890000000000000000000000000000000000088
69027+:10D8A0000000000000000000000000000000000078
69028+:10D8B0000000000000000000000000000000000068
69029+:10D8C0000000000000000000000000000000000058
69030+:10D8D0000000000000000000000000000000000048
69031+:10D8E0000000000000000000000000000000000038
69032+:10D8F0000000000000000000000000000000000028
69033+:10D900000000000000000000000000000000000017
69034+:10D910000000000000000000000000000000000007
69035+:10D9200000000000000000000000000000000000F7
69036+:10D9300000000000000000000000000000000000E7
69037+:10D9400000000000000000000000000000000000D7
69038+:10D9500000000000000000000000000000000000C7
69039+:10D9600000000000000000000000000000000000B7
69040+:10D9700000000000000000000000000000000000A7
69041+:10D980000000000000000000000000000000000097
69042+:10D990000000000000000000000000000000000087
69043+:10D9A0000000000000000000000000000000000077
69044+:10D9B0000000000000000000000000000000000067
69045+:10D9C0000000000000000000000000000000000057
69046+:10D9D0000000000000000000000000000000000047
69047+:10D9E0000000000000000000000000000000000037
69048+:10D9F0000000000000000000000000000000000027
69049+:10DA00000000000000000000000000000000000016
69050+:10DA10000000000000000000000000000000000006
69051+:10DA200000000000000000000000000000000000F6
69052+:10DA300000000000000000000000000000000000E6
69053+:10DA400000000000000000000000000000000000D6
69054+:10DA500000000000000000000000000000000000C6
69055+:10DA600000000000000000000000000000000000B6
69056+:10DA700000000000000000000000000000000000A6
69057+:10DA80000000000000000000000000000000000096
69058+:10DA90000000000000000000000000000000000086
69059+:10DAA0000000000000000000000000000000000076
69060+:10DAB0000000000000000000000000000000000066
69061+:10DAC0000000000000000000000000000000000056
69062+:10DAD0000000000000000000000000000000000046
69063+:10DAE0000000000000000000000000000000000036
69064+:10DAF0000000000000000000000000000000000026
69065+:10DB00000000000000000000000000000000000015
69066+:10DB10000000000000000000000000000000000005
69067+:10DB200000000000000000000000000000000000F5
69068+:10DB300000000000000000000000000000000000E5
69069+:10DB400000000000000000000000000000000000D5
69070+:10DB500000000000000000000000000000000000C5
69071+:10DB600000000000000000000000000000000000B5
69072+:10DB700000000000000000000000000000000000A5
69073+:10DB80000000000000000000000000000000000095
69074+:10DB90000000000000000000000000000000000085
69075+:10DBA0000000000000000000000000000000000075
69076+:10DBB0000000000000000000000000000000000065
69077+:10DBC0000000000000000000000000000000000055
69078+:10DBD0000000000000000000000000000000000045
69079+:10DBE0000000000000000000000000000000000035
69080+:10DBF0000000000000000000000000000000000025
69081+:10DC00000000000000000000000000000000000014
69082+:10DC10000000000000000000000000000000000004
69083+:10DC200000000000000000000000000000000000F4
69084+:10DC300000000000000000000000000000000000E4
69085+:10DC400000000000000000000000000000000000D4
69086+:10DC500000000000000000000000000000000000C4
69087+:10DC600000000000000000000000000000000000B4
69088+:10DC700000000000000000000000000000000000A4
69089+:10DC80000000000000000000000000000000000094
69090+:10DC90000000000000000000000000000000000084
69091+:10DCA0000000000000000000000000000000000074
69092+:10DCB0000000000000000000000000000000000064
69093+:10DCC0000000000000000000000000000000000054
69094+:10DCD0000000000000000000000000000000000044
69095+:10DCE0000000000000000000000000000000000034
69096+:10DCF0000000000000000000000000000000000024
69097+:10DD00000000000000000000000000000000000013
69098+:10DD10000000000000000000000000000000000003
69099+:10DD200000000000000000000000000000000000F3
69100+:10DD300000000000000000000000000000000000E3
69101+:10DD400000000000000000000000000000000000D3
69102+:10DD500000000000000000000000000000000000C3
69103+:10DD600000000000000000000000000000000000B3
69104+:10DD700000000000000000000000000000000000A3
69105+:10DD80000000000000000000000000000000000093
69106+:10DD90000000000000000000000000000000000083
69107+:10DDA0000000000000000000000000000000000073
69108+:10DDB0000000000000000000000000000000000063
69109+:10DDC0000000000000000000000000000000000053
69110+:10DDD0000000000000000000000000000000000043
69111+:10DDE0000000000000000000000000000000000033
69112+:10DDF0000000000000000000000000000000000023
69113+:10DE00000000000000000000000000000000000012
69114+:10DE10000000000000000000000000000000000002
69115+:10DE200000000000000000000000000000000000F2
69116+:10DE300000000000000000000000000000000000E2
69117+:10DE400000000000000000000000000000000000D2
69118+:10DE500000000000000000000000000000000000C2
69119+:10DE600000000000000000000000000000000000B2
69120+:10DE700000000000000000000000000000000000A2
69121+:10DE80000000000000000000000000000000000092
69122+:10DE90000000000000000000000000000000000082
69123+:10DEA0000000000000000000000000000000000072
69124+:10DEB0000000000000000000000000000000000062
69125+:10DEC0000000000000000000000000000000000052
69126+:10DED0000000000000000000000000000000000042
69127+:10DEE0000000000000000000000000000000000032
69128+:10DEF0000000000000000000000000000000000022
69129+:10DF00000000000000000000000000000000000011
69130+:10DF10000000000000000000000000000000000001
69131+:10DF200000000000000000000000000000000000F1
69132+:10DF300000000000000000000000000000000000E1
69133+:10DF400000000000000000000000000000000000D1
69134+:10DF500000000000000000000000000000000000C1
69135+:10DF600000000000000000000000000000000000B1
69136+:10DF700000000000000000000000000000000000A1
69137+:10DF80000000000000000000000000000000000091
69138+:10DF90000000000000000000000000000000000081
69139+:10DFA0000000000000000000000000000000000071
69140+:10DFB0000000000000000000000000000000000061
69141+:10DFC0000000000000000000000000000000000051
69142+:10DFD0000000000000000000000000000000000041
69143+:10DFE0000000000000000000000000000000000031
69144+:10DFF0000000000000000000000000000000000021
69145+:10E000000000000000000000000000000000000010
69146+:10E010000000000000000000000000000000000000
69147+:10E0200000000000000000000000000000000000F0
69148+:10E0300000000000000000000000000000000000E0
69149+:10E0400000000000000000000000000000000000D0
69150+:10E0500000000000000000000000000000000000C0
69151+:10E0600000000000000000000000000000000000B0
69152+:10E0700000000000000000000000000000000000A0
69153+:10E080000000000000000000000000000000000090
69154+:10E090000000000000000000000000000000000080
69155+:10E0A0000000000000000000000000000000000070
69156+:10E0B0000000000000000000000000000000000060
69157+:10E0C0000000000000000000000000000000000050
69158+:10E0D0000000000000000000000000000000000040
69159+:10E0E0000000000000000000000000000000000030
69160+:10E0F0000000000000000000000000000000000020
69161+:10E10000000000000000000000000000000000000F
69162+:10E1100000000000000000000000000000000000FF
69163+:10E1200000000000000000000000000000000000EF
69164+:10E1300000000000000000000000000000000000DF
69165+:10E1400000000000000000000000000000000000CF
69166+:10E1500000000000000000000000000000000000BF
69167+:10E1600000000000000000000000000000000000AF
69168+:10E17000000000000000000000000000000000009F
69169+:10E18000000000000000000000000000000000008F
69170+:10E19000000000000000000000000000000000007F
69171+:10E1A000000000000000000000000000000000006F
69172+:10E1B000000000000000000000000000000000005F
69173+:10E1C000000000000000000000000000000000004F
69174+:10E1D000000000000000000000000000000000003F
69175+:10E1E000000000000000000000000000000000002F
69176+:10E1F000000000000000000000000000000000809F
69177+:10E20000000000000000000000000000000000000E
69178+:10E2100000000000000000000000000000000000FE
69179+:10E220000000000A000000000000000000000000E4
69180+:10E2300010000003000000000000000D0000000DB1
69181+:10E240003C020801244295C03C030801246397FC6A
69182+:10E25000AC4000000043202B1480FFFD244200044A
69183+:10E260003C1D080037BD9FFC03A0F0213C100800B6
69184+:10E27000261032103C1C0801279C95C00E0012BECF
69185+:10E28000000000000000000D3C02800030A5FFFFF0
69186+:10E2900030C600FF344301803C0880008D0901B87E
69187+:10E2A0000520FFFE00000000AC6400002404000212
69188+:10E2B000A4650008A066000AA064000BAC67001803
69189+:10E2C0003C03100003E00008AD0301B83C0560000A
69190+:10E2D0008CA24FF80440FFFE00000000ACA44FC029
69191+:10E2E0003C0310003C040200ACA44FC403E000084F
69192+:10E2F000ACA34FF89486000C00A050212488001491
69193+:10E3000000062B0200051080004448210109182B4B
69194+:10E310001060001100000000910300002C6400094F
69195+:10E320005080000991190001000360803C0D080134
69196+:10E3300025AD9258018D58218D67000000E000083E
69197+:10E340000000000091190001011940210109302B42
69198+:10E3500054C0FFF29103000003E000080000102108
69199+:10E360000A000CCC25080001910F0001240E000AC0
69200+:10E3700015EE00400128C8232F38000A1700003D81
69201+:10E38000250D00028D580000250F0006370E0100F4
69202+:10E39000AD4E0000910C000291AB000191A400026F
69203+:10E3A00091A60003000C2E00000B3C0000A71025D6
69204+:10E3B00000041A000043C8250326C025AD580004F8
69205+:10E3C000910E000691ED000191E7000291E5000336
69206+:10E3D000000E5E00000D6400016C30250007220075
69207+:10E3E00000C41025004518252508000A0A000CCC99
69208+:10E3F000AD430008910F000125040002240800022B
69209+:10E4000055E80001012020210A000CCC00804021A9
69210+:10E41000910C0001240B0003158B00160000000076
69211+:10E420008D580000910E000225080003370D0008EA
69212+:10E43000A14E00100A000CCCAD4D00009119000156
69213+:10E44000240F0004172F000B0000000091070002AA
69214+:10E45000910400038D43000000072A0000A410254A
69215+:10E460003466000425080004AD42000C0A000CCC00
69216+:10E47000AD46000003E000082402000127BDFFE8CC
69217+:10E48000AFBF0014AFB000100E00164E0080802108
69218+:10E490003C0480083485008090A600052403FFFE1C
69219+:10E4A0000200202100C310248FBF00148FB0001081
69220+:10E4B000A0A200050A00165827BD001827BDFFE8D6
69221+:10E4C000AFB00010AFBF00140E000FD40080802149
69222+:10E4D0003C06800834C5008090A40000240200504F
69223+:10E4E000308300FF106200073C09800002002021F9
69224+:10E4F0008FBF00148FB00010AD2001800A00108F74
69225+:10E5000027BD0018240801003C07800002002021DC
69226+:10E510008FBF00148FB00010ACE801800A00108F8C
69227+:10E5200027BD001827BDFF783C058008AFBE0080DE
69228+:10E53000AFB7007CAFB3006CAFB10064AFBF008475
69229+:10E54000AFB60078AFB50074AFB40070AFB200687A
69230+:10E55000AFB0006034A600803C0580008CB201287A
69231+:10E5600090C400098CA701043C020001309100FF17
69232+:10E5700000E218240000B8210000F021106000071C
69233+:10E58000000098213C0908008D2931F02413000176
69234+:10E59000252800013C010800AC2831F0ACA0008423
69235+:10E5A00090CC0005000C5827316A0001154000721C
69236+:10E5B000AFA0005090CD00002406002031A400FF41
69237+:10E5C00010860018240E0050108E009300000000EA
69238+:10E5D0003C1008008E1000DC260F00013C010800F2
69239+:10E5E000AC2F00DC0E0016C7000000000040182110
69240+:10E5F0008FBF00848FBE00808FB7007C8FB60078FD
69241+:10E600008FB500748FB400708FB3006C8FB2006848
69242+:10E610008FB100648FB000600060102103E000083B
69243+:10E6200027BD00880000000D3C1F8000AFA0003017
69244+:10E6300097E501168FE201043C04002030B9FFFF8A
69245+:10E64000004438240007182B00033140AFA60030E7
69246+:10E650008FF5010437F80C003C1600400338802188
69247+:10E6600002B6A02434C40040128000479215000D69
69248+:10E6700032A800201500000234860080008030217E
69249+:10E6800014C0009FAFA600303C0D800835A6008066
69250+:10E6900090CC0008318B0040516000063C06800899
69251+:10E6A000240E0004122E00A8240F0012122F003294
69252+:10E6B0003C06800834C401003C0280009447011AE3
69253+:10E6C0009619000E909F00088E18000830E3FFFF97
69254+:10E6D00003F9B00432B40004AFB6005CAFA3005835
69255+:10E6E0008E1600041280002EAFB8005434C3008090
69256+:10E6F000906800083105004014A0002500000000CB
69257+:10E700008C70005002D090230640000500000000ED
69258+:10E710008C71003402D1A82306A201678EE20008A2
69259+:10E72000126000063C1280003C1508008EB531F4E2
69260+:10E7300026B600013C010800AC3631F4AE4000447E
69261+:10E74000240300018FBF00848FBE00808FB7007C40
69262+:10E750008FB600788FB500748FB400708FB3006CE3
69263+:10E760008FB200688FB100648FB00060006010212C
69264+:10E7700003E0000827BD00880E000D2800002021BE
69265+:10E780000A000D75004018210A000D9500C02021D7
69266+:10E790000E00171702C020211440FFE10000000006
69267+:10E7A0003C0B8008356400808C8A003402CA482300
69268+:10E7B0000520001D000000003C1E08008FDE310017
69269+:10E7C00027D700013C010800AC3731001260000679
69270+:10E7D000024020213C1408008E9431F42690000160
69271+:10E7E0003C010800AC3031F40E00164E3C1E80088F
69272+:10E7F00037CD008091B700250240202136EE00047D
69273+:10E800000E001658A1AE00250E000CAC02402021CF
69274+:10E810000A000DCA240300013C17080126F796C020
69275+:10E820000A000D843C1F80008C86003002C66023E5
69276+:10E830001980000C2419000C908F004F3C14080024
69277+:10E840008E94310032B500FC35ED0001268E0001BA
69278+:10E850003C010800AC2E3100A08D004FAFA0005845
69279+:10E860002419000CAFB900308C9800300316A02397
69280+:10E870001A80010B8FA300580074F82A17E0FFD309
69281+:10E88000000000001074002A8FA5005802D4B021A7
69282+:10E8900000B410233044FFFFAFA4005832A8000298
69283+:10E8A0001100002E32AB00103C15800836B00080FD
69284+:10E8B0009216000832D30040526000FB8EE200083E
69285+:10E8C0000E00164E02402021240A0018A20A000958
69286+:10E8D000921100052409FFFE024020210229902404
69287+:10E8E0000E001658A2120005240400390000282149
69288+:10E8F0000E0016F2240600180A000DCA24030001B7
69289+:10E9000092FE000C3C0A800835490080001EBB00C6
69290+:10E910008D27003836F10081024020213225F08118
69291+:10E920000E000C9B30C600FF0A000DC10000000065
69292+:10E930003AA7000130E300011460FFA402D4B02123
69293+:10E940000A000E1D00000000024020210E001734B6
69294+:10E95000020028210A000D75004018211160FF7087
69295+:10E960003C0F80083C0D800835EE00808DC40038D7
69296+:10E970008FA300548DA60004006660231D80FF68ED
69297+:10E98000000000000064C02307020001AFA400548F
69298+:10E990003C1F08008FFF31E433F9000113200015FC
69299+:10E9A0008FAC00583C07800094E3011A10600012FD
69300+:10E9B0003C0680080E00216A024020213C03080129
69301+:10E9C000906396F13064000214800145000000005D
69302+:10E9D000306C0004118000078FAC0058306600FBDB
69303+:10E9E0003C010801A02696F132B500FCAFA000580A
69304+:10E9F0008FAC00583C06800834D30080AFB40018B8
69305+:10EA0000AFB60010AFAC00143C088000950B01209D
69306+:10EA10008E6F0030966A005C8FA3005C8FBF003061
69307+:10EA20003169FFFF3144FFFF8FAE005401341021E4
69308+:10EA3000350540000064382B0045C82103E7C02598
69309+:10EA4000AFB90020AFAF0028AFB80030AFAF00249F
69310+:10EA5000AFA0002CAFAE0034926D000831B40008B6
69311+:10EA6000168000BB020020218EE200040040F8095D
69312+:10EA700027A400108FAF003031F300025660000170
69313+:10EA800032B500FE3C048008349F008093F90008F2
69314+:10EA900033380040530000138FA400248C850004F9
69315+:10EAA0008FA7005410A700D52404001432B0000131
69316+:10EAB0001200000C8FA400242414000C1234011A3C
69317+:10EAC0002A2D000D11A001022413000E240E000AAD
69318+:10EAD000522E0001241E00088FAF002425E40001FF
69319+:10EAE000AFA400248FAA00143C0B80083565008079
69320+:10EAF000008A48218CB10030ACA9003090A4004EAF
69321+:10EB00008CA700303408FFFF0088180400E3F821C8
69322+:10EB1000ACBF00348FA600308FB900548FB8005CB2
69323+:10EB200030C200081040000B033898218CAC002044
69324+:10EB3000119300D330C600FF92EE000C8FA7003473
69325+:10EB400002402021000E6B0035B400800E000C9BAB
69326+:10EB50003285F0803C028008345000808E0F0030F7
69327+:10EB600001F1302318C00097264800803C070800B8
69328+:10EB70008CE731E42404FF80010418243118007F5D
69329+:10EB80003C1F80003C19800430F10001AFE300908D
69330+:10EB900012200006031928213C030801906396F116
69331+:10EBA00030690008152000C6306A00F73C10800864
69332+:10EBB00036040080908C004F318B000115600042BC
69333+:10EBC000000000003C0608008CC6319830CE0010D2
69334+:10EBD00051C0004230F9000190AF006B55E0003F9A
69335+:10EBE00030F9000124180001A0B8006B3C1180002E
69336+:10EBF0009622007A24470064A48700123C0D800806
69337+:10EC000035A5008090B40008329000401600000442
69338+:10EC10003C03800832AE000115C0008B00000000EC
69339+:10EC2000346400808C86002010D3000A3463010015
69340+:10EC30008C67000002C7782319E000978FBF00544B
69341+:10EC4000AC93002024130001AC760000AFB3005059
69342+:10EC5000AC7F000417C0004E000000008FA90050D8
69343+:10EC60001520000B000000003C030801906396F1A2
69344+:10EC7000306A00011140002E8FAB0058306400FE56
69345+:10EC80003C010801A02496F10A000D75000018212E
69346+:10EC90000E000CAC024020210A000F1300000000FF
69347+:10ECA0000A000E200000A0210040F80924040017EB
69348+:10ECB0000A000DCA240300010040F80924040016CC
69349+:10ECC0000A000DCA240300019094004F240DFFFE9A
69350+:10ECD000028D2824A085004F30F900011320000682
69351+:10ECE0003C0480083C030801906396F1307F0010DB
69352+:10ECF00017E00051306800EF34900080240A0001D2
69353+:10ED0000024020210E00164EA60A00129203002592
69354+:10ED100024090001AFA90050346200010240202103
69355+:10ED20000E001658A20200250A000EF93C0D8008BC
69356+:10ED30001160FE83000018218FA5003030AC000464
69357+:10ED40001180FE2C8FBF00840A000DCB240300012C
69358+:10ED500027A500380E000CB6AFA000385440FF4382
69359+:10ED60008EE200048FB40038329001005200FF3F61
69360+:10ED70008EE200048FA3003C8E6E0058006E682364
69361+:10ED800005A3FF39AE6300580A000E948EE200041A
69362+:10ED90000E00164E024020213C038008346800809B
69363+:10EDA000024020210E001658A11E000903C0302188
69364+:10EDB000240400370E0016F2000028210A000F116B
69365+:10EDC0008FA900508FAB00185960FF8D3C0D800853
69366+:10EDD0000E00164E02402021920C00252405000151
69367+:10EDE000AFA5005035820004024020210E001658C5
69368+:10EDF000A20200250A000EF93C0D800812240059D9
69369+:10EE00002A2300151060004D240900162408000C68
69370+:10EE10005628FF2732B000013C0A8008914C001BA5
69371+:10EE20002406FFBD241E000E01865824A14B001BA2
69372+:10EE30000A000EA532B000013C010801A02896F19D
69373+:10EE40000A000EF93C0D80088CB500308EFE0008DB
69374+:10EE50002404001826B6000103C0F809ACB600303F
69375+:10EE60003C030801906396F13077000116E0FF81C2
69376+:10EE7000306A00018FB200300A000D753243000481
69377+:10EE80003C1080009605011A50A0FF2B34C60010DC
69378+:10EE90000A000EC892EE000C8C6200001456FF6D42
69379+:10EEA000000000008C7800048FB9005403388823D8
69380+:10EEB0000621FF638FBF00540A000F0E0000000000
69381+:10EEC0003C010801A02A96F10A000F3030F9000138
69382+:10EED0001633FF028FAF00240A000EB0241E00106C
69383+:10EEE0000E00164E024020213C0B80083568008041
69384+:10EEF00091090025240A0001AFAA0050353300040F
69385+:10EF0000024020210E001658A11300253C050801DF
69386+:10EF100090A596F130A200FD3C010801A02296F1D7
69387+:10EF20000A000E6D004018212411000E53D1FEEA94
69388+:10EF3000241E00100A000EAF241E00165629FEDC07
69389+:10EF400032B000013C0A8008914C001B2406FFBD32
69390+:10EF5000241E001001865824A14B001B0A000EA598
69391+:10EF600032B000010A000EA4241E00123C038000EF
69392+:10EF70008C6201B80440FFFE24040800AC6401B8B0
69393+:10EF800003E000080000000030A5FFFF30C6FFFFCF
69394+:10EF90003C0780008CE201B80440FFFE34EA0180A7
69395+:10EFA000AD440000ACE400203C0480089483004899
69396+:10EFB0003068FFFF11000016AF88000824AB001274
69397+:10EFC000010B482B512000133C04800034EF01005A
69398+:10EFD00095EE00208F890000240D001A31CCFFFF30
69399+:10EFE00031274000A14D000B10E000362583FFFEC5
69400+:10EFF0000103C02B170000348F9900048F88000490
69401+:10F00000A5430014350700010A001003AF87000470
69402+:10F010003C04800024030003348201808F890000B7
69403+:10F020008F870004A043000B3C088000350C018052
69404+:10F03000A585000EA585001A8F85000C30EB800099
69405+:10F04000A5890010AD850028A58600081160000F75
69406+:10F050008F85001435190100972A00163158FFFCDE
69407+:10F06000270F000401E870218DCD400031A6FFFF7D
69408+:10F0700014C000072403BFFF3C02FFFF34487FFF9A
69409+:10F0800000E83824AF8700048F8500142403BFFFF5
69410+:10F090003C04800000E3582434830180A46B0026E4
69411+:10F0A000AC69002C10A0000300054C02A465001000
69412+:10F0B000A46900263C071000AC8701B803E00008F3
69413+:10F0C000000000008F990004240AFFFE032A382460
69414+:10F0D0000A001003AF87000427BDFFE88FA20028B5
69415+:10F0E00030A5FFFF30C6FFFFAFBF0010AF87000C99
69416+:10F0F000AF820014AF8000040E000FDBAF80000071
69417+:10F100008FBF001027BD001803E00008AF80001477
69418+:10F110003C06800034C4007034C701008C8A0000B3
69419+:10F1200090E500128F84000027BDFFF030A300FFA0
69420+:10F13000000318823082400010400037246500032D
69421+:10F140000005C8800326C0218F0E4000246F0004F4
69422+:10F15000000F6880AFAE000001A660218D8B4000DB
69423+:10F16000AFAB000494E900163128FFFC01063821FA
69424+:10F170008CE64000AFA600088FA9000800003021EF
69425+:10F18000000028213C07080024E701000A0010675E
69426+:10F19000240800089059000024A500012CAC000CA4
69427+:10F1A0000079C0210018788001E770218DCD000022
69428+:10F1B0001180000600CD302603A5102114A8FFF50C
69429+:10F1C00000051A005520FFF4905900003C0480000F
69430+:10F1D000348700703C0508008CA531048CE30000E6
69431+:10F1E0002CA2002010400009006A38230005488046
69432+:10F1F0003C0B0800256B3108012B402124AA00019B
69433+:10F20000AD0700003C010800AC2A310400C0102109
69434+:10F2100003E0000827BD0010308220001040000BE2
69435+:10F2200000055880016648218D24400024680004B0
69436+:10F2300000083880AFA4000000E618218C6540006B
69437+:10F24000AFA000080A001057AFA500040000000D91
69438+:10F250000A0010588FA9000827BDFFE03C07800076
69439+:10F2600034E60100AFBF001CAFB20018AFB100140C
69440+:10F27000AFB0001094C5000E8F87000030A4FFFFD0
69441+:10F280002483000430E2400010400010AF830028C7
69442+:10F290003C09002000E940241100000D30EC800002
69443+:10F2A0008F8A0004240BBFFF00EB38243543100085
69444+:10F2B000AF87000030F220001640000B3C1900041C
69445+:10F2C000241FFFBF0A0010B7007F102430EC80001D
69446+:10F2D000158000423C0E002030F220001240FFF862
69447+:10F2E0008F8300043C19000400F9C0241300FFF5CB
69448+:10F2F000241FFFBF34620040AF82000430E20100EF
69449+:10F300001040001130F010008F83002C10600006B8
69450+:10F310003C0F80003C05002000E52024148000C044
69451+:10F320003C0800043C0F800035EE010095CD001E26
69452+:10F3300095CC001C31AAFFFF000C5C00014B482556
69453+:10F34000AF89000C30F010001200000824110001F9
69454+:10F3500030F100201620008B3C18100000F890249B
69455+:10F36000164000823C040C002411000130E801002A
69456+:10F370001500000B3C0900018F85000430A94000F6
69457+:10F38000152000073C0900013C0C1F0100EC58242B
69458+:10F390003C0A1000116A01183C1080003C09000171
69459+:10F3A00000E9302410C000173C0B10003C18080086
69460+:10F3B0008F1800243307000214E0014024030001E9
69461+:10F3C0008FBF001C8FB200188FB100148FB00010D7
69462+:10F3D0000060102103E0000827BD002000EE682433
69463+:10F3E00011A0FFBE30F220008F8F00043C11FFFF00
69464+:10F3F00036307FFF00F0382435E380000A0010A685
69465+:10F40000AF87000000EB102450400065AF8000245F
69466+:10F410008F8C002C3C0D0F0000ED18241580008807
69467+:10F42000AF83001030E8010011000086938F0010B8
69468+:10F430003C0A0200106A00833C1280003650010032
69469+:10F44000920500139789002A3626000230AF00FF8C
69470+:10F4500025EE0004000E19C03C0480008C9801B811
69471+:10F460000700FFFE34880180AD0300003C198008CE
69472+:10F47000AC830020973100483225FFFF10A0015CCB
69473+:10F48000AF8500082523001200A3F82B53E0015993
69474+:10F490008F850004348D010095AC00202402001AF1
69475+:10F4A00030E44000318BFFFFA102000B108001927D
69476+:10F4B0002563FFFE00A3502B154001908F8F0004A1
69477+:10F4C000A50300148F88000435050001AF850004F2
69478+:10F4D0003C08800035190180A729000EA729001AD1
69479+:10F4E0008F89000C30B18000A7270010AF290028B9
69480+:10F4F000A72600081220000E3C04800035020100FF
69481+:10F50000944C0016318BFFFC256400040088182100
69482+:10F510008C7F400033E6FFFF14C000053C048000F0
69483+:10F520003C0AFFFF354D7FFF00AD2824AF85000466
69484+:10F53000240EBFFF00AE402434850180A4A800261D
69485+:10F54000ACA7002C3C071000AC8701B800001821C4
69486+:10F550008FBF001C8FB200188FB100148FB0001045
69487+:10F560000060102103E0000827BD00203C020BFFD3
69488+:10F5700000E41824345FFFFF03E3C82B5320FF7B14
69489+:10F58000241100013C0608008CC6002C24C5000193
69490+:10F590003C010800AC25002C0A0010D42411000501
69491+:10F5A0008F85002410A0002FAF80001090A30000D2
69492+:10F5B000146000792419000310A0002A30E601002D
69493+:10F5C00010C000CC8F860010241F000210DF00C97D
69494+:10F5D0008F8B000C3C0708008CE7003824E4FFFF09
69495+:10F5E00014E0000201641824000018213C0D0800FA
69496+:10F5F00025AD0038006D1021904C00048F85002847
69497+:10F6000025830004000321C030A5FFFF3626000239
69498+:10F610000E000FDB000000000A00114D0000182151
69499+:10F6200000E8302414C0FF403C0F80000E00103D65
69500+:10F63000000000008F8700000A0010CAAF82000C93
69501+:10F64000938F00103C18080127189640000F90C0B7
69502+:10F6500002588021AF9000248F85002414A0FFD38E
69503+:10F66000AF8F00103C0480008C86400030C5010044
69504+:10F6700010A000BC322300043C0C08008D8C002438
69505+:10F6800024120004106000C23190000D3C04800080
69506+:10F690008C8D40003402FFFF11A201003231FFFBCC
69507+:10F6A0008C884000310A01005540000124110010EF
69508+:10F6B00030EE080011C000BE2419FFFB8F9800280F
69509+:10F6C0002F0F03EF51E000010219802430E90100FF
69510+:10F6D00011200014320800018F87002C14E000FB79
69511+:10F6E0008F8C000C3C05800034AB0100917F00132F
69512+:10F6F00033E300FF246A00042403FFFE0203802496
69513+:10F70000000A21C012000002023230253226FFFF1B
69514+:10F710000E000FDB9785002A1200FF290000182138
69515+:10F72000320800011100000D32180004240E0001FF
69516+:10F73000120E0002023230253226FFFF9785002A82
69517+:10F740000E000FDB00002021240FFFFE020F80249B
69518+:10F750001200FF1B00001821321800045300FF188C
69519+:10F760002403000102323025241200045612000145
69520+:10F770003226FFFF9785002A0E000FDB24040100CC
69521+:10F780002419FFFB021988241220FF0D0000182104
69522+:10F790000A0010E9240300011079009C00003021C8
69523+:10F7A00090AD00012402000211A200BE30EA004028
69524+:10F7B00090B90001241800011338007F30E900409F
69525+:10F7C0008CA600049785002A00C020210E000FDBC4
69526+:10F7D0003626000200004021010018218FBF001CC6
69527+:10F7E0008FB200188FB100148FB00010006010218C
69528+:10F7F00003E0000827BD0020360F010095EE000C45
69529+:10F8000031CD020015A0FEE63C0900013C1880083D
69530+:10F81000971200489789002A362600023248FFFFD7
69531+:10F82000AF8800083C0380008C7101B80620FFFE01
69532+:10F83000346A0180AD4000001100008E3C0F800052
69533+:10F84000253F0012011FC82B1320008B240E00033C
69534+:10F85000346C0100958B00202402001A30E4400033
69535+:10F860003163FFFFA142000B108000A72463FFFE5D
69536+:10F870000103682B15A000A52408FFFE34A5000194
69537+:10F88000A5430014AF8500043C0480002412BFFF90
69538+:10F8900000B2802434850180A4A9000EA4A9001A16
69539+:10F8A000A4A60008A4B00026A4A700103C071000DE
69540+:10F8B000AC8701B80A00114D000018213C038000FC
69541+:10F8C00034640100949F000E3C1908008F3900D861
69542+:10F8D0002404008033E5FFFF273100013C010800CC
69543+:10F8E000AC3100D80E000FDB240600030A00114DD6
69544+:10F8F00000001821240A000210CA00598F85002830
69545+:10F900003C0308008C6300D0240E0001106E005EE2
69546+:10F910002CCF000C24D2FFFC2E5000041600002136
69547+:10F9200000002021241800021078001B2CD9000CA4
69548+:10F9300024DFFFF82FE900041520FF330000202109
69549+:10F9400030EB020051600004000621C054C00022C8
69550+:10F9500030A5FFFF000621C030A5FFFF0A00117D82
69551+:10F96000362600023C0908008D29002431300001B0
69552+:10F970005200FEF7000018219785002A3626000263
69553+:10F980000E000FDB000020210A00114D000018219D
69554+:10F990000A00119C241200021320FFE624DFFFF866
69555+:10F9A0000000202130A5FFFF0A00117D362600024D
69556+:10F9B0000A0011AC021980245120FF828CA6000499
69557+:10F9C0003C05080190A5964110A0FF7E2408000187
69558+:10F9D0000A0011F0010018210E000FDB3226000191
69559+:10F9E0008F8600108F8500280A00124F000621C064
69560+:10F9F0008F8500043C18800024120003371001801A
69561+:10FA0000A212000B0A00112E3C08800090A30001F6
69562+:10FA1000241100011071FF70240800012409000264
69563+:10FA20005069000430E60040240800010A0011F08B
69564+:10FA30000100182150C0FFFD240800013C0C80008B
69565+:10FA4000358B01009563001094A40002307FFFFF06
69566+:10FA5000509FFF62010018210A001284240800014F
69567+:10FA60002CA803EF1100FE56240300010A001239EE
69568+:10FA700000000000240E000335EA0180A14E000BB7
69569+:10FA80000A00121C3C04800011E0FFA2000621C005
69570+:10FA900030A5FFFF0A00117D362600020A0011A5DD
69571+:10FAA000241100201140FFC63C1280003650010096
69572+:10FAB000960F001094AE000231E80FFF15C8FFC08A
69573+:10FAC000000000000A0011E690B900013C060800A1
69574+:10FAD0008CC6003824C4FFFF14C00002018418241F
69575+:10FAE000000018213C0D080025AD0038006D1021E4
69576+:10FAF0000A0011B6904300048F8F0004240EFFFE0D
69577+:10FB00000A00112C01EE28242408FFFE0A00121A14
69578+:10FB100000A8282427BDFFC8AFB00010AFBF003435
69579+:10FB20003C10600CAFBE0030AFB7002CAFB6002861
69580+:10FB3000AFB50024AFB40020AFB3001CAFB20018C3
69581+:10FB4000AFB100148E0E5000240FFF7F3C068000E2
69582+:10FB500001CF682435AC380C240B0003AE0C5000E8
69583+:10FB6000ACCB00083C010800AC2000200E001819A6
69584+:10FB7000000000003C0A0010354980513C06601628
69585+:10FB8000AE09537C8CC700003C0860148D0500A0B2
69586+:10FB90003C03FFFF00E320243C02535300051FC237
69587+:10FBA0001482000634C57C000003A08002869821E0
69588+:10FBB0008E7200043C116000025128218CBF007C31
69589+:10FBC0008CA200783C1E600037C420203C05080150
69590+:10FBD00024A59288AF820018AF9F001C0E0016DD8E
69591+:10FBE0002406000A3C190001273996403C01080010
69592+:10FBF000AC3931DC0E0020DDAF8000148FD708084F
69593+:10FC00002418FFF03C15570902F8B02412D502F56C
69594+:10FC100024040001AF80002C3C1480003697018042
69595+:10FC20003C1E080127DE9644369301008E900000AA
69596+:10FC30003205000310A0FFFD3207000110E000882C
69597+:10FC4000320600028E7100283C048000AE91002034
69598+:10FC50008E6500048E66000000A0382100C040219F
69599+:10FC60008C8301B80460FFFE3C0B0010240A0800DE
69600+:10FC700000AB4824AC8A01B8552000E0240BBFFF3C
69601+:10FC80009675000E3C1208008E52002030AC4000E9
69602+:10FC900032AFFFFF264E000125ED00043C010800B5
69603+:10FCA000AC2E0020118000E8AF8D00283C18002009
69604+:10FCB00000B8B02412C000E530B980002408BFFFAE
69605+:10FCC00000A8382434C81000AF87000030E62000B8
69606+:10FCD00010C000E92409FFBF3C03000400E328240E
69607+:10FCE00010A00002010910243502004030EA010092
69608+:10FCF00011400010AF8200048F8B002C11600007B0
69609+:10FD00003C0D002000ED6024118000043C0F000435
69610+:10FD100000EF702411C00239000000009668001E38
69611+:10FD20009678001C3115FFFF0018B40002B690252C
69612+:10FD3000AF92000C30F910001320001324150001BD
69613+:10FD400030FF002017E0000A3C04100000E41024FB
69614+:10FD50001040000D3C0A0C003C090BFF00EA18247F
69615+:10FD60003525FFFF00A3302B10C0000830ED010047
69616+:10FD70003C0C08008D8C002C24150005258B0001FF
69617+:10FD80003C010800AC2B002C30ED010015A0000B4D
69618+:10FD90003C0500018F85000430AE400055C00007CF
69619+:10FDA0003C0500013C161F0100F690243C0F10009A
69620+:10FDB000124F01CE000000003C05000100E5302498
69621+:10FDC00010C000AF3C0C10003C1F08008FFF002447
69622+:10FDD00033E90002152000712403000100601021A6
69623+:10FDE000104000083C0680003C08800035180100E7
69624+:10FDF0008F0F00243C056020ACAF00140000000011
69625+:10FE00003C0680003C194000ACD9013800000000DD
69626+:10FE10005220001332060002262B0140262C0080BF
69627+:10FE2000240EFF80016E2024018E6824000D1940ED
69628+:10FE3000318A007F0004A9403172007F3C16200007
69629+:10FE400036C20002006A482502B2382500E2882541
69630+:10FE50000122F825ACDF0830ACD1083032060002B0
69631+:10FE600010C0FF723C188000370501408CA80000CC
69632+:10FE700024100040AF08002090AF000831E300706C
69633+:10FE8000107000D428790041532000082405006038
69634+:10FE9000241100201071000E3C0A40003C09800033
69635+:10FEA000AD2A01780A001304000000001465FFFB6E
69636+:10FEB0003C0A40000E001FFA000000003C0A40000F
69637+:10FEC0003C098000AD2A01780A00130400000000FC
69638+:10FED00090A90009241F00048CA70000312800FF0E
69639+:10FEE000111F01B22503FFFA2C7200061240001404
69640+:10FEF0003C0680008CA9000494A4000A310500FF90
69641+:10FF000000095E022D6A00083086FFFF15400002DE
69642+:10FF10002567000424070003240C000910AC01FA33
69643+:10FF200028AD000A11A001DE2410000A240E0008EA
69644+:10FF300010AE0028000731C000C038213C06800008
69645+:10FF40008CD501B806A0FFFE34D20180AE47000078
69646+:10FF500034CB0140916E0008240300023C0A4000AB
69647+:10FF600031C400FF00046A0001A86025A64C000807
69648+:10FF7000A243000B9562000A3C0810003C09800077
69649+:10FF8000A64200108D670004AE470024ACC801B83B
69650+:10FF9000AD2A01780A001304000000003C0A80002A
69651+:10FFA000354401009483000E3C0208008C4200D8C6
69652+:10FFB000240400803065FFFF245500013C01080047
69653+:10FFC000AC3500D80E000FDB240600030A001370C6
69654+:10FFD000000018210009320230D900FF2418000166
69655+:10FFE0001738FFD5000731C08F910020262200016D
69656+:10FFF000AF8200200A0013C800C0382100CB2024A3
69657+:020000021000EC
69658+:10000000AF85000010800008AF860004240D87FF34
69659+:1000100000CD6024158000083C0E006000AE302446
69660+:1000200010C00005000000000E000D42000000009E
69661+:100030000A001371000000000E0016050000000009
69662+:100040000A0013710000000030B980005320FF1F28
69663+:10005000AF8500003C02002000A2F82453E0FF1B03
69664+:10006000AF8500003C07FFFF34E47FFF00A4382485
69665+:100070000A00132B34C880000A001334010910242D
69666+:1000800000EC58245160005AAF8000248F8D002C62
69667+:100090003C0E0F0000EE182415A00075AF83001071
69668+:1000A00030EF010011E00073939800103C12020041
69669+:1000B000107200703C06800034D9010093280013B0
69670+:1000C0009789002A36A60002311800FF271600047F
69671+:1000D000001619C03C0480008C8501B804A0FFFE06
69672+:1000E00034880180AD0300003C158008AC830020FB
69673+:1000F00096BF004833E5FFFF10A001BCAF850008A4
69674+:100100002523001200A3102B504001B98F85000455
69675+:10011000348D010095AC0020240B001A30E440001F
69676+:10012000318AFFFFA10B000B108001BA2543FFFEAF
69677+:1001300000A3702B15C001B88F9600048F8F0004A8
69678+:10014000A503001435E50001AF8500043C088000DC
69679+:1001500035150180A6A9000EA6A9001A8F89000CEA
69680+:1001600030BF8000A6A70010AEA90028A6A60008F0
69681+:1001700013E0000F3C0F8000350C0100958B00163A
69682+:10018000316AFFFC25440004008818218C6240007D
69683+:100190003046FFFF14C000072416BFFF3C0EFFFFD0
69684+:1001A00035CD7FFF00AD2824AF8500043C0F8000D3
69685+:1001B0002416BFFF00B6902435E50180A4B20026C6
69686+:1001C000ACA7002C3C071000ADE701B80A00137083
69687+:1001D000000018210E00165D000000003C0A4000DF
69688+:1001E0003C098000AD2A01780A00130400000000D9
69689+:1001F0008F85002410A00027AF80001090A300007E
69690+:10020000106000742409000310690101000030210E
69691+:1002100090AE0001240D000211CD014230EF0040EC
69692+:1002200090A90001241F0001113F000930E20040A5
69693+:100230008CA600049785002A00C020210E000FDB49
69694+:1002400036A60002000040210A00137001001821A8
69695+:100250005040FFF88CA600043C07080190E7964147
69696+:1002600010E0FFF4240800010A00137001001821B7
69697+:10027000939800103C1F080127FF96400018C8C043
69698+:10028000033F4021AF8800248F85002414A0FFDBAA
69699+:10029000AF9800103C0480008C86400030C50100FF
69700+:1002A00010A0008732AB00043C0C08008D8C0024A9
69701+:1002B00024160004156000033192000D241600027C
69702+:1002C0003C0480008C8E4000340DFFFF11CD0113E3
69703+:1002D00032B5FFFB8C984000330F010055E0000160
69704+:1002E0002415001030E80800110000382409FFFB35
69705+:1002F0008F9F00282FF903EF53200001024990241B
69706+:1003000030E2010010400014325F00018F87002CA2
69707+:1003100014E0010E8F8C000C3C0480003486010038
69708+:1003200090C5001330AA00FF25430004000321C03C
69709+:100330002419FFFE025990241240000202B6302513
69710+:1003400032A6FFFF0E000FDB9785002A1240FEA3A6
69711+:1003500000001821325F000113E0000D3247000455
69712+:10036000240900011249000202B6302532A6FFFF1F
69713+:100370009785002A0E000FDB000020212402FFFEDB
69714+:10038000024290241240FE950000182132470004DA
69715+:1003900050E0FE922403000102B63025241600042A
69716+:1003A0005656000132A6FFFF9785002A0E000FDB8C
69717+:1003B000240401002403FFFB0243A82412A0FE87AB
69718+:1003C000000018210A001370240300010A0014B968
69719+:1003D0000249902410A0FFAF30E5010010A00017E3
69720+:1003E0008F8600102403000210C300148F84000CB9
69721+:1003F0003C0608008CC6003824CAFFFF14C0000267
69722+:10040000008A1024000010213C0E080025CE003880
69723+:10041000004E682191AC00048F850028258B0004D4
69724+:10042000000B21C030A5FFFF36A600020E000FDB37
69725+:10043000000000000A00137000001821240F0002C1
69726+:1004400010CF0088241600013C0308008C6300D004
69727+:100450001076008D8F85002824D9FFFC2F280004FA
69728+:100460001500006300002021241F0002107F005DA2
69729+:100470002CC9000C24C3FFF82C6200041440FFE9CF
69730+:100480000000202130EA020051400004000621C093
69731+:1004900054C0000530A5FFFF000621C030A5FFFFB6
69732+:1004A0000A00150436A600020E000FDB32A600017A
69733+:1004B0008F8600108F8500280A001520000621C0B5
69734+:1004C0003C0A08008D4A0024315200015240FE438C
69735+:1004D000000018219785002A36A600020E000FDBC7
69736+:1004E000000020210A001370000018219668000CFB
69737+:1004F000311802005700FE313C0500013C1F800806
69738+:1005000097F900489789002A36A600023328FFFF92
69739+:10051000AF8800083C0380008C7501B806A0FFFE80
69740+:100520003C04800034820180AC400000110000B621
69741+:1005300024180003252A0012010A182B106000B2AB
69742+:1005400000000000966F00203C0E8000240D001A71
69743+:1005500031ECFFFF35CA018030EB4000A14D000BAC
69744+:10056000116000B02583FFFE0103902B164000AE02
69745+:100570002416FFFE34A50001A5430014AF85000436
69746+:100580002419BFFF00B94024A6E9000EA6E9001A0D
69747+:10059000A6E60008A6E80026A6E700103C07100023
69748+:1005A000AE8701B80A001370000018213C048000D7
69749+:1005B0008C8201B80440FFFE349601802415001C93
69750+:1005C000AEC70000A2D5000B3C071000AC8701B8F5
69751+:1005D0003C0A40003C098000AD2A01780A0013045F
69752+:1005E000000000005120FFA424C3FFF800002021D8
69753+:1005F00030A5FFFF0A00150436A600020E00103DCC
69754+:10060000000000008F8700000A001346AF82000C34
69755+:1006100090A30001241500011075FF0B24080001B0
69756+:10062000240600021066000430E2004024080001A5
69757+:100630000A001370010018215040FFFD240800013A
69758+:100640003C0C8000358B0100956A001094A40002D8
69759+:100650003143FFFF5083FDE1010018210A00158599
69760+:10066000240800018F8500282CB203EF1240FDDB27
69761+:10067000240300013C0308008C6300D02416000111
69762+:100680001476FF7624D9FFFC2CD8000C1300FF72DF
69763+:10069000000621C030A5FFFF0A00150436A600029F
69764+:1006A00010B00037240F000B14AFFE23000731C039
69765+:1006B000312600FF00065600000A4E0305220047BF
69766+:1006C00030C6007F0006F8C03C16080126D69640CA
69767+:1006D00003F68021A2000001A20000003C0F600090
69768+:1006E0008DF918202405000100C588040011302769
69769+:1006F0000326C024000731C000C03821ADF81820FF
69770+:100700000A0013C8A60000028F850020000731C030
69771+:1007100024A2FFFF0A0013F6AF8200200A0014B2E1
69772+:100720002415002011E0FECC3C1980003728010080
69773+:100730009518001094B6000233120FFF16D2FEC6B1
69774+:10074000000000000A00148290A900013C0B080080
69775+:100750008D6B0038256DFFFF15600002018D1024A0
69776+:10076000000010213C080800250800380048C0217E
69777+:10077000930F000425EE00040A0014C5000E21C0EA
69778+:1007800000065202241F00FF115FFDEB000731C07D
69779+:10079000000A20C03C0E080125CE9640008EA821FC
69780+:1007A000009E602100095C02240D00013C076000EE
69781+:1007B000A2AD0000AD860000A2AB00018CF21820B3
69782+:1007C00024030001014310040242B025ACF61820B6
69783+:1007D00000C038210A0013C8A6A900020A0015AA01
69784+:1007E000AF8000200A0012FFAF84002C8F85000428
69785+:1007F0003C1980002408000337380180A308000B4F
69786+:100800000A00144D3C088000A2F8000B0A00155A9B
69787+:100810002419BFFF8F9600042412FFFE0A00144B18
69788+:1008200002D228242416FFFE0A00155800B62824F8
69789+:100830003C038000346401008C85000030A2003E3F
69790+:100840001440000800000000AC6000488C870000E5
69791+:1008500030E607C010C0000500000000AC60004C8E
69792+:10086000AC60005003E0000824020001AC600054BA
69793+:10087000AC6000408C880000310438001080FFF923
69794+:10088000000000002402000103E00008AC60004406
69795+:100890003C0380008C6201B80440FFFE3467018095
69796+:1008A000ACE4000024080001ACE00004A4E500086A
69797+:1008B00024050002A0E8000A34640140A0E5000B12
69798+:1008C0009483000A14C00008A4E30010ACE00024E4
69799+:1008D0003C07800034E901803C041000AD20002872
69800+:1008E00003E00008ACE401B88C8600043C0410006E
69801+:1008F000ACE600243C07800034E90180AD200028EC
69802+:1009000003E00008ACE401B83C0680008CC201B8EA
69803+:100910000440FFFE34C7018024090002ACE400005B
69804+:10092000ACE40004A4E50008A0E9000A34C50140D5
69805+:10093000A0E9000B94A8000A3C041000A4E80010F1
69806+:10094000ACE000248CA30004ACE3002803E0000822
69807+:10095000ACC401B83C039000346200010082202541
69808+:100960003C038000AC6400208C65002004A0FFFEE6
69809+:100970000000000003E00008000000003C028000CE
69810+:10098000344300010083202503E00008AC4400202C
69811+:1009900027BDFFE03C098000AFBF0018AFB10014D5
69812+:1009A000AFB00010352801408D10000091040009FF
69813+:1009B0009107000891050008308400FF30E600FF31
69814+:1009C00000061A002C820081008330251040002A86
69815+:1009D00030A50080000460803C0D080125AD92B078
69816+:1009E000018D58218D6A00000140000800000000C0
69817+:1009F0003C038000346201409445000A14A0001EAC
69818+:100A00008F91FCC09227000530E6000414C0001A44
69819+:100A1000000000000E00164E02002021922A000560
69820+:100A200002002021354900040E001658A2290005B5
69821+:100A30009228000531040004148000020000000028
69822+:100A40000000000D922D0000240B002031AC00FFAF
69823+:100A5000158B00093C0580008CAE01B805C0FFFE77
69824+:100A600034B10180AE3000003C0F100024100005AE
69825+:100A7000A230000BACAF01B80000000D8FBF001812
69826+:100A80008FB100148FB0001003E0000827BD0020D4
69827+:100A90000200202100C028218FBF00188FB1001450
69828+:100AA0008FB00010240600010A00161D27BD00208B
69829+:100AB0000000000D0200202100C028218FBF001877
69830+:100AC0008FB100148FB00010000030210A00161DF5
69831+:100AD00027BD002014A0FFE8000000000200202134
69832+:100AE0008FBF00188FB100148FB0001000C02821F4
69833+:100AF0000A00163B27BD00203C0780008CEE01B8A1
69834+:100B000005C0FFFE34F00180241F0002A21F000B6D
69835+:100B100034F80140A60600089719000A3C0F10009F
69836+:100B2000A61900108F110004A6110012ACEF01B835
69837+:100B30000A0016998FBF001827BDFFE8AFBF00104D
69838+:100B40000E000FD4000000003C0280008FBF001098
69839+:100B500000002021AC4001800A00108F27BD001842
69840+:100B60003084FFFF30A5FFFF108000070000182130
69841+:100B7000308200011040000200042042006518216C
69842+:100B80001480FFFB0005284003E0000800601021EE
69843+:100B900010C00007000000008CA2000024C6FFFF68
69844+:100BA00024A50004AC82000014C0FFFB24840004D0
69845+:100BB00003E000080000000010A0000824A3FFFFCD
69846+:100BC000AC86000000000000000000002402FFFFCF
69847+:100BD0002463FFFF1462FFFA2484000403E000088A
69848+:100BE000000000003C03800027BDFFF83462018054
69849+:100BF000AFA20000308C00FF30AD00FF30CE00FF10
69850+:100C00003C0B80008D6401B80480FFFE00000000F2
69851+:100C10008FA900008D6801288FAA00008FA700000F
69852+:100C20008FA400002405000124020002A085000A10
69853+:100C30008FA30000359940003C051000A062000B16
69854+:100C40008FB800008FAC00008FA600008FAF0000AF
69855+:100C500027BD0008AD280000AD400004AD80002491
69856+:100C6000ACC00028A4F90008A70D0010A5EE0012E2
69857+:100C700003E00008AD6501B83C06800827BDFFE829
69858+:100C800034C50080AFBF001090A7000924020012F5
69859+:100C900030E300FF1062000B008030218CA8005070
69860+:100CA00000882023048000088FBF00108CAA003425
69861+:100CB000240400390000282100CA4823052000052B
69862+:100CC000240600128FBF00102402000103E0000878
69863+:100CD00027BD00180E0016F2000000008FBF0010A4
69864+:100CE0002402000103E0000827BD001827BDFFC84B
69865+:100CF000AFB20030AFB00028AFBF0034AFB1002CAE
69866+:100D000000A0802190A5000D30A6001010C000109A
69867+:100D1000008090213C0280088C4400048E0300086F
69868+:100D20001064000C30A7000530A6000510C0009329
69869+:100D3000240400018FBF00348FB200308FB1002C2B
69870+:100D40008FB000280080102103E0000827BD003884
69871+:100D500030A7000510E0000F30AB001210C00006F5
69872+:100D6000240400013C0980088E0800088D25000439
69873+:100D70005105009C240400388FBF00348FB200302E
69874+:100D80008FB1002C8FB000280080102103E00008F4
69875+:100D900027BD0038240A0012156AFFE6240400016A
69876+:100DA0000200202127A500100E000CB6AFA00010F5
69877+:100DB0001440007C3C19800837240080909800087B
69878+:100DC000331100081220000A8FA7001030FF010025
69879+:100DD00013E000A48FA300148C8600580066102333
69880+:100DE000044000043C0A8008AC8300588FA7001020
69881+:100DF0003C0A800835480080910900083124000829
69882+:100E00001480000224080003000040213C1F8008D9
69883+:100E100093F1001193F9001237E600808CCC005456
69884+:100E2000333800FF03087821322D00FF000F708057
69885+:100E300001AE282100AC582B1160006F00000000AB
69886+:100E400094CA005C8CC900543144FFFF0125102373
69887+:100E50000082182B14600068000000008CCB005446
69888+:100E60000165182330EC00041180006C000830800C
69889+:100E70008FA8001C0068102B1040006230ED0004A9
69890+:100E8000006610232C46008010C00002004088211C
69891+:100E9000241100800E00164E024020213C0D8008D7
69892+:100EA00035A6008024070001ACC7000C90C80008DC
69893+:100EB0000011484035A70100310C007FA0CC00088C
69894+:100EC0008E05000424AB0001ACCB0030A4D1005C43
69895+:100ED0008CCA003C9602000E01422021ACC40020C6
69896+:100EE0008CC3003C0069F821ACDF001C8E190004A3
69897+:100EF000ACF900008E180008ACF800048FB10010A7
69898+:100F0000322F000855E0004793A60020A0C0004EF5
69899+:100F100090D8004E2411FFDFA0F8000890CF000801
69900+:100F200001F17024A0CE00088E0500083C0B80085B
69901+:100F300035690080AD2500388D6A00148D2200309F
69902+:100F40002419005001422021AD24003491230000D7
69903+:100F5000307F00FF13F90036264F01000E001658AF
69904+:100F60000240202124040038000028210E0016F23F
69905+:100F70002406000A0A001757240400010E000D2859
69906+:100F8000000020218FBF00348FB200308FB1002CC1
69907+:100F90008FB00028004020210080102103E00008CD
69908+:100FA00027BD00388E0E00083C0F800835F0008009
69909+:100FB000AE0E005402402021AE0000300E00164E4E
69910+:100FC00000000000920D00250240202135AC0020D9
69911+:100FD0000E001658A20C00250E000CAC0240202179
69912+:100FE000240400382405008D0E0016F22406001299
69913+:100FF0000A0017572404000194C5005C0A001792E8
69914+:1010000030A3FFFF2407021811A0FF9E00E6102363
69915+:101010008FAE001C0A00179A01C610230A0017970A
69916+:101020002C620218A0E600080A0017C48E0500080A
69917+:101030002406FF8001E6C0243C118000AE38002861
69918+:101040008E0D000831E7007F3C0E800C00EE602121
69919+:10105000AD8D00E08E080008AF8C00380A0017D074
69920+:10106000AD8800E4AC800058908500082403FFF7A9
69921+:1010700000A33824A08700080A0017758FA7001066
69922+:101080003C05080024A560A83C04080024846FF4F3
69923+:101090003C020800244260B0240300063C01080121
69924+:1010A000AC2596C03C010801AC2496C43C01080163
69925+:1010B000AC2296C83C010801A02396CC03E00008AE
69926+:1010C0000000000003E00008240200013C02800050
69927+:1010D000308800FF344701803C0680008CC301B893
69928+:1010E0000460FFFE000000008CC501282418FF806A
69929+:1010F0003C0D800A24AF010001F8702431EC007F20
69930+:10110000ACCE0024018D2021ACE50000948B00EAD8
69931+:101110003509600024080002316AFFFFACEA0004D0
69932+:1011200024020001A4E90008A0E8000BACE00024C0
69933+:101130003C071000ACC701B8AF84003803E00008DA
69934+:10114000AF85006C938800488F8900608F820038DB
69935+:1011500030C600FF0109382330E900FF01221821C1
69936+:1011600030A500FF2468008810C000020124382147
69937+:101170000080382130E400031480000330AA00030B
69938+:101180001140000D312B000310A0000900001021B8
69939+:1011900090ED0000244E000131C200FF0045602B9D
69940+:1011A000A10D000024E700011580FFF925080001CA
69941+:1011B00003E00008000000001560FFF300000000DD
69942+:1011C00010A0FFFB000010218CF80000245900043F
69943+:1011D000332200FF0045782BAD18000024E70004FF
69944+:1011E00015E0FFF92508000403E0000800000000F6
69945+:1011F00093850048938800588F8700600004320070
69946+:101200003103007F00E5102B30C47F001040000F39
69947+:10121000006428258F8400383C0980008C8A00EC0B
69948+:10122000AD2A00A43C03800000A35825AC6B00A0AD
69949+:101230008C6C00A00580FFFE000000008C6D00ACEF
69950+:10124000AC8D00EC03E000088C6200A80A00188254
69951+:101250008F840038938800593C0280000080502120
69952+:10126000310300FEA383005930ABFFFF30CC00FFF9
69953+:1012700030E7FFFF344801803C0980008D2401B82D
69954+:101280000480FFFE8F8D006C24180016AD0D000049
69955+:101290008D2201248F8D0038AD0200048D5900206D
69956+:1012A000A5070008240201C4A119000AA118000B17
69957+:1012B000952F01208D4E00088D4700049783005C18
69958+:1012C0008D59002401CF302100C7282100A32023FD
69959+:1012D0002418FFFFA504000CA50B000EA5020010AA
69960+:1012E000A50C0012AD190018AD18002495AF00E848
69961+:1012F0003C0B10002407FFF731EEFFFFAD0E002876
69962+:101300008DAC0084AD0C002CAD2B01B88D460020B7
69963+:1013100000C7282403E00008AD4500208F8800386E
69964+:101320000080582130E7FFFF910900D63C02800081
69965+:1013300030A5FFFF312400FF00041A00006750258C
69966+:1013400030C600FF344701803C0980008D2C01B875
69967+:101350000580FFFE8F82006C240F0017ACE20000B6
69968+:101360008D390124ACF900048D780020A4EA00082E
69969+:10137000241901C4A0F8000AA0EF000B9523012056
69970+:101380008D6E00088D6D00049784005C01C35021B0
69971+:10139000014D602101841023A4E2000CA4E5000E9D
69972+:1013A000A4F90010A4E60012ACE000148D7800242B
69973+:1013B000240DFFFFACF800188D0F007CACEF001C73
69974+:1013C0008D0E00783C0F1000ACEE0020ACED002438
69975+:1013D000950A00BE240DFFF73146FFFFACE600285A
69976+:1013E000950C00809504008231837FFF0003CA00C2
69977+:1013F0003082FFFF0322C021ACF8002CAD2F01B8D2
69978+:10140000950E00828D6A002000AE3021014D282407
69979+:10141000A506008203E00008AD6500203C028000C4
69980+:10142000344501803C0480008C8301B80460FFFED9
69981+:101430008F8A0044240600199549001C3128FFFFBB
69982+:10144000000839C0ACA70000A0A6000B3C051000A6
69983+:1014500003E00008AC8501B88F87004C0080402174
69984+:1014600030C400FF3C0680008CC201B80440FFFE7F
69985+:101470008F89006C9383006834996000ACA90000E8
69986+:10148000A0A300058CE20010240F00022403FFF744
69987+:10149000A4A20006A4B900088D180020A0B8000A74
69988+:1014A000A0AF000B8CEE0000ACAE00108CED000481
69989+:1014B000ACAD00148CEC001CACAC00248CEB002018
69990+:1014C000ACAB00288CEA002C3C071000ACAA002C26
69991+:1014D0008D090024ACA90018ACC701B88D05002007
69992+:1014E00000A3202403E00008AD0400208F8600380C
69993+:1014F00027BDFFE0AFB10014AFBF0018AFB00010C0
69994+:1015000090C300D430A500FF3062002010400008D6
69995+:10151000008088218CCB00D02409FFDF256A0001E0
69996+:10152000ACCA00D090C800D401093824A0C700D4A8
69997+:1015300014A000403C0C80008F840038908700D4B9
69998+:101540002418FFBF2406FFEF30E3007FA08300D400
69999+:10155000979F005C8F8200608F8D003803E2C82364
70000+:10156000A799005CA5A000BC91AF00D401F870243D
70001+:10157000A1AE00D48F8C0038A18000D78F8A0038AC
70002+:10158000A5400082AD4000EC914500D400A658244F
70003+:10159000A14B00D48F9000348F8400609786005C4C
70004+:1015A0000204282110C0000FAF850034A38000582A
70005+:1015B0003C0780008E2C000894ED01208E2B000447
70006+:1015C000018D5021014B8021020620233086FFFF30
70007+:1015D00030C8000F3909000131310001162000091F
70008+:1015E000A3880058938600488FBF00188FB100145D
70009+:1015F0008FB0001027BD0020AF85006403E0000815
70010+:10160000AF86006000C870238FBF00189386004823
70011+:101610008FB100148FB0001034EF0C00010F28219F
70012+:1016200027BD0020ACEE0084AF85006403E0000815
70013+:10163000AF86006035900180020028210E00190F4E
70014+:10164000240600828F840038908600D430C5004084
70015+:1016500050A0FFBAA38000688F85004C3C06800034
70016+:101660008CCD01B805A0FFFE8F89006C2408608234
70017+:1016700024070002AE090000A6080008A207000B1C
70018+:101680008CA300083C0E1000AE0300108CA2000CCE
70019+:10169000AE0200148CBF0014AE1F00188CB90018E5
70020+:1016A000AE1900248CB80024AE1800288CAF002896
70021+:1016B000AE0F002CACCE01B80A001948A380006818
70022+:1016C0008F8A003827BDFFE0AFB10014AFB0001023
70023+:1016D0008F880060AFBF00189389003C954200BC22
70024+:1016E00030D100FF0109182B0080802130AC00FFB1
70025+:1016F0003047FFFF0000582114600003310600FF4F
70026+:1017000001203021010958239783005C0068202BB9
70027+:101710001480002700000000106800562419000102
70028+:101720001199006334E708803165FFFF0E0018C08F
70029+:10173000020020218F83006C3C07800034E601808A
70030+:101740003C0580008CAB01B80560FFFE240A001840
70031+:101750008F840038ACC30000A0CA000B948900BE7F
70032+:101760003C081000A4C90010ACC00030ACA801B8FF
70033+:101770009482008024430001A4830080949F008011
70034+:101780003C0608008CC6318833EC7FFF1186005E72
70035+:101790000000000002002021022028218FBF001835
70036+:1017A0008FB100148FB000100A00193427BD00203B
70037+:1017B000914400D42403FF8000838825A15100D4E4
70038+:1017C0009784005C3088FFFF51000023938C003C1D
70039+:1017D0008F8500382402EFFF008B782394AE00BC85
70040+:1017E0000168502B31E900FF01C26824A4AD00BCA0
70041+:1017F00051400039010058213C1F800037E60100AC
70042+:101800008CD800043C190001031940245500000144
70043+:1018100034E740008E0A00202403FFFB241100015E
70044+:1018200001432024AE0400201191002D34E78000F4
70045+:1018300002002021012030210E0018C03165FFFF79
70046+:101840009787005C8F890060A780005C0127802358
70047+:10185000AF900060938C003C8F8B00388FBF0018D6
70048+:101860008FB100148FB0001027BD002003E00008E6
70049+:10187000A16C00D73C0D800035AA01008D48000402
70050+:101880003C0900010109282454A0000134E740006C
70051+:101890008E0F00202418FFFB34E7800001F870242D
70052+:1018A00024190001AE0E00201599FF9F34E708802F
70053+:1018B000020020210E00188E3165FFFF020020215A
70054+:1018C000022028218FBF00188FB100148FB00010A4
70055+:1018D0000A00193427BD00200A0019F7000048212A
70056+:1018E00002002021012030210E00188E3165FFFFFB
70057+:1018F0009787005C8F890060A780005C01278023A8
70058+:101900000A001A0EAF900060948C0080241F8000A3
70059+:10191000019F3024A4860080908B0080908F0080EF
70060+:10192000316700FF0007C9C20019C027001871C045
70061+:1019300031ED007F01AE2825A08500800A0019DF67
70062+:1019400002002021938500682403000127BDFFE8E1
70063+:1019500000A330042CA20020AFB00010AFBF0014D1
70064+:1019600000C01821104000132410FFFE3C0708009F
70065+:101970008CE7319000E610243C088000350501809A
70066+:1019800014400005240600848F890038240A0004CE
70067+:101990002410FFFFA12A00FC0E00190F0000000018
70068+:1019A000020010218FBF00148FB0001003E0000868
70069+:1019B00027BD00183C0608008CC631940A001A574F
70070+:1019C00000C310248F87004427BDFFE0AFB200188A
70071+:1019D000AFB10014AFB00010AFBF001C30D000FF9B
70072+:1019E00090E6000D00A088210080902130C5007F86
70073+:1019F000A0E5000D8F8500388E2300188CA200D042
70074+:101A00001062002E240A000E0E001A4AA38A0068F3
70075+:101A10002409FFFF104900222404FFFF5200002088
70076+:101A2000000020218E2600003C0C001000CC582421
70077+:101A3000156000393C0E000800CE682455A0003F18
70078+:101A4000024020213C18000200D880241200001F10
70079+:101A50003C0A00048F8700448CE200148CE30010E1
70080+:101A60008CE500140043F82303E5C82B1320000580
70081+:101A7000024020218E24002C8CF1001010910031A6
70082+:101A80000240202124020012A38200680E001A4A9C
70083+:101A90002412FFFF105200022404FFFF0000202147
70084+:101AA0008FBF001C8FB200188FB100148FB00010D0
70085+:101AB0000080102103E0000827BD002090A800D47A
70086+:101AC000350400200A001A80A0A400D400CA4824CB
70087+:101AD0001520000B8F8B00448F8D00448DAC0010BF
70088+:101AE0001580000B024020218E2E002C51C0FFECEF
70089+:101AF00000002021024020210A001A9B2402001726
70090+:101B00008D66001050C0FFE6000020210240202119
70091+:101B10000A001A9B24020011024020212402001511
70092+:101B20000E001A4AA3820068240FFFFF104FFFDC4B
70093+:101B30002404FFFF0A001A8A8E2600000A001AC138
70094+:101B4000240200143C08000400C8382450E0FFD4EC
70095+:101B500000002021024020210A001A9B24020013C9
70096+:101B60008F85003827BDFFD8AFB3001CAFB2001877
70097+:101B7000AFB10014AFB00010AFBF002090A700D4E9
70098+:101B80008F90004C2412FFFF34E2004092060000C8
70099+:101B9000A0A200D48E0300100080982110720006CD
70100+:101BA00030D1003F2408000D0E001A4AA3880068B7
70101+:101BB000105200252404FFFF8F8A00388E09001878
70102+:101BC0008D4400D01124000702602021240C000E57
70103+:101BD0000E001A4AA38C0068240BFFFF104B001A5A
70104+:101BE0002404FFFF24040020122400048F8D0038F9
70105+:101BF00091AF00D435EE0020A1AE00D48F85005403
70106+:101C000010A00019000000001224004A8F9800382C
70107+:101C10008F92FCC0971000809651000A5230004805
70108+:101C20008F9300403C1F08008FFF318C03E5C82BC9
70109+:101C30001720001E02602021000028210E0019A993
70110+:101C400024060001000020218FBF00208FB3001C5C
70111+:101C50008FB200188FB100148FB0001000801021D7
70112+:101C600003E0000827BD00285224002A8E05001436
70113+:101C70008F840038948A008025490001A48900805F
70114+:101C8000948800803C0208008C42318831077FFF35
70115+:101C900010E2000E00000000026020210E00193446
70116+:101CA000240500010A001B0B000020212402002D46
70117+:101CB0000E001A4AA38200682403FFFF1443FFE1C9
70118+:101CC0002404FFFF0A001B0C8FBF002094990080A2
70119+:101CD000241F800024050001033FC024A498008035
70120+:101CE00090920080908E0080325100FF001181C2DE
70121+:101CF00000107827000F69C031CC007F018D582576
70122+:101D0000A08B00800E001934026020210A001B0BFA
70123+:101D1000000020212406FFFF54A6FFD68F84003840
70124+:101D2000026020210E001934240500010A001B0B5B
70125+:101D300000002021026020210A001B252402000A45
70126+:101D40002404FFFD0A001B0BAF9300608F8800384E
70127+:101D500027BDFFE8AFB00010AFBF0014910A00D458
70128+:101D60008F87004C00808021354900408CE60010B0
70129+:101D7000A10900D43C0208008C4231B030C53FFFBD
70130+:101D800000A2182B106000078F850050240DFF80E3
70131+:101D900090AE000D01AE6024318B00FF156000088D
70132+:101DA0000006C382020020212403000D8FBF00140F
70133+:101DB0008FB0001027BD00180A001A4AA3830068DC
70134+:101DC00033060003240F000254CFFFF70200202146
70135+:101DD00094A2001C8F85003824190023A4A200E8D7
70136+:101DE0008CE8000000081E02307F003F13F9003528
70137+:101DF0003C0A00838CE800188CA600D0110600086D
70138+:101E0000000000002405000E0E001A4AA385006899
70139+:101E10002407FFFF104700182404FFFF8F850038B8
70140+:101E200090A900D435240020A0A400D48F8C0044B5
70141+:101E3000918E000D31CD007FA18D000D8F83005458
70142+:101E40001060001C020020218F8400508C9800102C
70143+:101E50000303782B11E0000D241900180200202143
70144+:101E6000A39900680E001A4A2410FFFF10500002C8
70145+:101E70002404FFFF000020218FBF00148FB000104A
70146+:101E80000080102103E0000827BD00188C86001098
70147+:101E90008F9F00440200202100C31023AFE20010F6
70148+:101EA000240500010E0019A9240600010A001B9751
70149+:101EB000000020210E001934240500010A001B97A0
70150+:101EC00000002021010A5824156AFFD98F8C004494
70151+:101ED000A0A600FC0A001B84A386005A30A500FFC0
70152+:101EE0002406000124A9000100C9102B1040000C99
70153+:101EF00000004021240A000100A61823308B0001B5
70154+:101F000024C60001006A3804000420421160000267
70155+:101F100000C9182B010740251460FFF800A61823FC
70156+:101F200003E000080100102127BDFFD8AFB0001862
70157+:101F30008F90004CAFB1001CAFBF00202403FFFF07
70158+:101F40002411002FAFA30010920600002405000802
70159+:101F500026100001006620260E001BB0308400FF12
70160+:101F600000021E003C021EDC34466F410A001BD8F2
70161+:101F70000000102110A00009008018212445000154
70162+:101F800030A2FFFF2C4500080461FFFA0003204047
70163+:101F90000086202614A0FFF9008018210E001BB037
70164+:101FA000240500208FA300102629FFFF313100FFF8
70165+:101FB00000034202240700FF1627FFE20102182651
70166+:101FC00000035027AFAA0014AFAA00100000302170
70167+:101FD00027A8001027A7001400E6782391ED00033E
70168+:101FE00024CE000100C8602131C600FF2CCB0004C4
70169+:101FF0001560FFF9A18D00008FA200108FBF002097
70170+:102000008FB1001C8FB0001803E0000827BD002826
70171+:1020100027BDFFD0AFB3001CAFB00010AFBF00288A
70172+:10202000AFB50024AFB40020AFB20018AFB10014B8
70173+:102030003C0C80008D880128240FFF803C06800A1C
70174+:1020400025100100250B0080020F68243205007F57
70175+:10205000016F7024AD8E009000A62821AD8D002464
70176+:1020600090A600FC3169007F3C0A8004012A1821F7
70177+:10207000A386005A9067007C00809821AF830030CF
70178+:1020800030E20002AF88006CAF85003800A0182154
70179+:10209000144000022404003424040030A3840048C7
70180+:1020A0008C7200DC30D100FF24040004AF92006089
70181+:1020B00012240004A38000688E7400041680001EA1
70182+:1020C0003C0880009386005930C7000110E0000FE3
70183+:1020D0008F9300608CB000848CA800842404FF805F
70184+:1020E000020410240002F940310A007F03EA482567
70185+:1020F0003C0C2000012C902530CD00FE3C038000DC
70186+:10210000AC720830A38D00598F9300608FBF0028F8
70187+:102110008FB50024ACB300DC8FB400208FB3001C5B
70188+:102120008FB200188FB100148FB00010240200018C
70189+:1021300003E0000827BD00308E7F000895020120D3
70190+:102140008E67001003E2C8213326FFFF30D8000F4E
70191+:1021500033150001AF87003416A00058A39800582B
70192+:1021600035090C000309382100D81823AD03008479
70193+:10217000AF8700648E6A00043148FFFF1100007EC3
70194+:10218000A78A005C90AC00D42407FF8000EC3024C8
70195+:1021900030CB00FF1560004B9786005C938E005A91
70196+:1021A000240D000230D5FFFF11CD02A20000A021B6
70197+:1021B0008F85006002A5802B160000BC9388004824
70198+:1021C0003C11800096240120310400FF1485008812
70199+:1021D0008F8400648F9800343312000356400085CA
70200+:1021E00030A500FF8F900064310C00FF24060034FE
70201+:1021F00011860095AF90004C9204000414800118E1
70202+:102200008F8E0038A380003C8E0D00048DC800D84E
70203+:102210003C0600FF34CCFFFF01AC30240106182B34
70204+:1022200014600120AF8600548F8700609798005C8F
70205+:10223000AF8700400307402310C000C7A788005C99
70206+:102240008F91003030C3000300035823922A007C92
70207+:102250003171000302261021000A20823092000111
70208+:102260000012488000492821311FFFFF03E5C82BD9
70209+:10227000132001208F8800388F8500348F880064F8
70210+:102280001105025A3C0E3F018E0600003C0C250051
70211+:1022900000CE682411AC01638F84004C30E500FF50
70212+:1022A0000E00184A000030218F8800388F870060A8
70213+:1022B0008F8500340A001DB78F8600540A001C5613
70214+:1022C000AF87006490A400D400E48024320200FFB1
70215+:1022D000104000169386005990A6008890AE00D753
70216+:1022E00024A8008830D4003F2686FFE02CD10020AF
70217+:1022F000A38E003C1220000CAF88004C240B000180
70218+:1023000000CB20043095001916A0012B3C0680005C
70219+:1023100034CF0002008FC0241700022E3099002015
70220+:1023200017200234000000009386005930CB0001D2
70221+:102330001160000F9788005C8CBF00848CA900841A
70222+:10234000240AFF8003EA6024000C19403132007F28
70223+:10235000007238253C0D200000EDC82530D800FE65
70224+:102360003C0F8000ADF90830A39800599788005CB5
70225+:102370001500FF84000000008E630020306200041E
70226+:102380001040FF51938600592404FFFB0064802411
70227+:102390003C038000AE700020346601808C7301B86D
70228+:1023A0000660FFFE8F98006C347501003C1400013C
70229+:1023B000ACD800008C6B012424076085ACCB0004F2
70230+:1023C0008EAE000401D488245220000124076083CB
70231+:1023D00024190002A4C700083C0F1000A0D9000B6C
70232+:1023E0003C068000ACCF01B80A001C2B9386005934
70233+:1023F00030A500FF0E00184A240600018F88006CEB
70234+:102400003C05800034A90900250201889388004812
70235+:10241000304A0007304B00783C0340802407FF809F
70236+:102420000163C825014980210047F824310C00FFD1
70237+:1024300024060034ACBF0800AF90004CACB90810C3
70238+:102440005586FF6E920400048F8400388E11003090
70239+:10245000908E00D431CD001015A000108F83006045
70240+:102460002C6F000515E000E400000000909800D4F7
70241+:102470002465FFFC331200101640000830A400FF52
70242+:102480008F9F00648F99003413F90004388700018E
70243+:1024900030E20001144001C8000000000E001BC320
70244+:1024A000000000000A001DF8000000008F84006496
70245+:1024B00030C500FF0E00184A24060001939800481A
70246+:1024C000240B0034130B00A08F8500388F8600602A
70247+:1024D0009783005C306EFFFF00CE8823AF910060D1
70248+:1024E000A780005C1280FF90028018212414FFFD59
70249+:1024F0005474FFA28E6300208E6A00042403FFBF81
70250+:102500002408FFEF0155F823AE7F000490AC00D4FF
70251+:102510003189007FA0A900D48E7200208F8F0038EF
70252+:10252000A780005C364D0002AE6D0020A5E000BC27
70253+:1025300091E500D400A3C824A1F900D48F950038F8
70254+:10254000AEA000EC92B800D403085824A2AB00D48B
70255+:102550000A001CD78F8500388F910034AF8000604F
70256+:1025600002275821AF8B0034000020212403FFFFF5
70257+:10257000108301B48F8500388E0C00103C0D0800CC
70258+:102580008DAD31B09208000031843FFF008D802B6B
70259+:1025900012000023310D003F3C1908008F3931A88B
70260+:1025A0008F9F006C000479802408FF80033F202166
70261+:1025B000008FC821938500590328F8243C06008029
70262+:1025C0003C0F800034D80001001F91403331007F60
70263+:1025D0008F8600380251502535EE0940332B0078A4
70264+:1025E000333000073C0310003C02800C017890253A
70265+:1025F000020E48210143C0250222382134AE0001D9
70266+:10260000ADFF0804AF890050ADF20814AF87004455
70267+:10261000ADFF0028ACD90084ADF80830A38E005976
70268+:102620009383005A24070003106700272407000142
70269+:102630001467FFAC8F8500382411002311B1008589
70270+:1026400000000000240E000B026020210E001A4A38
70271+:10265000A38E00680040A0210A001D328F8500383B
70272+:1026600002602021240B000C0E001A4AA38B006884
70273+:10267000240AFFFF104AFFBD2404FFFF8F8E00389D
70274+:10268000A380003C8E0D00048DC800D83C0600FFDE
70275+:1026900034CCFFFF01AC30240106182B1060FEE2A1
70276+:1026A000AF86005402602021241200190E001A4A3D
70277+:1026B000A3920068240FFFFF104FFFAC2404FFFF1C
70278+:1026C0000A001C838F86005425A3FFE02C74002091
70279+:1026D0001280FFDD240E000B000328803C1108014E
70280+:1026E000263194B400B148218D2D000001A00008CE
70281+:1026F000000000008F85003400A710219385003C66
70282+:10270000AF82003402251821A383003C951F00BC32
70283+:102710000226282137F91000A51900BC5240FF926B
70284+:10272000AF850060246A0004A38A003C950900BCC0
70285+:1027300024A40004AF84006035322000A51200BC40
70286+:102740000A001D54000020218F8600602CC800055F
70287+:102750001500FF609783005C3065FFFF00C5C8234C
70288+:102760002F2F000511E00003306400FF24CDFFFC93
70289+:1027700031A400FF8F8900648F920034113200046D
70290+:10278000389F000133EC0001158001380000000083
70291+:102790008F840038908700D434E60010A08600D4DF
70292+:1027A0008F8500388F8600609783005CACA000ECBA
70293+:1027B0000A001D2F306EFFFF8CB500848CB400849E
70294+:1027C0003C04100002A7302400068940328E007FAE
70295+:1027D000022E8025020410253C08800024050001FB
70296+:1027E00002602021240600010E0019A9AD02083064
70297+:1027F0000A001CC38F8500388C8200EC1222FE7EFA
70298+:102800000260202124090005A38900680E001A4AED
70299+:102810002411FFFF1451FE782404FFFF0A001D5508
70300+:102820002403FFFF8F8F004C8F8800388DF8000045
70301+:10283000AD1800888DE70010AD0700988F87006005
70302+:102840000A001DB78F8600542406FFFF118600057D
70303+:10285000000000000E001B4C026020210A001D8FAA
70304+:102860000040A0210E001AD1026020210A001D8F15
70305+:102870000040A0218F90004C3C0208008C4231B0F7
70306+:102880008E110010322C3FFF0182282B10A0000C6B
70307+:10289000240BFF808F85005090A3000D01637024EE
70308+:1028A00031CA00FF1140000702602021001143825D
70309+:1028B000310600032418000110D8010600000000B2
70310+:1028C000026020212403000D0E001A4AA383006831
70311+:1028D000004020218F8500380A001D320080A02191
70312+:1028E0008F90004C3C0A08008D4A31B08F85005013
70313+:1028F0008E0400100000A0218CB1001430823FFF34
70314+:10290000004A602B8CB200205180FFEE0260202133
70315+:1029100090B8000D240BFF800178702431C300FFB4
70316+:102920005060FFE80260202100044382310600036A
70317+:1029300014C0FFE40260202194BF001C8F9900386E
70318+:102940008E060028A73F00E88CAF0010022F20233E
70319+:1029500014C4013A026020218F83005400C368210F
70320+:10296000022D382B14E00136240200188F8A00440F
70321+:102970008F820030024390218D4B00100163702341
70322+:10298000AD4E0010AD5200208C4C00740192282BEB
70323+:1029900014A0015F026020218F8400508E08002463
70324+:1029A0008C86002411060007026020212419001CD7
70325+:1029B0000E001A4AA3990068240FFFFF104FFFC5AD
70326+:1029C0002404FFFF8F8400448C87002424FF00012F
70327+:1029D000AC9F00241251012F8F8D00308DB10074F7
70328+:1029E0001232012C3C0B00808E0E000001CB5024D3
70329+:1029F00015400075000000008E0300142411FFFF35
70330+:102A0000107100073C0808003C0608008CC6319095
70331+:102A100000C8C0241300015202602021A380006876
70332+:102A20008E0300003C19000100792024108000135F
70333+:102A30003C1F0080007FA02416800009020028218E
70334+:102A4000026020212411001A0E001A4AA391006886
70335+:102A50002407FFFF1047FF9F2404FFFF02002821E7
70336+:102A6000026020210E001A6A240600012410FFFFD4
70337+:102A70001050FF982404FFFF241400018F8D0044A0
70338+:102A8000026020210280302195A900342405000134
70339+:102A9000253200010E0019A9A5B200340000202142
70340+:102AA0008F8500380A001D320080A0218F90004CD5
70341+:102AB0003C1408008E9431B08E07001030E53FFFC3
70342+:102AC00000B4C82B132000618F8600502412FF80B1
70343+:102AD00090C9000D0249682431A400FF5080005CB9
70344+:102AE000026020218F8C00541180000700078B8228
70345+:102AF0008F8500388F82FCC094BF0080944A000A02
70346+:102B0000515F00F78F8600403227000314E0006415
70347+:102B100000000000920E000211C000D8000000006A
70348+:102B20008E0B0024156000D902602021920400035E
70349+:102B300024190002308500FF14B90005308900FF18
70350+:102B40008F940054128000EA240D002C308900FF7D
70351+:102B5000392C00102D8400012D3200010244302553
70352+:102B6000020028210E001A6A026020212410FFFFB3
70353+:102B7000105000BF8F8500388F830054106000D341
70354+:102B8000240500013C0A08008D4A318C0143F82BD2
70355+:102B900017E000B22402002D02602021000028214D
70356+:102BA0000E0019A9240600018F85003800001821A5
70357+:102BB0000A001D320060A0210E0018750000000000
70358+:102BC0000A001DF800000000AC8000200A001E78FA
70359+:102BD0008E03001400002821026020210E0019A994
70360+:102BE000240600010A001CC38F8500380A001DB7A7
70361+:102BF0008F8800388CAA00848CAC00843C031000C1
70362+:102C00000147F824001F91403189007F024968255F
70363+:102C100001A32825ACC50830910700012405000157
70364+:102C2000026020210E0019A930E600010A001CC331
70365+:102C30008F850038938F00482403FFFD0A001D3460
70366+:102C4000AF8F00600A001D342403FFFF02602021C3
70367+:102C50002410000D0E001A4AA390006800401821AD
70368+:102C60008F8500380A001D320060A0210E00187503
70369+:102C7000000000009783005C8F86006000402021E8
70370+:102C80003070FFFF00D010232C4A00051140FE11C8
70371+:102C90008F850038ACA400EC0A001D2F306EFFFFBA
70372+:102CA00090CF000D31E300085460FFA192040003AF
70373+:102CB00002602021240200100E001A4AA38200683C
70374+:102CC0002403FFFF5443FF9A920400030A001F12DB
70375+:102CD0008F85003890A4000D308F000811E000951A
70376+:102CE0008F990054572000A6026020218E1F000CEF
70377+:102CF0008CB4002057F40005026020218E0D0008DE
70378+:102D00008CA7002411A7003A026020212402002091
70379+:102D1000A38200680E001A4A2412FFFF1052FEED33
70380+:102D20002404FFFF8F9F00442402FFF73C14800E11
70381+:102D300093EA000D2419FF803C03800001423824EF
70382+:102D4000A3E7000D8F9F00303C0908008D2931ACAE
70383+:102D50008F8C006C97F200788F870044012C302113
70384+:102D6000324D7FFF000D204000C4782131E5007F07
70385+:102D700000B4C02101F94024AC68002CA711000068
70386+:102D80008CEB0028256E0001ACEE00288CEA002CAC
70387+:102D90008E02002C01426021ACEC002C8E09002C2C
70388+:102DA000ACE900308E120014ACF2003494ED003A1D
70389+:102DB00025A40001A4E4003A97E600783C1108003D
70390+:102DC0008E3131B024C3000130707FFF1211005CDE
70391+:102DD000006030218F8F0030026020212405000127
70392+:102DE0000E001934A5E600780A001EA1000020217B
70393+:102DF0008E0900142412FFFF1132006B8F8A0038F5
70394+:102E00008E0200188D4C00D0144C00650260202109
70395+:102E10008E0B00248CAE0028116E005B2402002172
70396+:102E20000E001A4AA38200681452FFBE2404FFFF5A
70397+:102E30008F8500380A001D320080A0212402001F67
70398+:102E40000E001A4AA38200682409FFFF1049FEA160
70399+:102E50002404FFFF0A001E548F83005402602021C7
70400+:102E60000E001A4AA38200681450FF508F85003864
70401+:102E70002403FFFF0A001D320060A0218CD800242B
70402+:102E80008E0800241118FF29026020210A001F2744
70403+:102E90002402000F8E0900003C05008001259024CB
70404+:102EA0001640FF492402001A026020210E001A4A2F
70405+:102EB000A3820068240CFFFF144CFECF2404FFFF04
70406+:102EC0008F8500380A001D320080A0210E001934C1
70407+:102ED000026020218F8500380A001EE500001821BD
70408+:102EE0002403FFFD0060A0210A001D32AF860060B0
70409+:102EF000026020210E001A4AA38D00682403FFFF00
70410+:102F00001043FF588F8500380A001ECC920400033E
70411+:102F10002418001D0E001A4AA39800682403FFFF1E
70412+:102F20001443FE9D2404FFFF8F8500380A001D32E4
70413+:102F30000080A021026020210A001F3D24020024FD
70414+:102F4000240880000068C024330BFFFF000B73C20D
70415+:102F500031D000FF001088270A001F6E001133C017
70416+:102F6000240F001B0E001A4AA38F00681451FEACF8
70417+:102F70002404FFFF8F8500380A001D320080A02145
70418+:102F80000A001F3D240200278E0600288CA3002C77
70419+:102F900010C30008026020210A001F812402001FC4
70420+:102FA0000A001F812402000E026020210A001F81F6
70421+:102FB000240200258E04002C1080000D8F8F00301D
70422+:102FC0008DE800740104C02B5700000C0260202122
70423+:102FD0008CB900140086A0210334282B10A0FF52C6
70424+:102FE0008F9F0044026020210A001F8124020022DA
70425+:102FF000026020210A001F81240200230A001F8191
70426+:103000002402002627BDFFD8AFB3001CAFB10014C7
70427+:10301000AFBF0020AFB20018AFB000103C0280007C
70428+:103020008C5201408C4B01483C048000000B8C0208
70429+:10303000322300FF317300FF8C8501B804A0FFFE2E
70430+:1030400034900180AE1200008C8701442464FFF0AC
70431+:10305000240600022C830013AE070004A61100080A
70432+:10306000A206000BAE1300241060004F8FBF00209B
70433+:10307000000448803C0A0801254A9534012A402171
70434+:103080008D04000000800008000000003C030800E0
70435+:103090008C6331A831693FFF00099980007280215B
70436+:1030A000021370212405FF80264D0100264C00806C
70437+:1030B0003C02800031B1007F3198007F31CA007F2F
70438+:1030C0003C1F800A3C1980043C0F800C01C5202461
70439+:1030D00001A5302401853824014F1821AC46002475
70440+:1030E000023F402103194821AC470090AC4400281E
70441+:1030F000AF830044AF880038AF8900300E0019005C
70442+:10310000016080213C0380008C6B01B80560FFFEEC
70443+:103110008F8700448F8600383465018090E8000D69
70444+:10312000ACB20000A4B0000600082600000416039C
70445+:1031300000029027001227C21080008124C200885C
70446+:10314000241F6082A4BF0008A0A000052402000282
70447+:10315000A0A2000B8F8B0030000424003C08270045
70448+:1031600000889025ACB20010ACA00014ACA00024E4
70449+:10317000ACA00028ACA0002C8D6900382413FF807F
70450+:10318000ACA9001890E3000D02638024320500FF13
70451+:1031900010A000058FBF002090ED000D31AC007F26
70452+:1031A000A0EC000D8FBF00208FB3001C8FB2001861
70453+:1031B0008FB100148FB000103C0A10003C0E80004C
70454+:1031C00027BD002803E00008ADCA01B8265F010052
70455+:1031D0002405FF8033F8007F3C06800003E5782457
70456+:1031E0003C19800A03192021ACCF0024908E00D412
70457+:1031F00000AE682431AC00FF11800024AF84003899
70458+:10320000248E008895CD00123C0C08008D8C31A8CE
70459+:1032100031AB3FFF01924821000B5180012A402130
70460+:1032200001052024ACC400283107007F3C06800C37
70461+:1032300000E620219083000D00A31024304500FFFC
70462+:1032400010A0FFD8AF8400449098000D330F0010F9
70463+:1032500015E0FFD58FBF00200E0019000000000010
70464+:103260003C0380008C7901B80720FFFE00000000BD
70465+:10327000AE1200008C7F0144AE1F0004A6110008AE
70466+:1032800024110002A211000BAE1300243C1308010C
70467+:10329000927396F0327000015200FFC38FBF00207E
70468+:1032A0000E002146024020210A0020638FBF00202B
70469+:1032B0003C1260008E452C083C03F0033462FFFF93
70470+:1032C00000A2F824AE5F2C088E582C083C1901C0CF
70471+:1032D00003199825AE532C080A0020638FBF0020E5
70472+:1032E000264D010031AF007F3C10800A240EFF8084
70473+:1032F00001F0282101AE60243C0B8000AD6C00245D
70474+:103300001660FFA8AF85003824110003A0B100FCAF
70475+:103310000A0020638FBF002026480100310A007F89
70476+:103320003C0B800A2409FF80014B30210109202435
70477+:103330003C078000ACE400240A002062AF8600381D
70478+:10334000944E0012320C3FFF31CD3FFF15ACFF7D94
70479+:10335000241F608290D900D42418FF800319782498
70480+:1033600031EA00FF1140FF7700000000240700044D
70481+:10337000A0C700FC8F870044241160842406000D40
70482+:10338000A4B10008A0A600050A00204D24020002F6
70483+:103390003C040001248496DC24030014240200FE73
70484+:1033A0003C010800AC2431EC3C010800AC2331E8BE
70485+:1033B0003C010801A42296F83C040801248496F8F4
70486+:1033C0000000182100643021A0C300042463000120
70487+:1033D0002C6500FF54A0FFFC006430213C0708006E
70488+:1033E00024E7010003E00008AF87007800A058211F
70489+:1033F000008048210000102114A00012000050217C
70490+:103400000A002142000000003C010801A42096F8B7
70491+:103410003C05080194A596F88F8200783C0C0801C1
70492+:10342000258C96F800E2182100AC2021014B302BAE
70493+:10343000A089000400001021A460000810C0003919
70494+:10344000010048218F8600780009384000E94021BA
70495+:103450000008388000E6282190A8000B90B9000AE7
70496+:103460000008204000881021000218800066C0215A
70497+:10347000A319000A8F85007800E5782191EE000AF3
70498+:1034800091E6000B000E684001AE6021000C208028
70499+:1034900000851021A046000B3C030801906396F2C2
70500+:1034A000106000222462FFFF8F8300383C01080176
70501+:1034B000A02296F2906C00FF118000040000000032
70502+:1034C000906E00FF25CDFFFFA06D00FF3C190801A5
70503+:1034D000973996F8272300013078FFFF2F0F00FF60
70504+:1034E00011E0FFC9254A00013C010801A42396F818
70505+:1034F0003C05080194A596F88F8200783C0C0801E1
70506+:10350000258C96F800E2182100AC2021014B302BCD
70507+:10351000A089000400001021A460000814C0FFC9A5
70508+:103520000100482103E000080000000003E000085B
70509+:103530002402000227BDFFE0248501002407FF804C
70510+:10354000AFB00010AFBF0018AFB1001400A718242F
70511+:103550003C10800030A4007F3C06800A00862821B1
70512+:103560008E110024AE03002490A200FF1440000836
70513+:10357000AF850038A0A000098FBF0018AE1100244D
70514+:103580008FB100148FB0001003E0000827BD0020A9
70515+:1035900090A900FD90A800FF312400FF0E0020F448
70516+:1035A000310500FF8F8500388FBF0018A0A00009EB
70517+:1035B000AE1100248FB100148FB0001003E000089A
70518+:1035C00027BD002027BDFFD0AFB20020AFB1001C47
70519+:1035D000AFB00018AFBF002CAFB40028AFB30024C9
70520+:1035E0003C0980009533011635320C00952F011AE5
70521+:1035F0003271FFFF023280218E08000431EEFFFF9E
70522+:10360000248B0100010E6821240CFF8025A5FFFFFB
70523+:10361000016C50243166007F3C07800AAD2A0024EB
70524+:1036200000C73021AF850074AF8800703C010801ED
70525+:10363000A02096F190C300090200D02100809821BB
70526+:10364000306300FF2862000510400048AF86003854
70527+:10365000286400021480008E24140001240D00054B
70528+:103660003C010801A02D96D590CC00FD3C0108013D
70529+:10367000A02096D63C010801A02096D790CB000A46
70530+:10368000240AFF80318500FF014B4824312700FFC9
70531+:1036900010E0000C000058213C12800836510080D8
70532+:1036A0008E2F00308CD0005C01F0702305C0018E9D
70533+:1036B0008F87007090D4000A3284007FA0C4000A73
70534+:1036C0008F8600383C118008363000808E0F003025
70535+:1036D0008F87007000EF702319C000EE000000001B
70536+:1036E00090D4000924120002328400FF1092024795
70537+:1036F000000000008CC2005800E2F82327F9FFFF09
70538+:103700001B2001300000000090C5000924080004BF
70539+:1037100030A300FF10680057240A00013C01080193
70540+:10372000A02A96D590C900FF252700013C01080179
70541+:10373000A02796D43C030801906396D52406000583
70542+:103740001066006A2C780005130000C40000902168
70543+:103750000003F8803C0408012484958003E4C82118
70544+:103760008F25000000A0000800000000241800FFC2
70545+:103770001078005C0000000090CC000A90CA00099C
70546+:103780003C080801910896F13187008000EA48253D
70547+:103790003C010801A02996DC90C500FD3C140801FD
70548+:1037A000929496F2311100013C010801A02596DDAA
70549+:1037B00090DF00FE3C010801A03F96DE90D200FFA2
70550+:1037C0003C010801A03296DF8CD900543C0108016D
70551+:1037D000AC3996E08CD000583C010801AC3096E43E
70552+:1037E0008CC3005C3C010801AC3496EC3C01080140
70553+:1037F000AC2396E8162000088FBF002C8FB4002859
70554+:103800008FB300248FB200208FB1001C8FB000183E
70555+:1038100003E0000827BD00303C1180009624010E13
70556+:103820000E000FD43094FFFF3C0B08018D6B96F413
70557+:103830000260382102802821AE2B01803C13080150
70558+:103840008E7396D401602021240600830E00102F71
70559+:10385000AFB300108FBF002C8FB400288FB30024AB
70560+:103860008FB200208FB1001C8FB0001803E0000859
70561+:1038700027BD00303C1808008F1831FC270F0001CD
70562+:103880003C010800AC2F31FC0A0021D700000000E9
70563+:103890001474FFB900000000A0C000FF3C05080040
70564+:1038A0008CA531E43C0308008C6331E03C02080045
70565+:1038B0008C4232048F99003834A80001241F000282
70566+:1038C0003C010801AC2396F43C010801A02896F0C5
70567+:1038D0003C010801A02296F3A33F00090A002190B1
70568+:1038E0008F8600380E002146000000000A0021D714
70569+:1038F0008F8600383C1F080193FF96D424190001DD
70570+:1039000013F902298F8700703C100801921096D895
70571+:103910003C06080190C696D610C000050200A02102
70572+:103920003C040801908496D9109001E48F870078B8
70573+:10393000001088408F9F0078023048210009C8801D
70574+:10394000033F702195D80008270F0001A5CF00087C
70575+:103950003C040801908496D93C05080190A596D6B0
70576+:103960000E0020F4000000008F8700780230202134
70577+:103970000004308000C720218C8500048F820074F1
70578+:1039800000A2402305020006AC8200048C8A0000DD
70579+:103990008F830070014310235C400001AC83000062
70580+:1039A0008F86003890CB00FF2D6C00025580002DD3
70581+:1039B000241400010230F821001F40800107282153
70582+:1039C00090B9000B8CAE00040019C0400319782197
70583+:1039D000000F1880006710218C4D000001AE882375
70584+:1039E0002630FFFF5E00001F241400018C440004F9
70585+:1039F0008CAA0000008A482319200019240E000414
70586+:103A00003C010801A02E96D590AD000B8CAB0004B4
70587+:103A1000000D8840022D80210010108000471021E9
70588+:103A20008C44000401646023058202009443000872
70589+:103A300090DF00FE90B9000B33E500FF54B900049D
70590+:103A40000107A021A0D400FE8F8700780107A021E4
70591+:103A50009284000B0E0020F4240500018F860038AC
70592+:103A600024140001125400962E500001160000424A
70593+:103A70003C08FFFF241900021659FF3F0000000018
70594+:103A8000A0C000FF8F860038A0D200090A0021D70D
70595+:103A90008F86003890C700092404000230E300FF3D
70596+:103AA0001064016F24090004106901528F880074AA
70597+:103AB0008CCE0054010E682325B10001062001754B
70598+:103AC000241800043C010801A03896D53C010801E7
70599+:103AD000A02096D490D400FD90D200FF2E4F00027B
70600+:103AE00015E0FF14328400FF000438408F8900780D
70601+:103AF00090DF00FF00E41021000220800089C8212F
70602+:103B00002FE500029324000B14A0FF0A24070002F3
70603+:103B100000041840006480210010588001692821A9
70604+:103B20008CAC0004010C50230540FF020000000093
70605+:103B30003C030801906396D614600005246F0001D1
70606+:103B40003C010801A02496D93C010801A02796D782
70607+:103B50003C010801A02F96D690CE00FF24E700017B
70608+:103B600031CD00FF01A7882B1220FFE990A4000BA4
70609+:103B70000A0021C6000000003C0508018CA596D46F
70610+:103B80003C12000400A8F82413F2000624020005E9
70611+:103B90003C090801912996D5152000022402000352
70612+:103BA000240200053C010801A02296F190C700FF05
70613+:103BB00014E0012024020002A0C200090A0021D75B
70614+:103BC0008F86003890CC00FF1180FEDA240A0001B5
70615+:103BD0008F8C00748F890078240F00030180682186
70616+:103BE0001160001E240E0002000540400105A021C6
70617+:103BF00000142080008990218E51000401918023BF
70618+:103C00000600FECC000000003C020801904296D65F
70619+:103C100014400005245800013C010801A02A96D751
70620+:103C20003C010801A02596D93C010801A03896D690
70621+:103C300090DF00FF010510210002C88033E500FF7E
70622+:103C4000254A00010329202100AA402B1500FEB9B6
70623+:103C50009085000B1560FFE50005404000054040E1
70624+:103C600001051821000310803C010801A02A96D408
70625+:103C70003C010801A02596D8004918218C64000455
70626+:103C800000E4F82327F9FFFF1F20FFE900000000F0
70627+:103C90008C63000000E358230560013A01A38823E8
70628+:103CA00010E301170184C0231B00FEA200000000E6
70629+:103CB0003C010801A02E96D50A002305240B000123
70630+:103CC000240E0004A0CE00093C0D08008DAD31F893
70631+:103CD0008F86003825A200013C010800AC2231F893
70632+:103CE0000A0021D7000000008CD9005C00F9C02335
70633+:103CF0001F00FE7B000000008CDF005C10FFFF65F2
70634+:103D00008F8400748CC3005C008340232502000173
70635+:103D10001C40FF60000000008CC9005C248700018B
70636+:103D200000E9282B10A0FE943C0D80008DAB01040F
70637+:103D30003C0C0001016C50241140FE8F2402001045
70638+:103D40003C010801A02296F10A0021D700000000E2
70639+:103D50008F9100748F86003826220001ACC2005C6F
70640+:103D60000A002292241400018F8700382404FF8067
70641+:103D70000000882190E9000A241400010124302564
70642+:103D8000A0E6000A3C05080190A596D63C0408016F
70643+:103D9000908496D90E0020F4000000008F86003831
70644+:103DA0008F85007890C800FD310700FF0007404074
70645+:103DB0000107F821001FC0800305C8219323000BD1
70646+:103DC000A0C300FD8F8500788F8600380305602131
70647+:103DD000918F000B000F704001CF6821000D808093
70648+:103DE000020510218C4B0000ACCB00548D840004E4
70649+:103DF0008F83007400645023194000022482000164
70650+:103E00002462000101074821ACC2005C0009308037
70651+:103E100000C5402100E02021240500010E0020F40F
70652+:103E20009110000B8F86003890C500FF10A0FF0C8A
70653+:103E3000001070408F85007801D06821000D10803F
70654+:103E4000004558218D6400008F8C0074018450233C
70655+:103E50002547000104E0FF02263100013C03080170
70656+:103E6000906396D62E2F0002247800013C010801B1
70657+:103E7000A03896D63C010801A03496D711E0FEF890
70658+:103E8000020038210A002365000740408F84003873
70659+:103E90008F8300748C85005800A340230502FE9A8E
70660+:103EA000AC8300580A00223B000000003C070801D8
70661+:103EB00090E796F2240200FF10E200BE8F860038E1
70662+:103EC0003C110801963196FA3C030801246396F8E8
70663+:103ED000262500013230FFFF30ABFFFF02036021D7
70664+:103EE0002D6A00FF1540008D918700043C010801F8
70665+:103EF000A42096FA8F88003800074840012728211F
70666+:103F0000911800FF000530802405000127140001EE
70667+:103F1000A11400FF3C120801925296F28F8800789B
70668+:103F20008F8E0070264F000100C820213C0108013F
70669+:103F3000A02F96F2AC8E00008F8D0074A48500082F
70670+:103F4000AC8D00043C030801906396D414600077A4
70671+:103F5000000090213C010801A02596D4A087000B09
70672+:103F60008F8C007800CC5021A147000A8F82003846
70673+:103F7000A04700FD8F840038A08700FE8F860038A0
70674+:103F80008F9F0070ACDF00548F990074ACD900583B
70675+:103F90008F8D00780127C02100185880016DA02165
70676+:103FA000928F000A000F704001CF18210003888013
70677+:103FB000022D8021A207000B8F8600780166602108
70678+:103FC000918A000B000A1040004A2021000428803A
70679+:103FD00000A64021A107000A3C07800834E90080C0
70680+:103FE0008D2200308F860038ACC2005C0A0022921D
70681+:103FF0002414000190CA00FF1540FEAD8F880074A4
70682+:10400000A0C400090A0021D78F860038A0C000FD97
70683+:104010008F98003824060001A30000FE3C0108012F
70684+:10402000A02696D53C010801A02096D40A0021C6FE
70685+:104030000000000090CB00FF3C040801908496F340
70686+:10404000316C00FF0184502B1540000F2402000347
70687+:1040500024020004A0C200090A0021D78F8600387C
70688+:1040600090C3000A2410FF8002035824316C00FF23
70689+:104070001180FDC1000000003C010801A02096D580
70690+:104080000A0021C600000000A0C200090A0021D7D2
70691+:104090008F86003890D4000A2412FF8002544824EE
70692+:1040A000312800FF1500FFF4240200083C0108013C
70693+:1040B000A02296F10A0021D70000000000108840DD
70694+:1040C0008F8B0070023018210003688001A7202127
70695+:1040D000AC8B00008F8A0074240C0001A48C0008B3
70696+:1040E000AC8A00043C05080190A596D62402000184
70697+:1040F00010A2FE1E24A5FFFF0A0022519084000B8F
70698+:104100000184A0231A80FD8B000000003C010801FF
70699+:10411000A02E96D50A002305240B00013C010801BE
70700+:10412000A42596FA0A0023B78F880038240B0001D3
70701+:10413000106B00228F9800388F85003890BF00FFE9
70702+:1041400033F900FF1079002B000000003C1F08012C
70703+:1041500093FF96D8001FC840033FC0210018A080DD
70704+:104160000288782191EE000AA08E000A8F8D0078D7
70705+:104170003C030801906396D800CD88210A0023DD16
70706+:10418000A223000B263000010600003101A4902379
70707+:104190000640002B240200033C010801A02F96D505
70708+:1041A0000A002305240B00018F8900380A00223BF6
70709+:1041B000AD2700540A00229124120001931400FD3F
70710+:1041C000A094000B8F8800388F8F0078910E00FE2E
70711+:1041D00000CF6821A1AE000A8F910038A22700FD10
70712+:1041E0008F8300708F900038AE0300540A0023DEE6
70713+:1041F0008F8D007890B000FEA090000A8F8B003861
70714+:104200008F8C0078916A00FD00CC1021A04A000B31
70715+:104210008F840038A08700FE8F8600748F85003859
70716+:10422000ACA600580A0023DE8F8D007894B80008F1
70717+:10423000ACA40004030378210A002285A4AF00087F
70718+:104240003C010801A02296D50A0021C6000000000A
70719+:1042500090CF0009240D000431EE00FF11CDFD8543
70720+:10426000240200013C010801A02296D50A0021C6C3
70721+:1042700000000000080033440800334408003420E4
70722+:10428000080033F4080033D8080033280800332826
70723+:10429000080033280800334C8008010080080080A3
70724+:1042A000800800005F865437E4AC62CC50103A4579
70725+:1042B00036621985BF14C0E81BC27A1E84F4B55655
70726+:1042C000094EA6FE7DDA01E7C04D748108005A74DC
70727+:1042D00008005AB808005A5C08005A5C08005A5C8A
70728+:1042E00008005A5C08005A7408005A5C08005A5CBE
70729+:1042F00008005AC008005A5C080059D408005A5CEB
70730+:1043000008005A5C08005AC008005A5C08005A5C51
70731+:1043100008005A5C08005A5C08005A5C08005A5CA5
70732+:1043200008005A5C08005A5C08005A5C08005A5C95
70733+:1043300008005A9408005A5C08005A9408005A5C15
70734+:1043400008005A5C08005A5C08005A9808005A9401
70735+:1043500008005A5C08005A5C08005A5C08005A5C65
70736+:1043600008005A5C08005A5C08005A5C08005A5C55
70737+:1043700008005A5C08005A5C08005A5C08005A5C45
70738+:1043800008005A5C08005A5C08005A5C08005A5C35
70739+:1043900008005A5C08005A5C08005A5C08005A5C25
70740+:1043A00008005A9808005A9808005A5C08005A9861
70741+:1043B00008005A5C08005A5C08005A5C08005A5C05
70742+:1043C00008005A5C08005A5C08005A5C08005A5CF5
70743+:1043D00008005A5C08005A5C08005A5C08005A5CE5
70744+:1043E00008005A5C08005A5C08005A5C08005A5CD5
70745+:1043F00008005A5C08005A5C08005A5C08005A5CC5
70746+:1044000008005A5C08005A5C08005A5C08005A5CB4
70747+:1044100008005A5C08005A5C08005A5C08005A5CA4
70748+:1044200008005A5C08005A5C08005A5C08005A5C94
70749+:1044300008005A5C08005A5C08005A5C08005A5C84
70750+:1044400008005A5C08005A5C08005A5C08005A5C74
70751+:1044500008005A5C08005A5C08005A5C08005A5C64
70752+:1044600008005A5C08005A5C08005A5C08005A5C54
70753+:1044700008005A5C08005A5C08005A5C08005A5C44
70754+:1044800008005A5C08005A5C08005A5C08005A5C34
70755+:1044900008005A5C08005A5C08005A5C08005A5C24
70756+:1044A00008005A5C08005A5C08005A5C08005A5C14
70757+:1044B00008005A5C08005A5C08005A5C08005A5C04
70758+:1044C00008005A5C08005A5C08005A5C08005ADC74
70759+:1044D0000800782C08007A900800783808007628C0
70760+:1044E00008007838080078C4080078380800762872
70761+:1044F0000800762808007628080076280800762824
70762+:104500000800762808007628080076280800762813
70763+:1045100008007628080078580800784808007628AF
70764+:1045200008007628080076280800762808007628F3
70765+:1045300008007628080076280800762808007628E3
70766+:1045400008007628080076280800762808007848B1
70767+:10455000080082FC08008188080082C40800818865
70768+:104560000800829408008070080081880800818813
70769+:1045700008008188080081880800818808008188F7
70770+:1045800008008188080081880800818808008188E7
70771+:104590000800818808008188080081B008008D34F7
70772+:1045A00008008E9008008E70080088D808008D4C96
70773+:1045B0000A00012400000000000000000000000DBF
70774+:1045C000747061362E322E31620000000602010145
70775+:1045D00000000000000000000000000000000000DB
70776+:1045E00000000000000000000000000000000000CB
70777+:1045F00000000000000000000000000000000000BB
70778+:1046000000000000000000000000000000000000AA
70779+:10461000000000000000000000000000000000009A
70780+:10462000000000000000000000000000000000008A
70781+:10463000000000000000000000000000000000007A
70782+:104640000000000010000003000000000000000D4A
70783+:104650000000000D3C020800244217203C03080023
70784+:1046600024632A10AC4000000043202B1480FFFD7F
70785+:10467000244200043C1D080037BD2FFC03A0F0219C
70786+:104680003C100800261004903C1C0800279C1720B2
70787+:104690000E000262000000000000000D2402FF80F6
70788+:1046A00027BDFFE000821024AFB00010AF42002011
70789+:1046B000AFBF0018AFB10014936500043084007FD1
70790+:1046C000034418213C0200080062182130A5002094
70791+:1046D000036080213C080111277B000814A0000220
70792+:1046E0002466005C2466005892020004974301048B
70793+:1046F000920400043047000F3063FFFF3084004015
70794+:10470000006728231080000900004821920200055C
70795+:1047100030420004104000050000000010A000031B
70796+:104720000000000024A5FFFC2409000492020005FB
70797+:1047300030420004104000120000000010A00010E1
70798+:10474000000000009602000200A72021010440257D
70799+:104750002442FFFEA7421016920300042402FF80A9
70800+:1047600000431024304200FF104000033C020400CC
70801+:104770000A000174010240258CC20000AF421018EB
70802+:104780008F4201780440FFFE2402000AA742014044
70803+:1047900096020002240400093042000700021023A0
70804+:1047A00030420007A7420142960200022442FFFE67
70805+:1047B000A7420144A740014697420104A74201488D
70806+:1047C0008F420108304200205040000124040001C3
70807+:1047D00092020004304200101440000234830010A2
70808+:1047E00000801821A743014A0000000000000000DB
70809+:1047F0000000000000000000AF48100000000000B2
70810+:104800000000000000000000000000008F421000C7
70811+:104810000441FFFE3102FFFF1040000700000000CE
70812+:1048200092020004304200401440000300000000E7
70813+:104830008F421018ACC20000960200063042FFFF03
70814+:10484000244200020002104300021040036288214B
70815+:10485000962200001120000D3044FFFF00A7102118
70816+:104860008F8300388F45101C0002108200021080D8
70817+:1048700000431021AC45000030A6FFFF0E00058D5F
70818+:1048800000052C0200402021A62200009203000413
70819+:104890002402FF8000431024304200FF1040001F1C
70820+:1048A0000000000092020005304200021040001B90
70821+:1048B000000000009742100C2442FFFEA742101691
70822+:1048C000000000003C02040034420030AF421000FF
70823+:1048D00000000000000000000000000000000000D8
70824+:1048E0008F4210000441FFFE000000009742100CB0
70825+:1048F0008F45101C3042FFFF24420030000210821E
70826+:1049000000021080005B1021AC45000030A6FFFFC4
70827+:104910000E00058D00052C02A62200009604000260
70828+:10492000248400080E0001E93084FFFF974401044D
70829+:104930000E0001F73084FFFF8FBF00188FB1001405
70830+:104940008FB000103C02100027BD002003E00008DB
70831+:10495000AF4201783084FFFF308200078F8500244A
70832+:1049600010400002248300073064FFF800A41021E7
70833+:1049700030421FFF03421821247B4000AF850028EE
70834+:10498000AF82002403E00008AF4200843084FFFFC0
70835+:104990003082000F8F85002C8F860034104000027B
70836+:1049A0002483000F3064FFF000A410210046182B70
70837+:1049B000AF8500300046202314600002AF82002C37
70838+:1049C000AF84002C8F82002C340480000342182115
70839+:1049D00000641821AF83003803E00008AF42008074
70840+:1049E0008F820014104000088F8200048F82FFDC49
70841+:1049F000144000058F8200043C02FFBF3442FFFFD9
70842+:104A0000008220248F82000430430006240200022A
70843+:104A10001062000F3C0201012C62000350400005AF
70844+:104A2000240200041060000F3C0200010A00023062
70845+:104A30000000000010620005240200061462000C51
70846+:104A40003C0201110A000229008210253C020011DB
70847+:104A500000821025AF421000240200010A0002303B
70848+:104A6000AF82000C00821025AF421000AF80000C16
70849+:104A700000000000000000000000000003E000084B
70850+:104A8000000000008F82000C1040000400000000B5
70851+:104A90008F4210000441FFFE0000000003E0000808
70852+:104AA000000000008F8200102443F800000231C291
70853+:104AB00024C2FFF02C6303011060000300021042C7
70854+:104AC0000A000257AC8200008F85001800C5102B29
70855+:104AD0001440000B0000182100C5102324470001DA
70856+:104AE0008F82001C00A210212442FFFF0046102BE1
70857+:104AF000544000042402FFFF0A000257AC87000064
70858+:104B00002402FFFF0A000260AC8200008C820000D9
70859+:104B10000002194000621821000318800062182169
70860+:104B2000000318803C0208002442175C0062182130
70861+:104B300003E000080060102127BDFFD8AFBF0020B0
70862+:104B4000AFB1001CAFB000183C0460088C8250006C
70863+:104B50002403FF7F3C066000004310243442380CDD
70864+:104B6000AC8250008CC24C1C3C1A80000002160221
70865+:104B70003042000F10400007AF82001C8CC34C1C59
70866+:104B80003C02001F3442FC0000621824000319C2DA
70867+:104B9000AF8300188F420008275B400034420001B9
70868+:104BA000AF420008AF8000243C02601CAF40008090
70869+:104BB000AF4000848C4500088CC308083402800094
70870+:104BC000034220212402FFF0006218243C020080EE
70871+:104BD0003C010800AC2204203C025709AF84003895
70872+:104BE00014620004AF850034240200010A0002921E
70873+:104BF000AF820014AF8000148F42000038420001E1
70874+:104C0000304200011440FFFC8F8200141040001657
70875+:104C10000000000097420104104000058F8300004F
70876+:104C2000146000072462FFFF0A0002A72C62000A3A
70877+:104C30002C620010504000048F83000024620001A9
70878+:104C4000AF8200008F8300002C62000A1440000332
70879+:104C50002C6200070A0002AEAF80FFDC10400002A9
70880+:104C600024020001AF82FFDC8F4301088F44010062
70881+:104C700030622000AF83000410400008AF840010B1
70882+:104C80003C0208008C42042C244200013C01080034
70883+:104C9000AC22042C0A00058A3C0240003065020068
70884+:104CA00014A0000324020F001482026024020D00ED
70885+:104CB00097420104104002C83C02400030624000AC
70886+:104CC000144000AD8F8200388C4400088F42017878
70887+:104CD0000440FFFE24020800AF42017824020008CD
70888+:104CE000A7420140A7400142974201048F8400047B
70889+:104CF0003051FFFF30820001104000070220802168
70890+:104D00002623FFFE240200023070FFFFA742014667
70891+:104D10000A0002DBA7430148A74001463C02080005
70892+:104D20008C42043C1440000D8F8300103082002020
70893+:104D30001440000224030009240300010060202124
70894+:104D40008F830010240209005062000134840004A3
70895+:104D5000A744014A0A0002F60000000024020F00E6
70896+:104D60001462000530820020144000062403000D68
70897+:104D70000A0002F524030005144000022403000980
70898+:104D800024030001A743014A3C0208008C4204208E
70899+:104D90003C0400480E00020C004420250E000235A1
70900+:104DA000000000008F82000C1040003E0000000058
70901+:104DB0008F4210003C0300200043102410400039B3
70902+:104DC0008F820004304200021040003600000000D4
70903+:104DD000974210141440003300000000974210085E
70904+:104DE0008F8800383042FFFF2442000600021882FC
70905+:104DF0000003388000E83021304300018CC40000FB
70906+:104E000010600004304200030000000D0A00033768
70907+:104E100000E81021544000103084FFFF3C05FFFFE4
70908+:104E200000852024008518260003182B0004102B71
70909+:104E300000431024104000050000000000000000A6
70910+:104E40000000000D00000000240002228CC20000BF
70911+:104E50000A000336004520253883FFFF0003182B86
70912+:104E60000004102B00431024104000050000000037
70913+:104E7000000000000000000D000000002400022BD4
70914+:104E80008CC200003444FFFF00E81021AC44000055
70915+:104E90003C0208008C420430244200013C0108001E
70916+:104EA000AC2204308F6200008F840038AF8200088B
70917+:104EB0008C8300003402FFFF1462000F00001021F9
70918+:104EC0003C0508008CA504543C0408008C84045064
70919+:104ED00000B0282100B0302B008220210086202144
70920+:104EE0003C010800AC2504543C010800AC240450EB
70921+:104EF0000A000580240400088C8200003042010072
70922+:104F00001040000F000010213C0508008CA5044C47
70923+:104F10003C0408008C84044800B0282100B0302BE9
70924+:104F200000822021008620213C010800AC25044C91
70925+:104F30003C010800AC2404480A0005802404000851
70926+:104F40003C0508008CA504443C0408008C84044003
70927+:104F500000B0282100B0302B0082202100862021C3
70928+:104F60003C010800AC2504443C010800AC2404408A
70929+:104F70000A000580240400088F6200088F62000088
70930+:104F800000021602304300F02402003010620005D7
70931+:104F900024020040106200E08F8200200A00058891
70932+:104FA0002442000114A000050000000000000000E1
70933+:104FB0000000000D00000000240002568F4201781E
70934+:104FC0000440FFFE000000000E00023D27A4001078
70935+:104FD0001440000500408021000000000000000D8A
70936+:104FE000000000002400025D8E0200001040000559
70937+:104FF00000000000000000000000000D00000000A4
70938+:10500000240002608F62000C0443000324020001AC
70939+:105010000A00042EAE000000AE0200008F820038AD
70940+:105020008C480008A20000078F65000C8F64000404
70941+:1050300030A3FFFF0004240200852023308200FFFC
70942+:105040000043102124420005000230832CC200815D
70943+:10505000A605000A14400005A20400040000000098
70944+:105060000000000D00000000240002788F85003849
70945+:105070000E0005AB260400148F6200048F43010864
70946+:10508000A60200083C02100000621824106000080C
70947+:105090000000000097420104920300072442FFEC45
70948+:1050A000346300023045FFFF0A0003C3A203000778
70949+:1050B000974201042442FFF03045FFFF96060008A6
70950+:1050C0002CC200135440000592030007920200070F
70951+:1050D00034420001A20200079203000724020001EB
70952+:1050E00010620005240200031062000B8F8200385A
70953+:1050F0000A0003E030C6FFFF8F8200383C04FFFF48
70954+:105100008C43000C0064182400651825AC43000C87
70955+:105110000A0003E030C6FFFF3C04FFFF8C43001091
70956+:105120000064182400651825AC43001030C6FFFF4A
70957+:1051300024C2000200021083A20200058F830038FF
70958+:10514000304200FF00021080004328218CA800009C
70959+:105150008CA2000024030004000217021443001272
70960+:1051600000000000974201043C03FFFF01031824E4
70961+:105170003042FFFF004610232442FFFE006240251C
70962+:10518000ACA8000092030005306200FF000210800E
70963+:1051900000501021904200143042000F00431021B3
70964+:1051A0000A000415A20200068CA400049742010420
70965+:1051B0009603000A3088FFFF3042FFFF00461023AD
70966+:1051C0002442FFD60002140001024025ACA80004CE
70967+:1051D000920200079204000524630028000318834C
70968+:1051E0000064182134420004A2030006A202000752
70969+:1051F0008F8200042403FFFB34420002004310248A
70970+:10520000AF820004920300068F87003800031880E5
70971+:10521000007010218C4400203C02FFF63442FFFF56
70972+:105220000082402400671821AE04000CAC68000C1A
70973+:10523000920500063C03FF7F8E02000C00052880CB
70974+:1052400000B020213463FFFF01033024948800263E
70975+:1052500000A7282100431024AE02000CAC860020D9
70976+:10526000AC880024ACA8001024020010A742014022
70977+:1052700024020002A7400142A7400144A742014680
70978+:10528000974201043C0400082442FFFEA742014863
70979+:10529000240200010E00020CA742014A9603000AF4
70980+:1052A0009202000400431021244200023042000711
70981+:1052B00000021023304200070E000235AE0200103B
70982+:1052C0008F6200003C0308008C6304442404001037
70983+:1052D000AF820008974201043042FFFF2442FFFEE4
70984+:1052E00000403821000237C33C0208008C420440D1
70985+:1052F000006718210067282B004610210045102167
70986+:105300003C010800AC2304443C010800AC220440EA
70987+:105310000A0005150000000014A0000500000000B0
70988+:10532000000000000000000D000000002400030A3F
70989+:105330008F4201780440FFFE000000000E00023D95
70990+:1053400027A4001414400005004080210000000044
70991+:105350000000000D00000000240003118E02000078
70992+:105360005440000692020007000000000000000DFB
70993+:10537000000000002400031C9202000730420004D9
70994+:10538000104000058F8200042403FFFB344200021A
70995+:1053900000431024AF8200048F620004044300081D
70996+:1053A00092020007920200068E03000CAE0000007D
70997+:1053B0000002108000501021AC4300209202000730
70998+:1053C00030420004544000099602000A920200058F
70999+:1053D0003C03000100021080005010218C46001890
71000+:1053E00000C33021AC4600189602000A9206000461
71001+:1053F000277100080220202100C2302124C60005A8
71002+:10540000260500140E0005AB00063082920400064B
71003+:105410008F6500043C027FFF000420800091202162
71004+:105420008C8300043442FFFF00A228240065182169
71005+:10543000AC8300049202000792040005920300046A
71006+:10544000304200041040001496070008308400FF2A
71007+:1054500000042080009120218C86000497420104E2
71008+:105460009605000A306300FF3042FFFF0043102121
71009+:105470000045102130E3FFFF004310232442FFD8F2
71010+:1054800030C6FFFF0002140000C23025AC860004C5
71011+:105490000A0004C992030007308500FF0005288038
71012+:1054A00000B128218CA4000097420104306300FF62
71013+:1054B0003042FFFF00431021004710233C03FFFF51
71014+:1054C000008320243042FFFF00822025ACA400008E
71015+:1054D0009203000724020001106200060000000091
71016+:1054E0002402000310620011000000000A0004EC16
71017+:1054F0008E03001097420104920300049605000AEF
71018+:105500008E24000C00431021004510212442FFF29C
71019+:105510003C03FFFF008320243042FFFF0082202550
71020+:10552000AE24000C0A0004EC8E0300109742010424
71021+:10553000920300049605000A8E24001000431021F7
71022+:10554000004510212442FFEE3C03FFFF008320248E
71023+:105550003042FFFF00822025AE2400108E03001091
71024+:105560002402000AA7420140A74301429603000A11
71025+:10557000920200043C04004000431021A742014471
71026+:10558000A740014697420104A742014824020001B6
71027+:105590000E00020CA742014A0E0002350000000076
71028+:1055A0008F6200009203000400002021AF820008F7
71029+:1055B000974201049606000A3042FFFF006218215C
71030+:1055C000006028213C0308008C6304443C0208006E
71031+:1055D0008C42044000651821004410210065382BDE
71032+:1055E000004710213C010800AC2304443C010800A2
71033+:1055F000AC22044092040004008620212484000A86
71034+:105600003084FFFF0E0001E9000000009744010410
71035+:105610003084FFFF0E0001F7000000003C02100084
71036+:10562000AF4201780A0005878F820020148200278C
71037+:105630003062000697420104104000673C024000BF
71038+:105640003062400010400005000000000000000033
71039+:105650000000000D00000000240004208F420178AB
71040+:105660000440FFFE24020800AF4201782402000833
71041+:10567000A7420140A74001428F82000497430104E2
71042+:1056800030420001104000073070FFFF2603FFFE8C
71043+:1056900024020002A7420146A74301480A00053F31
71044+:1056A0002402000DA74001462402000DA742014A32
71045+:1056B0008F62000024040008AF8200080E0001E998
71046+:1056C000000000000A0005190200202110400042DD
71047+:1056D0003C02400093620000304300F024020010BE
71048+:1056E0001062000524020070106200358F820020D5
71049+:1056F0000A000588244200018F62000097430104DC
71050+:105700003050FFFF3071FFFF8F4201780440FFFEF1
71051+:105710003202000700021023304200072403000A6F
71052+:105720002604FFFEA7430140A7420142A7440144CB
71053+:10573000A7400146A75101488F420108304200208E
71054+:10574000144000022403000924030001A743014A76
71055+:105750000E00020C3C0400400E0002350000000068
71056+:105760003C0708008CE70444021110212442FFFE8C
71057+:105770003C0608008CC604400040182100E3382194
71058+:10578000000010218F65000000E3402B00C2302193
71059+:105790002604000800C830213084FFFFAF850008D0
71060+:1057A0003C010800AC2704443C010800AC2604403E
71061+:1057B0000E0001E9000000000A0005190220202166
71062+:1057C0000E00013B000000008F82002024420001F7
71063+:1057D000AF8200203C024000AF4201380A00029232
71064+:1057E000000000003084FFFF30C6FFFF00052C00E2
71065+:1057F00000A628253882FFFF004510210045282BF0
71066+:105800000045102100021C023042FFFF004310211E
71067+:1058100000021C023042FFFF004310213842FFFF0C
71068+:1058200003E000083042FFFF3084FFFF30A5FFFF98
71069+:1058300000001821108000070000000030820001E5
71070+:105840001040000200042042006518210A0005A152
71071+:105850000005284003E000080060102110C0000689
71072+:1058600024C6FFFF8CA2000024A50004AC82000027
71073+:105870000A0005AB2484000403E0000800000000D7
71074+:1058800010A0000824A3FFFFAC8600000000000069
71075+:10589000000000002402FFFF2463FFFF1462FFFAF0
71076+:1058A0002484000403E00008000000000000000160
71077+:1058B0000A00002A00000000000000000000000DA7
71078+:1058C000747870362E322E3162000000060201001C
71079+:1058D00000000000000001360000EA600000000047
71080+:1058E00000000000000000000000000000000000B8
71081+:1058F00000000000000000000000000000000000A8
71082+:105900000000000000000000000000000000000097
71083+:105910000000001600000000000000000000000071
71084+:105920000000000000000000000000000000000077
71085+:105930000000000000000000000000000000000067
71086+:1059400000000000000000000000138800000000BC
71087+:10595000000005DC00000000000000001000000353
71088+:10596000000000000000000D0000000D3C020800D7
71089+:1059700024423D683C0308002463401CAC40000006
71090+:105980000043202B1480FFFD244200043C1D08002E
71091+:1059900037BD7FFC03A0F0213C100800261000A8B2
71092+:1059A0003C1C0800279C3D680E00044E00000000CF
71093+:1059B0000000000D27BDFFB4AFA10000AFA200049E
71094+:1059C000AFA30008AFA4000CAFA50010AFA6001451
71095+:1059D000AFA70018AFA8001CAFA90020AFAA0024F1
71096+:1059E000AFAB0028AFAC002CAFAD0030AFAE003491
71097+:1059F000AFAF0038AFB8003CAFB90040AFBC004417
71098+:105A0000AFBF00480E000591000000008FBF0048A6
71099+:105A10008FBC00448FB900408FB8003C8FAF003876
71100+:105A20008FAE00348FAD00308FAC002C8FAB0028D0
71101+:105A30008FAA00248FA900208FA8001C8FA7001810
71102+:105A40008FA600148FA500108FA4000C8FA3000850
71103+:105A50008FA200048FA1000027BD004C3C1B6004F6
71104+:105A60008F7A5030377B502803400008AF7A00000F
71105+:105A70008F86003C3C0390003C0280000086282575
71106+:105A800000A32025AC4400203C0380008C6700204C
71107+:105A900004E0FFFE0000000003E00008000000003A
71108+:105AA0000A000070240400018F85003C3C04800043
71109+:105AB0003483000100A3102503E00008AC8200201D
71110+:105AC00003E00008000010213084FFFF30A5FFFF35
71111+:105AD00010800007000018213082000110400002F1
71112+:105AE00000042042006518211480FFFB00052840B7
71113+:105AF00003E000080060102110C000070000000053
71114+:105B00008CA2000024C6FFFF24A50004AC82000084
71115+:105B100014C0FFFB2484000403E000080000000020
71116+:105B200010A0000824A3FFFFAC86000000000000C6
71117+:105B3000000000002402FFFF2463FFFF1462FFFA4D
71118+:105B40002484000403E000080000000090AA003153
71119+:105B50008FAB00108CAC00403C0300FF8D6800044C
71120+:105B6000AD6C00208CAD004400E060213462FFFF8A
71121+:105B7000AD6D00248CA700483C09FF000109C0243A
71122+:105B8000AD6700288CAE004C0182C824031978252B
71123+:105B9000AD6F0004AD6E002C8CAD0038314A00FFB3
71124+:105BA000AD6D001C94A900323128FFFFAD680010D4
71125+:105BB00090A70030A5600002A1600004A16700006A
71126+:105BC00090A30032306200FF0002198210600005CD
71127+:105BD000240500011065000E0000000003E000082D
71128+:105BE000A16A00018CD80028354A0080AD780018E1
71129+:105BF0008CCF0014AD6F00148CCE0030AD6E000859
71130+:105C00008CC4002CA16A000103E00008AD64000C04
71131+:105C10008CCD001CAD6D00188CC90014AD6900144A
71132+:105C20008CC80024AD6800088CC70020AD67000C4C
71133+:105C30008CC200148C8300700043C82B1320000713
71134+:105C4000000000008CC20014144CFFE400000000AF
71135+:105C5000354A008003E00008A16A00018C820070D0
71136+:105C60000A0000E6000000009089003027BDFFF820
71137+:105C70008FA8001CA3A900008FA300003C0DFF808B
71138+:105C800035A2FFFF8CAC002C00625824AFAB0000A3
71139+:105C9000A100000400C05821A7A000028D06000446
71140+:105CA00000A048210167C8218FA500000080502175
71141+:105CB0003C18FF7F032C20263C0E00FF2C8C00019B
71142+:105CC000370FFFFF35CDFFFF3C02FF0000AFC824B8
71143+:105CD00000EDC02400C27824000C1DC003236825F9
71144+:105CE00001F87025AD0D0000AD0E00048D240024D8
71145+:105CF000AFAD0000AD0400088D2C00202404FFFF90
71146+:105D0000AD0C000C9547003230E6FFFFAD060010E9
71147+:105D10009145004830A200FF000219C25060000106
71148+:105D20008D240034AD0400148D4700388FAA00186C
71149+:105D300027BD0008AD0B0028AD0A0024AD07001CEC
71150+:105D4000AD00002CAD00001803E00008AD000020FD
71151+:105D500027BDFFE0AFB20018AFB10014AFB0001024
71152+:105D6000AFBF001C9098003000C088213C0D00FFA0
71153+:105D7000330F007FA0CF0000908E003135ACFFFFC5
71154+:105D80003C0AFF00A0CE000194A6001EA220000441
71155+:105D90008CAB00148E29000400A08021016C282403
71156+:105DA000012A40240080902101052025A62600021A
71157+:105DB000AE24000426050020262400080E000092D0
71158+:105DC00024060002924700302605002826240014ED
71159+:105DD00000071E000003160324060004044000030D
71160+:105DE0002403FFFF965900323323FFFF0E00009279
71161+:105DF000AE230010262400248FBF001C8FB2001891
71162+:105E00008FB100148FB00010240500030000302172
71163+:105E10000A00009C27BD002027BDFFD8AFB1001CA1
71164+:105E2000AFB00018AFBF002090A9003024020001DD
71165+:105E300000E050213123003F00A040218FB00040FE
71166+:105E40000080882100C04821106200148FA700380C
71167+:105E5000240B000500A0202100C02821106B001396
71168+:105E6000020030210E000128000000009225007C75
71169+:105E700030A400021080000326030030AE00003082
71170+:105E8000260300348FBF00208FB1001C8FB0001894
71171+:105E90000060102103E0000827BD00280E0000A7C5
71172+:105EA000AFB000100A00016F000000008FA3003C9B
71173+:105EB000010020210120282101403021AFA3001042
71174+:105EC0000E0000EEAFB000140A00016F00000000E9
71175+:105ED0003C06800034C20E008C4400108F850044C4
71176+:105EE000ACA400208C43001803E00008ACA30024FD
71177+:105EF0003C06800034C20E008C4400148F850044A0
71178+:105F0000ACA400208C43001C03E00008ACA30024D8
71179+:105F10009382000C1040001B2483000F2404FFF028
71180+:105F20000064382410E00019978B00109784000E4D
71181+:105F30009389000D3C0A601C0A0001AC01644023F7
71182+:105F400001037021006428231126000231C2FFFFE3
71183+:105F500030A2FFFF0047302B50C0000E00E4482164
71184+:105F60008D4D000C31A3FFFF00036400000C2C03D7
71185+:105F700004A1FFF30000302130637FFF0A0001A479
71186+:105F80002406000103E00008000000009784000ED2
71187+:105F900000E448213123FFFF3168FFFF0068382B00
71188+:105FA00054E0FFF8A783000E938A000D114000050E
71189+:105FB000240F0001006BC023A380000D03E0000844
71190+:105FC000A798000E006BC023A38F000D03E000080C
71191+:105FD000A798000E03E000080000000027BDFFE8BE
71192+:105FE000AFB000103C10800036030140308BFFFF43
71193+:105FF00093AA002BAFBF0014A46B000436040E005C
71194+:106000009488001630C600FF8FA90030A4680006EF
71195+:10601000AC650008A0660012A46A001AAC670020F4
71196+:106020008FA5002CA4690018012020210E000198E2
71197+:10603000AC6500143C021000AE0201788FBF001462
71198+:106040008FB0001003E0000827BD00188F85000006
71199+:106050002484000727BDFFF83084FFF83C06800049
71200+:1060600094CB008A316AFFFFAFAA00008FA900001D
71201+:10607000012540232507FFFF30E31FFF0064102B9D
71202+:106080001440FFF700056882000D288034CC4000E2
71203+:1060900000AC102103E0000827BD00088F8200003B
71204+:1060A0002486000730C5FFF800A2182130641FFFC6
71205+:1060B00003E00008AF8400008F87003C8F84004419
71206+:1060C00027BDFFB0AFB70044AFB40038AFB1002C6C
71207+:1060D000AFBF0048AFB60040AFB5003CAFB300342F
71208+:1060E000AFB20030AFB000283C0B80008C8600249B
71209+:1060F000AD6700808C8A002035670E00356901008D
71210+:10610000ACEA00108C8800248D2500040000B82122
71211+:10611000ACE800188CE3001000A688230000A02142
71212+:10612000ACE300148CE20018ACE2001C122000FE6C
71213+:1061300000E0B021936C0008118000F40000000022
71214+:10614000976F001031EEFFFF022E682B15A000EFB5
71215+:1061500000000000977200103250FFFFAED0000028
71216+:106160003C0380008C740000329300081260FFFD35
71217+:106170000000000096D800088EC700043305FFFF1A
71218+:1061800030B5000112A000E4000000000000000D86
71219+:1061900030BFA0402419004013F9011B30B4A00007
71220+:1061A000128000DF000000009373000812600008F6
71221+:1061B00000000000976D001031ACFFFF00EC202BB9
71222+:1061C0001080000330AE004011C000D50000000078
71223+:1061D000A7850040AF87003893630008022028217C
71224+:1061E000AFB10020146000F527B40020AF60000CB0
71225+:1061F000978F004031F14000162000022403001662
71226+:106200002403000E24054007A363000AAF650014B1
71227+:10621000938A00428F70001431550001001512401E
71228+:1062200002024825AF690014979F00408F78001440
71229+:1062300033F9001003194025AF680014979200400D
71230+:106240003247000810E0016E000000008F67001464
71231+:106250003C1210003C11800000F27825AF6F001452
71232+:1062600036230E00946E000A3C0D81002406000EB9
71233+:1062700031CCFFFF018D2025AF640004A36600022E
71234+:106280009373000A3406FFFC266B0004A36B000A1C
71235+:1062900097980040330820001100015F00000000C3
71236+:1062A0003C05800034A90E00979900409538000CF9
71237+:1062B00097870040001940423312C00031030003A9
71238+:1062C00000127B0330F11000006F6825001172038B
71239+:1062D00001AE6025000C20C0A76400129793004017
71240+:1062E000936A000A001359823175003C02AA1021FA
71241+:1062F0002450003CA3700009953F000C33F93FFF88
71242+:10630000A779001097700012936900090130F821F5
71243+:1063100027E5000230B900070019C0233308000741
71244+:10632000A368000B9371000997720012976F001019
71245+:10633000322700FF8F910038978D004000F218211E
71246+:10634000006F702101C6602131A6004010C0000519
71247+:106350003185FFFF00B1102B3C1280001040001768
71248+:10636000000098210225A82B56A0013E8FA50020F1
71249+:106370003C048000348A0E008D5300143C068000DB
71250+:10638000AD5300108D4B001CAD4B0018AD45000007
71251+:106390008CCD000031AC00081180FFFD34CE0E0022
71252+:1063A00095C3000800A0882100009021A783004029
71253+:1063B0008DC6000424130001AF860038976F0010CB
71254+:1063C00031F5FFFF8E9F000003F1282310A0011F6D
71255+:1063D000AE85000093620008144000DD000000005C
71256+:1063E0000E0001E7240400108F900048004028218F
71257+:1063F0003C023200320600FF000654000142F8253C
71258+:1064000026090001AF890048ACBF0000937900095C
71259+:1064100097780012936F000A332800FF3303FFFFC1
71260+:106420000103382100076C0031EE00FF01AE60254A
71261+:10643000ACAC00048F840048978B0040316A200088
71262+:106440001140010AACA4000897640012308BFFFFD2
71263+:1064500006400108ACAB000C978E004031C5000827
71264+:1064600014A0000226280006262800023C1F8000F7
71265+:1064700037E70E0094F900148CE5001C8F670004C8
71266+:10648000937800023324FFFF330300FFAFA3001013
71267+:106490008F6F0014AFA800180E0001CBAFAF00142F
71268+:1064A000240400100E0001FB000000008E9200008A
71269+:1064B00016400005000000008F7800142403FFBF81
71270+:1064C0000303A024AF7400148F67000C00F5C821EB
71271+:1064D000AF79000C9375000816A0000800000000BA
71272+:1064E00012600006000000008F6800143C0AEFFFF5
71273+:1064F0003549FFFE0109F824AF7F0014A37300089B
71274+:106500008FA500200A00034F02202021AED10000F9
71275+:106510000A00022D3C03800014E0FF1E30BFA040A3
71276+:106520000E0001900000A0212E9100010237B0253D
71277+:1065300012C000188FBF00488F87003C24170F003F
71278+:1065400010F700D43C0680008CD901780720FFFEAC
71279+:10655000241F0F0010FF00F634CA0E008D560014E1
71280+:1065600034C7014024080240ACF600048D49001CE9
71281+:106570003C141000ACE90008A0E00012A4E0001AEE
71282+:10658000ACE00020A4E00018ACE80014ACD4017822
71283+:106590008FBF00488FB700448FB600408FB5003CD6
71284+:1065A0008FB400388FB300348FB200308FB1002C1D
71285+:1065B0008FB0002803E0000827BD00508F910038FD
71286+:1065C000978800403C1280000220A821310700403B
71287+:1065D00014E0FF7C00009821977900108F9200381A
71288+:1065E0003338FFFF131200A8000020210080A021F3
71289+:1065F000108000F300A088211620FECE00000000CD
71290+:106600000A00031F2E9100013C0380008C62017878
71291+:106610000440FFFE240808008F860000AC68017863
71292+:106620003C038000946D008A31ACFFFF0186582343
71293+:10663000256AFFFF31441FFF2C8900081520FFF950
71294+:10664000000000008F8F0048347040008F83003CB2
71295+:1066500000E0A021240E0F0025E70001AF870048CD
71296+:1066600000D03021023488233C08800031F500FF3F
71297+:10667000106E0005240700019398004233130001B7
71298+:106680000013924036470001001524003C0A010027
71299+:10669000008A4825ACC900008F82004830BF003610
71300+:1066A00030B90008ACC200041320009900FF9825FF
71301+:1066B00035120E009650000A8F8700003C0F8100B3
71302+:1066C0003203FFFF24ED000835060140006F60250E
71303+:1066D0003C0E100031AB1FFF269200062405000E71
71304+:1066E000ACCC0020026E9825A4C5001AAF8B000028
71305+:1066F000A4D20018162000083C1080008F89003CAE
71306+:1067000024020F00512200022417000136730040BA
71307+:106710000E0001883C10800036060E008CCB001461
71308+:10672000360A014002402021AD4B00048CC5001CFC
71309+:10673000AD450008A1550012AD5300140E0001989C
71310+:106740003C151000AE1501780A000352000000004D
71311+:10675000936F0009976E0012936D000B31E500FFF7
71312+:1067600000AE202131AC00FF008C80212602000AFF
71313+:106770003050FFFF0E0001E7020020218F86004805
71314+:106780003C0341003C05800024CB0001AF8B004856
71315+:10679000936A00099769001230C600FF315F00FF5D
71316+:1067A0003128FFFF03E8382124F900020006C40065
71317+:1067B0000319782501E37025AC4E00008F6D000CA5
71318+:1067C00034A40E00948B001401B26025AC4C00047C
71319+:1067D0008C85001C8F670004936A00023164FFFF00
71320+:1067E000314900FFAFA900108F680014AFB1001845
71321+:1067F0000E0001CBAFA800140A0002FD0200202108
71322+:10680000AF600004A36000029798004033082000A6
71323+:106810001500FEA300003021A760001297840040FD
71324+:10682000936B000A3C10800030931F0000135183CB
71325+:10683000014BA82126A20028A362000936090E00F8
71326+:10684000953F000C0A000295A77F00108F7000147E
71327+:10685000360900400E000188AF6900140A0002C921
71328+:10686000000000000A00034F000020210641FEFA4C
71329+:10687000ACA0000C8CAC000C3C0D8000018D902570
71330+:106880000A0002EAACB2000C000090210A0002C526
71331+:1068900024130001128000073C028000344B0E00DC
71332+:1068A0009566000830D300401260004900000000E7
71333+:1068B0003C0680008CD001780600FFFE34C50E0037
71334+:1068C00094B500103C03050034CC014032B8FFFF02
71335+:1068D00003039025AD92000C8CAF0014240D200012
71336+:1068E0003C041000AD8F00048CAE001CAD8E00087F
71337+:1068F000A1800012A580001AAD800020A58000189C
71338+:10690000AD8D0014ACC401780A0003263C0680005B
71339+:106910008F9F0000351801402692000227F90008D9
71340+:1069200033281FFFA71200180A000391AF88000048
71341+:106930003C02800034450140ACA0000C1280001BDA
71342+:1069400034530E0034510E008E370010ACB70004E3
71343+:106950008E2400183C0B8000ACA400083570014068
71344+:1069600024040040A20000128FBF0048A600001AB5
71345+:106970008FB70044AE0000208FB60040A60000187C
71346+:106980008FB5003CAE0400148FB400388FB30034D0
71347+:106990008FB200308FB1002C8FB000283C02100065
71348+:1069A00027BD005003E00008AD6201788E66001438
71349+:1069B000ACA600048E64001C0A00042A3C0B800074
71350+:1069C0000E0001902E9100010A0003200237B0252D
71351+:1069D000000000000000000D00000000240003691A
71352+:1069E0000A0004013C06800027BDFFD8AFBF00208D
71353+:1069F0003C0980003C1F20FFAFB200183C0760003C
71354+:106A000035320E002402001037F9FFFDACE23008E9
71355+:106A1000AFB3001CAFB10014AFB00010AE5900000E
71356+:106A20000000000000000000000000000000000066
71357+:106A3000000000003C1800FF3713FFFDAE530000BC
71358+:106A40003C0B60048D7050002411FF7F3C0E00024F
71359+:106A50000211782435EC380C35CD0109ACED4C1819
71360+:106A6000240A0009AD6C50008CE80438AD2A0008F7
71361+:106A7000AD2000148CE54C1C3106FFFF38C42F718B
71362+:106A800000051E023062000F2486C0B310400007CC
71363+:106A9000AF8200088CE54C1C3C09001F3528FC0027
71364+:106AA00000A81824000321C2AF8400048CF1080858
71365+:106AB0003C0F57092412F0000232702435F0001008
71366+:106AC00001D0602601CF68262DAA00012D8B000180
71367+:106AD000014B382550E00009A380000C3C1F601CCE
71368+:106AE0008FF8000824190001A399000C33137C00CF
71369+:106AF000A7930010A780000EA380000DAF80004870
71370+:106B000014C00003AF8000003C066000ACC0442C01
71371+:106B10000E0005B93C1080000E000F1A361101005E
71372+:106B20003C12080026523DD03C13080026733E500C
71373+:106B30008E03000038640001308200011440FFFC25
71374+:106B40003C0B800A8E2600002407FF8024C90240E7
71375+:106B5000312A007F014B402101272824AE06002066
71376+:106B6000AF880044AE0500243C048000AF86003CA2
71377+:106B70008C8C01780580FFFE24180800922F0008F5
71378+:106B8000AC980178A38F0042938E004231CD000172
71379+:106B900011A0000F24050D0024DFF8002FF90301D8
71380+:106BA0001320001C000629C224A4FFF00004104298
71381+:106BB000000231400E00020200D2D8213C02400007
71382+:106BC0003C068000ACC201380A0004A000000000AE
71383+:106BD00010C50023240D0F0010CD00273C1F800896
71384+:106BE00037F9008093380000240E0050330F00FF67
71385+:106BF00015EEFFF33C0240000E000A3600000000D4
71386+:106C00003C0240003C068000ACC201380A0004A0EF
71387+:106C1000000000008F83000400A3402B1500000B30
71388+:106C20008F8B0008006B50212547FFFF00E5482BA4
71389+:106C30001520000600A36023000C19400E0002027C
71390+:106C40000073D8210A0004C43C0240000000000D7B
71391+:106C50000E000202000000000A0004C43C024000D2
71392+:106C60003C1B0800277B3F500E0002020000000082
71393+:106C70000A0004C43C0240003C1B0800277B3F7014
71394+:106C80000E000202000000000A0004C43C024000A2
71395+:106C90003C0660043C09080025290104ACC9502CBD
71396+:106CA0008CC850003C0580003C0200023507008083
71397+:106CB000ACC750003C040800248415A43C03080021
71398+:106CC0002463155CACA50008ACA2000C3C010800D4
71399+:106CD000AC243D603C010800AC233D6403E00008A7
71400+:106CE0002402000100A030213C1C0800279C3D68C4
71401+:106CF0003C0C04003C0B0002008B3826008C402624
71402+:106D00002CE200010007502B2D050001000A4880ED
71403+:106D10003C03080024633D60004520250123182121
71404+:106D20001080000300001021AC6600002402000166
71405+:106D300003E00008000000003C1C0800279C3D68A0
71406+:106D40003C0B04003C0A0002008A3026008B3826E7
71407+:106D50002CC200010006482B2CE5000100094080F0
71408+:106D60003C03080024633D600045202501031821F1
71409+:106D700010800005000010213C0C0800258C155CDB
71410+:106D8000AC6C00002402000103E0000800000000D9
71411+:106D90003C0900023C08040000883026008938269F
71412+:106DA0002CC30001008028212CE400010083102561
71413+:106DB0001040000B000030213C1C0800279C3D685F
71414+:106DC0003C0A80008D4E00082406000101CA682597
71415+:106DD000AD4D00088D4C000C01855825AD4B000CC5
71416+:106DE00003E0000800C010213C1C0800279C3D68FF
71417+:106DF0003C0580008CA6000C000420272402000122
71418+:106E000000C4182403E00008ACA3000C3C020002FC
71419+:106E10001082000B3C0560003C0704001087000353
71420+:106E20000000000003E00008000000008CA908D06A
71421+:106E3000240AFFFD012A402403E00008ACA808D082
71422+:106E40008CA408D02406FFFE0086182403E0000866
71423+:106E5000ACA308D03C05601A34A600108CC3008097
71424+:106E600027BDFFF88CC50084AFA3000093A40000E9
71425+:106E70002402000110820003AFA5000403E0000813
71426+:106E800027BD000893A7000114E0001497AC00028E
71427+:106E900097B800023C0F8000330EFFFC01CF682141
71428+:106EA000ADA50000A3A000003C0660008CC708D080
71429+:106EB0002408FFFE3C04601A00E82824ACC508D072
71430+:106EC0008FA300048FA200003499001027BD000892
71431+:106ED000AF22008003E00008AF2300843C0B800059
71432+:106EE000318AFFFC014B48218D2800000A00057DF6
71433+:106EF000AFA8000427BDFFE8AFBF00103C1C08008E
71434+:106F0000279C3D683C0580008CA4000C8CA20004EA
71435+:106F10003C0300020044282410A0000A00A3182407
71436+:106F20003C0604003C0400021460000900A6102482
71437+:106F30001440000F3C0404000000000D3C1C08003D
71438+:106F4000279C3D688FBF001003E0000827BD001894
71439+:106F50003C0208008C423D600040F809000000003F
71440+:106F60003C1C0800279C3D680A0005A68FBF001046
71441+:106F70003C0208008C423D640040F809000000001B
71442+:106F80000A0005AC00000000000411C003E0000886
71443+:106F9000244202403C04080024843FB42405001A23
71444+:106FA0000A00009C0000302127BDFFE0AFB00010B8
71445+:106FB0003C108000AFBF0018AFB1001436110100C3
71446+:106FC000922200090E0005B63044007F8E3F00007B
71447+:106FD0008F89003C3C0F008003E26021258800403F
71448+:106FE0000049F821240DFF80310E00783198007897
71449+:106FF00035F9000135F100020319382501D1482582
71450+:10700000010D302403ED5824018D2824240A00406A
71451+:1070100024040080240300C0AE0B0024AE0008103E
71452+:10702000AE0A0814AE040818AE03081CAE05080426
71453+:10703000AE070820AE060808AE0908243609090084
71454+:107040009539000C3605098033ED007F3338FFFF9A
71455+:10705000001889C0AE110800AE0F0828952C000C4E
71456+:107060008FBF00188FB10014318BFFFF000B51C090
71457+:10707000AE0A002C8CA400508FB000108CA3003CF2
71458+:107080008D2700048CA8001C8CA600383C0E800ABA
71459+:1070900001AE102127BD0020AF820044AF84005014
71460+:1070A000AF830054AF87004CAF88005C03E000085A
71461+:1070B000AF8600603C09080091293FD924A800024E
71462+:1070C0003C05110000093C0000E8302500C51825EA
71463+:1070D00024820008AC83000003E00008AC800004B8
71464+:1070E0003C098000352309009128010B906A0011AA
71465+:1070F0002402002800804821314700FF00A07021B1
71466+:1071000000C068213108004010E20002340C86DD26
71467+:10711000240C08003C0A800035420A9A944700007B
71468+:10712000354B0A9C35460AA030F9FFFFAD39000007
71469+:107130008D780000354B0A8024040001AD3800042E
71470+:107140008CCF0000AD2F00089165001930A300031B
71471+:107150001064009028640002148000AF240500022F
71472+:107160001065009E240F0003106F00B435450AA47B
71473+:10717000240A0800118A0048000000005100003D68
71474+:107180003C0B80003C0480003483090090670012AF
71475+:1071900030E200FF004D7821000FC8802724000155
71476+:1071A0003C0A8000354F090091E50019354C0980F3
71477+:1071B0008D87002830A300FF0003150000475825E5
71478+:1071C0000004C4003C19600001793025370806FF2F
71479+:1071D000AD260000AD2800048DEA002C25280028EB
71480+:1071E000AD2A00088DEC0030AD2C000C8DE500348C
71481+:1071F000AD2500108DE400383C05800034AC093C1E
71482+:10720000AD2400148DE3001CAD2300188DE7002091
71483+:10721000AD27001C8DE20024AD2200208DF900284E
71484+:1072200034A20100AD3900248D830000AD0E0004AE
71485+:1072300034B90900AD0300008C47000C250200148E
71486+:10724000AD070008932B00123C04080090843FD83F
71487+:10725000AD000010317800FF030D302100064F0013
71488+:1072600000047C00012F702535CDFFFC03E00008F1
71489+:10727000AD0D000C35780900930600123C0508009E
71490+:1072800094A53FC830C800FF010D5021000A60805E
71491+:107290000A00063C018520211500005B000000006B
71492+:1072A0003C08080095083FCE3C06080094C63FC83D
71493+:1072B000010610213C0B800035790900933800113C
71494+:1072C000932A001935660A80330800FF94CF002AFC
71495+:1072D00000086082314500FF978A0058000C1E00AC
71496+:1072E000000524003047FFFF006410250047C0253B
71497+:1072F00001EA30213C0B4000030B402500066400EE
71498+:10730000AD280000AD2C0004932500183C030006B6
71499+:107310002528001400053E0000E31025AD220008DA
71500+:107320008F24002C3C05800034AC093CAD24000CBB
71501+:107330008F38001C34A20100254F0001AD38001029
71502+:107340008D830000AD0E000431EB7FFFAD03000024
71503+:107350008C47000C34B90900A78B0058AD07000812
71504+:10736000932B00123C04080090843FD8250200149F
71505+:10737000317800FF030D302100064F0000047C002F
71506+:10738000012F702535CDFFFCAD00001003E0000893
71507+:10739000AD0D000C3C02080094423FD23C050800B1
71508+:1073A00094A53FC835440AA43C07080094E73FC4AD
71509+:1073B000948B00000045C8210327C023000B1C004C
71510+:1073C0002706FFF200665025AD2A000CAD20001004
71511+:1073D000AD2C00140A00063025290018354F0AA4E8
71512+:1073E00095E50000956400280005140000043C00A9
71513+:1073F0003459810000EC5825AD39000CAD2B00103C
71514+:107400000A000630252900143C0C0800958C3FCE5C
71515+:107410000A000681258200015460FF56240A0800F4
71516+:1074200035580AA49706000000061C00006C502581
71517+:10743000AD2A000C0A000630252900103C03080084
71518+:1074400094633FD23C07080094E73FC83C0F080014
71519+:1074500095EF3FC494A4000095790028006710219F
71520+:10746000004F582300041C00001934002578FFEE5B
71521+:1074700000D87825346A8100AD2A000CAD2F0010A9
71522+:10748000AD200014AD2C00180A0006302529001C80
71523+:1074900003E00008240207D027BDFFE0AFB20018C8
71524+:1074A000AFB10014AFB00010AFBF001C0E00007CE5
71525+:1074B000008088218F8800548F87004C3C0580080D
71526+:1074C00034B20080011128213C1080002402008089
71527+:1074D000240300C000A72023AE0208183C06800841
71528+:1074E000AE03081C18800004AF850054ACC500042E
71529+:1074F0008CC90004AF89004C1220000936040980B1
71530+:107500000E0006F800000000924C00278E0B00745D
71531+:1075100001825004014B3021AE46000C3604098034
71532+:107520008C8E001C8F8F005C01CF682319A0000493
71533+:107530008FBF001C8C90001CAF90005C8FBF001CA4
71534+:107540008FB200188FB100148FB000100A00007EB7
71535+:1075500027BD00208F8600508F8300548F82004CFF
71536+:107560003C05800834A40080AC860050AC83003C0D
71537+:1075700003E00008ACA200043C0308008C63005444
71538+:1075800027BDFFF8308400FF2462000130A500FF12
71539+:107590003C010800AC22005430C600FF3C078000CC
71540+:1075A0008CE801780500FFFE3C0C7FFFA3A40003DC
71541+:1075B0008FAA0000358BFFFF014B4824000627C02F
71542+:1075C00001244025AFA8000034E201009043000AE6
71543+:1075D000A3A000023C1980FFA3A300018FAF00000D
71544+:1075E00030AE007F3738FFFF01F86024000E6E00D8
71545+:1075F0003C0A002034E50140018D58253549200022
71546+:107600002406FF803C04100027BD0008ACAB000C32
71547+:10761000ACA90014A4A00018A0A6001203E0000862
71548+:10762000ACE40178308800FF30A700FF3C03800005
71549+:107630008C6201780440FFFE3C0C8000358A0A0011
71550+:107640008D4B00203584014035850980AC8B0004CA
71551+:107650008D4900240007302B00061540AC89000836
71552+:10766000A088001090A3004CA083002D03E0000828
71553+:10767000A480001827BDFFE8308400FFAFBF0010D2
71554+:107680000E00075D30A500FF8F8300548FBF0010F0
71555+:107690003C06800034C50140344700402404FF907C
71556+:1076A0003C02100027BD0018ACA3000CA0A40012DF
71557+:1076B000ACA7001403E00008ACC2017827BDFFE0CE
71558+:1076C0003C088008AFBF001CAFB20018AFB1001477
71559+:1076D000AFB00010351000808E0600183C07800007
71560+:1076E000309200FF00C72025AE0400180E00007C79
71561+:1076F00030B100FF92030005346200080E00007EE6
71562+:10770000A2020005024020210E000771022028215C
71563+:10771000024020218FBF001C8FB200188FB10014CF
71564+:107720008FB0001024050005240600010A0007326E
71565+:1077300027BD00203C05800034A309809066000826
71566+:1077400030C200081040000F3C0A01013549080A08
71567+:10775000AC8900008CA80074AC8800043C070800C9
71568+:1077600090E73FD830E5001050A00008AC8000083A
71569+:107770003C0D800835AC00808D8B0058AC8B000828
71570+:107780002484000C03E00008008010210A0007B5E3
71571+:107790002484000C27BDFFE83C098000AFB0001036
71572+:1077A000AFBF00143526098090C8000924020006E6
71573+:1077B00000A05821310300FF3527090000808021F7
71574+:1077C000240500041062007B2408000294CF005CB2
71575+:1077D0003C0E020431EDFFFF01AE6025AE0C00004F
71576+:1077E00090CA00083144002010800008000000000A
71577+:1077F00090C2004E3C1F010337F90300305800FFD0
71578+:107800000319302524050008AE06000490F9001184
71579+:1078100090E6001290E40011333800FF00187082E7
71580+:1078200030CF00FF01CF5021014B6821308900FF8C
71581+:1078300031AAFFFF39230028000A60801460002C61
71582+:10784000020C482390E400123C198000372F0100FD
71583+:10785000308C00FF018B1821000310800045F821B7
71584+:10786000001F8400360706FFAD270004373F0900DC
71585+:1078700093EC001193EE0012372609800005C082B8
71586+:107880008DE4000C8CC5003431CD00FF01AB10211C
71587+:107890000058182100A4F8230008840000033F00CA
71588+:1078A00000F0302533F9FFFF318F00FC00D970253F
71589+:1078B0000158202101E9682100045080ADAE000C80
71590+:1078C0000E00007C012A80213C088008240B000463
71591+:1078D000350500800E00007EA0AB000902001021DB
71592+:1078E0008FBF00148FB0001003E0000827BD001800
71593+:1078F00090EC001190E300193C18080097183FCE57
71594+:10790000318200FF0002F882307000FF001FCE00BD
71595+:1079100000103C000327302500D870253C0F4000A4
71596+:1079200001CF68253C198000AD2D0000373F0900CC
71597+:1079300093EC001193EE0012372F010037260980D7
71598+:107940000005C0828DE4000C8CC5003431CD00FFF1
71599+:1079500001AB10210058182100A4F823000884006E
71600+:1079600000033F0000F0302533F9FFFF318F00FCAA
71601+:1079700000D970250158202101E9682100045080B8
71602+:10798000ADAE000C0E00007C012A80213C0880086E
71603+:10799000240B0004350500800E00007EA0AB00091A
71604+:1079A000020010218FBF00148FB0001003E0000808
71605+:1079B00027BD00180A0007C72408001227BDFFD002
71606+:1079C0003C038000AFB60028AFB50024AFB4002060
71607+:1079D000AFB10014AFBF002CAFB3001CAFB20018A2
71608+:1079E000AFB000103467010090E6000B309400FF48
71609+:1079F00030B500FF30C200300000B02110400099C7
71610+:107A000000008821346409809088000800082E0056
71611+:107A100000051E03046000C0240400048F86005487
71612+:107A20003C010800A0243FD83C0C8000AD800048F9
71613+:107A30003C048000348E010091CD000B31A5002064
71614+:107A400010A000073C078000349309809272000860
71615+:107A50000012860000107E0305E000C43C1F800871
71616+:107A600034EC0100918A000B34EB09809169000825
71617+:107A7000314400400004402B3123000800C8982303
71618+:107A80001460000224120003000090213C108000CA
71619+:107A900036180A8036040900970E002C90830011D6
71620+:107AA0009089001293050018307F00FF312800FFF5
71621+:107AB000024810210002C880930D0018033F78216E
71622+:107AC00001F1302130B100FF00D11821A78E0058FC
71623+:107AD0003C010800A4263FCE3C010800A4233FD06F
71624+:107AE00015A00002000000000000000D920B010B29
71625+:107AF0003065FFFF3C010800A4233FD2316A0040FB
71626+:107B00003C010800A4203FC83C010800A4203FC459
71627+:107B10001140000224A4000A24A4000B3091FFFFAE
71628+:107B20000E0001E7022020219206010B3C0C080008
71629+:107B3000958C3FD2004020210006698231A70001C8
71630+:107B40000E00060101872821004020210260282123
71631+:107B50000E00060C024030210E0007A1004020213B
71632+:107B600016C00069004020219212010B32560040DD
71633+:107B700012C000053C0500FF8C93000034AEFFFFEF
71634+:107B8000026E8024AC9000000E0001FB0220202138
71635+:107B90003C0F080091EF3FD831F10003122000168E
71636+:107BA0003C1380088F8200543C09800835280080EF
71637+:107BB000245F0001AD1F003C3C0580088CB9000427
71638+:107BC00003E02021033FC0231B000002AF9F0054AD
71639+:107BD0008CA400040E0006F8ACA400043C0780004E
71640+:107BE0008CEB00743C04800834830080004B5021EF
71641+:107BF000AC6A000C3C1380083670008002802021A3
71642+:107C000002A02821A200006B0E00075D3C1480003A
71643+:107C10008F920054368C0140AD92000C8F86004844
71644+:107C20003C151000344D000624D60001AF960048E4
71645+:107C30008FBF002CA18600128FB60028AD8D0014D6
71646+:107C40008FB3001CAE9501788FB200188FB5002459
71647+:107C50008FB400208FB100148FB0001003E0000833
71648+:107C600027BD003034640980908F0008000F760033
71649+:107C7000000E6E0305A00033347F090093F8001B4B
71650+:107C8000241900103C010800A0393FD8331300022A
71651+:107C90001260FF678F8600548F8200601446FF6574
71652+:107CA0003C0480000E00007C000000003C048008C2
71653+:107CB0003485008090A8000924060016310300FFD7
71654+:107CC0001066000D0000000090AB00093C070800A2
71655+:107CD00090E73FD824090008316400FF34EA00012E
71656+:107CE0003C010800A02A3FD81089002F240C000A6C
71657+:107CF000108C00282402000C0E00007E0000000002
71658+:107D00000A0008608F8600540E0007B9024028213F
71659+:107D10000A0008AE004020213C0B8008356A008034
71660+:107D20008D4600548CE9000C1120FF3DAF860054B5
71661+:107D3000240700143C010800A0273FD80A00085F70
71662+:107D40003C0C800090910008241200023C010800C5
71663+:107D5000A0323FD8323000201200000B2416000160
71664+:107D60008F8600540A0008602411000837F800804C
71665+:107D70008F020038AFE200048FF90004AF19003C15
71666+:107D80000A00086C3C0780008F8600540A000860D7
71667+:107D900024110004A0A200090E00007E00000000D3
71668+:107DA0000A0008608F860054240200140A00093A71
71669+:107DB000A0A2000927BDFFE8AFB000103C10800072
71670+:107DC000AFBF001436020100904400090E00075DA9
71671+:107DD000240500013C0480089099000E3483008043
71672+:107DE000909F000F906F00269089000A33F800FFE3
71673+:107DF00000196E000018740031EC00FF01AE502530
71674+:107E0000000C5A00014B3825312800FF3603014091
71675+:107E10003445600000E830252402FF813C04100056
71676+:107E2000AC66000C8FBF0014AC650014A062001299
71677+:107E3000AE0401788FB0001003E0000827BD0018E1
71678+:107E400027BDFFE8308400FFAFBF00100E00075DC4
71679+:107E500030A500FF3C05800034A4014034470040B9
71680+:107E60002406FF92AC870014A08600128F83005472
71681+:107E70008FBF00103C02100027BD0018AC83000C1F
71682+:107E800003E00008ACA2017827BDFFD8AFB0001016
71683+:107E9000308400FF30B000FF3C058000AFB100141B
71684+:107EA000AFBF0020AFB3001CAFB20018000410C277
71685+:107EB00034A60100320300023051000114600007B3
71686+:107EC00090D200093C098008353300809268000593
71687+:107ED0003107000810E0000C308A00100240202119
71688+:107EE0000E00078302202821240200018FBF0020FA
71689+:107EF0008FB3001C8FB200188FB100148FB0001028
71690+:107F000003E0000827BD00281540003434A50A000E
71691+:107F10008CB800248CAF0008130F004B00003821F0
71692+:107F20003C0D800835B30080926C00682406000286
71693+:107F3000318B00FF116600843C06800034C20100D2
71694+:107F40009263004C90590009307F00FF53F9000400
71695+:107F50003213007C10E00069000000003213007C46
71696+:107F60005660005C0240202116200009320D0001FD
71697+:107F70003C0C800035840100358B0A008D6500249F
71698+:107F80008C86000414A6FFD900001021320D0001D8
71699+:107F900011A0000E024020213C1880003710010083
71700+:107FA0008E0F000C8F8E005011EE000800000000B4
71701+:107FB0000E000843022028218E19000C3C1F800867
71702+:107FC00037F00080AE190050024020210E000771EA
71703+:107FD000022028210A00098F240200013C05080024
71704+:107FE0008CA5006424A400013C010800AC240064BA
71705+:107FF0001600000D00000000022028210E0007716D
71706+:1080000002402021926E0068240C000231CD00FF56
71707+:1080100011AC0022024020210E00094100000000A6
71708+:108020000A00098F240200010E00007024040001E0
71709+:10803000926B0025020B30250E00007EA266002503
71710+:108040000A0009D3022028218E6200188CDF000468
71711+:108050008CB9002400021E0217F9FFB13065007FC1
71712+:108060009268004C264400013093007F1265004066
71713+:10807000310300FF1464FFAB3C0D8008264700016C
71714+:1080800030F1007F30E200FF1225000B24070001D1
71715+:10809000004090210A00099C2411000124050004DD
71716+:1080A0000E000732240600010E0009410000000006
71717+:1080B0000A00098F240200012405FF8002452024C4
71718+:1080C00000859026324200FF004090210A00099C62
71719+:1080D000241100010E00084302202821320700303D
71720+:1080E00010E0FFA132100082024020210E00078321
71721+:1080F000022028210A00098F240200018E6900183D
71722+:108100000240202102202821012640250E0009647A
71723+:10811000AE6800189264004C240500032406000198
71724+:108120000E000732308400FF0E00007024040001AE
71725+:1081300092710025021150250E00007EA26A0025D2
71726+:108140000A00098F240200018E6F00183C1880007D
71727+:108150000240202101F87025022028210E0007711D
71728+:10816000AE6E00189264004C0A000A1B240500043D
71729+:10817000324A0080394900801469FF6A3C0D80084A
71730+:108180000A0009F42647000127BDFFC0AFB0001860
71731+:108190003C108000AFBF0038AFB70034AFB600303E
71732+:1081A000AFB5002CAFB40028AFB30024AFB20020AD
71733+:1081B0000E0005BEAFB1001C360201009045000B59
71734+:1081C0000E00097690440008144000E78FBF003885
71735+:1081D0003C08800835070080A0E0006B3606098067
71736+:1081E00090C50000240300503C17080026F73F907C
71737+:1081F00030A400FF3C13080026733FA01083000347
71738+:108200003C1080000000B82100009821241F0010BD
71739+:108210003611010036120A00361509808E580024E6
71740+:108220008E3400048EAF00208F8C00543C01080077
71741+:10823000A03F3FD836190A80972B002C8EF60000FD
71742+:10824000932A00180298702301EC68233C0108006F
71743+:10825000AC2E3FB43C010800AC2D3FB83C010800F7
71744+:10826000AC2C3FDCA78B005802C0F809315400FF4A
71745+:1082700030490002152000E930420001504000C49E
71746+:108280009227000992A90008312800081500000271
71747+:10829000241500030000A8213C0A80003543090092
71748+:1082A00035440A008C8D00249072001190700012E9
71749+:1082B000907F0011325900FF321100FF02B11021EE
71750+:1082C0000002C08033EF00FF0319B021028F70213C
71751+:1082D00002D4602125CB00103C010800A4363FCE1B
71752+:1082E0003C010800AC2D3FE03C010800A42C3FD02D
71753+:1082F0003C010800A42B3FCC3556010035540980C1
71754+:1083000035510E008F8700548F89005C8E850020C8
71755+:1083100024080006012730233C010800AC283FD484
71756+:1083200000A7282304C000B50000902104A000B3DA
71757+:1083300000C5502B114000B5000000003C010800B2
71758+:10834000AC263FB88E6200000040F8090000000033
71759+:108350003046000214C0007400408021304B000100
71760+:10836000556000118E6200043C0D08008DAD3FBCCD
71761+:108370003C0EC0003C04800001AE6025AE2C000025
71762+:108380008C980000330F000811E0FFFD0000000092
71763+:10839000963F000824120001A79F00408E39000478
71764+:1083A000AF9900388E6200040040F8090000000018
71765+:1083B0000202802532030002146000B300000000B6
71766+:1083C0003C09080095293FC43C06080094C63FD0EC
71767+:1083D0003C0A0800954A3FC63C0708008CE73FBCB2
71768+:1083E000012670213C0308008C633FE03C08080034
71769+:1083F00095083FDA01CA20218ED9000C00E9282116
71770+:10840000249F000200A878210067C02133E4FFFF09
71771+:10841000AF9900503C010800AC383FE03C01080037
71772+:10842000A42F3FC83C010800A42E3FD20E0001E754
71773+:10843000000000008F8D0048004020213C01080012
71774+:10844000A02D3FD98E62000825AC0001AF8C0048FA
71775+:108450000040F809000000008F85005402A0302180
71776+:108460000E00060C004020210E0007A10040202134
71777+:108470008E6B000C0160F809004020213C0A0800C6
71778+:10848000954A3FD23C06080094C63FC601464821A3
71779+:10849000252800020E0001FB3104FFFF3C05080007
71780+:1084A0008CA53FB43C0708008CE73FBC00A7202305
71781+:1084B0003C010800AC243FB414800006000000001A
71782+:1084C0003C0208008C423FD4344B00403C01080081
71783+:1084D000AC2B3FD4124000438F8E00448E2D0010F1
71784+:1084E0008F920044AE4D00208E2C0018AE4C00241C
71785+:1084F0003C04080094843FC80E0006FA0000000007
71786+:108500008F9F00548E6700103C010800AC3F3FDC99
71787+:1085100000E0F809000000003C1908008F393FB462
71788+:108520001720FF798F870054979300583C11800ED5
71789+:10853000321601000E000729A633002C16C0004594
71790+:10854000320300105460004C8EE5000432080040F5
71791+:108550005500001D8EF000088EE4000C0080F80924
71792+:10856000000000008FBF00388FB700348FB6003096
71793+:108570008FB5002C8FB400288FB300248FB2002059
71794+:108580008FB1001C8FB0001803E0000827BD004029
71795+:108590008F86003C36110E0000072E0000A6202515
71796+:1085A000AE0400808E4300208E500024AFA3001044
71797+:1085B000AE2300148FB20010AE320010AE30001C9B
71798+:1085C0000A000A75AE3000180200F8090000000029
71799+:1085D0008EE4000C0080F809000000000A000B2E59
71800+:1085E0008FBF003824180001240F0001A5C000200F
71801+:1085F000A5D800220A000B10ADCF00243C010800D2
71802+:10860000AC203FB80A000AA68E6200003C010800B8
71803+:10861000AC253FB80A000AA68E6200009224000929
71804+:108620000E000771000028218FBF00388FB700347B
71805+:108630008FB600308FB5002C8FB400288FB3002484
71806+:108640008FB200208FB1001C8FB0001803E000082B
71807+:1086500027BD00403C1480009295010900002821AC
71808+:108660000E00084332A400FF320300105060FFB830
71809+:10867000320800408EE5000400A0F8090000000068
71810+:108680000A000B28320800405240FFA89793005878
71811+:108690008E3400148F930044AE7400208E35001C7D
71812+:1086A000AE7500240A000B1F979300588F820014A8
71813+:1086B0000004218003E00008008210213C078008AC
71814+:1086C00034E200809043006900804021106000097E
71815+:1086D0003C0401003C0708008CE73FDC8F8300303E
71816+:1086E00000E32023048000089389001C14E30003A6
71817+:1086F0000100202103E00008008010213C0401005B
71818+:1087000003E00008008010211120000B00673823CF
71819+:108710003C0D800035AC0980918B007C316A0002F1
71820+:10872000114000202409003400E9702B15C0FFF12E
71821+:108730000100202100E938232403FFFC00A3C82402
71822+:1087400000E3C02400F9782B15E0FFEA030820219C
71823+:1087500030C400030004102314C000143049000387
71824+:108760000000302100A9782101E6702100EE682B7D
71825+:1087700011A0FFE03C0401002D3800010006C82BC9
71826+:10878000010548210319382414E0FFDA2524FFFCF1
71827+:108790002402FFFC00A218240068202103E0000846
71828+:1087A000008010210A000B9E240900303C0C800040
71829+:1087B0003586098090CB007C316A00041540FFE9C2
71830+:1087C000240600040A000BAD000030213C03080021
71831+:1087D0008C63005C8F82001827BDFFE0AFBF0018DC
71832+:1087E000AFB1001410620005AFB00010000329C043
71833+:1087F00024A40280AF840014AF8300183C108000D2
71834+:1088000036020A0094450032361101000E000B7F3B
71835+:1088100030A43FFF8E240000241FFF803C11008005
71836+:108820000082C021031F60243309007F000CC9406F
71837+:1088300003294025330E0078362F00033C0D10002D
71838+:10884000010D502501CF5825AE0C002836080980AF
71839+:10885000AE0C080CAE0B082CAE0A08309103006970
71840+:108860003C06800C0126382110600006AF870034DA
71841+:108870008D09003C8D03006C0123382318E0008231
71842+:10888000000000003C0B8008356A00803C1080002E
71843+:10889000A1400069360609808CC200383C06800081
71844+:1088A00034C50A0090A8003C310C00201180001A49
71845+:1088B000AF820030240D00013C0E800035D10A004B
71846+:1088C000A38D001CAF8000248E2400248F850024FB
71847+:1088D000240D0008AF800020AF8000283C01080074
71848+:1088E000A42D3FC63C010800A4203FDA0E000B83F4
71849+:1088F000000030219228003C8FBF00188FB1001477
71850+:108900008FB0001000086142AF82002C27BD00200C
71851+:1089100003E000083182000190B80032240E00010B
71852+:10892000330F00FF000F2182108E00412419000236
71853+:108930001099006434C40AC03C03800034640A0007
71854+:108940008C8F002415E0001E34660900909F0030D3
71855+:108950002418000533F9003F1338004E24030001AA
71856+:108960008F860020A383001CAF860028AF860024DA
71857+:108970003C0E800035D10A008E2400248F8500240F
71858+:10898000240D00083C010800A42D3FC63C0108004E
71859+:10899000A4203FDA0E000B83000000009228003C68
71860+:1089A0008FBF00188FB100148FB000100008614213
71861+:1089B000AF82002C27BD002003E0000831820001B7
71862+:1089C0008C8A00088C8B00248CD000643C0E8000C4
71863+:1089D00035D10A00014B2823AF900024A380001C4E
71864+:1089E000AF8500288E2400248F8600208F850024E8
71865+:1089F000240D00083C010800A42D3FC63C010800DE
71866+:108A0000A4203FDA0E000B83000000009228003CF7
71867+:108A10008FBF00188FB100148FB0001000086142A2
71868+:108A2000AF82002C27BD002003E000083182000146
71869+:108A300090A200303051003F5224002834C50AC0B3
71870+:108A40008CB000241600002234CB09008CA600480C
71871+:108A50003C0A7FFF3545FFFF00C510243C0E800017
71872+:108A6000AF82002035C509008F8800208CAD0060E2
71873+:108A7000010D602B15800002010020218CA40060F4
71874+:108A80000A000C22AF8400208D02006C0A000BFC4F
71875+:108A90003C0680008C8200488F8600203C097FFFC6
71876+:108AA0003527FFFF004788243C0480082403000189
71877+:108AB000AF910028AC80006CA383001C0A000C302E
71878+:108AC000AF8600248C9F00140A000C22AF9F002068
71879+:108AD0008D6200680A000C6C3C0E800034C4098072
71880+:108AE0008C8900708CA300140123382B10E0000443
71881+:108AF000000000008C8200700A000C6C3C0E8000AC
71882+:108B00008CA200140A000C6C3C0E80008F8500249F
71883+:108B100027BDFFE0AFBF0018AFB1001414A00008DC
71884+:108B2000AFB000103C04800034870A0090E60030AB
71885+:108B30002402000530C3003F106200B934840900EC
71886+:108B40008F91002000A080213C048000348E0A0018
71887+:108B50008DCD00043C0608008CC63FB831A73FFF0E
71888+:108B600000E6602B5580000100E03021938F001C4F
71889+:108B700011E0007800D0282B349F098093F9007C05
71890+:108B800033380002130000792403003400C3102B93
71891+:108B9000144000D90000000000C3302300D0282B6F
71892+:108BA0003C010800A4233FC414A0006E0200182159
71893+:108BB0003C0408008C843FB40064402B5500000145
71894+:108BC000006020213C05800034A90A00912A003C65
71895+:108BD0003C010800AC243FBC31430020146000037A
71896+:108BE0000000482134AB0E008D6900188F88002CDE
71897+:108BF0000128202B1080005F000000003C050800C9
71898+:108C00008CA53FBC00A96821010D602B1180005C80
71899+:108C100000B0702B0109382300E028213C01080036
71900+:108C2000AC273FBC12000003240AFFFC10B0008DEB
71901+:108C30003224000300AA18243C010800A4203FDAD3
71902+:108C40003C010800AC233FBC006028218F84002435
71903+:108C5000120400063C0B80088D6C006C0200202181
71904+:108C6000AF91002025900001AD70006C8F8D002821
71905+:108C700000858823AF91002401A52023AF8400281C
71906+:108C80001220000224070018240700103C18800856
71907+:108C90003706008090CF00683C010800A0273FD82D
71908+:108CA0002407000131EE00FF11C70047000000005B
71909+:108CB00014800018000028213C06800034D109806F
71910+:108CC00034CD010091A600098E2C001824C40001A7
71911+:108CD000000C86023205007F308B007F1165007F1B
71912+:108CE0002407FF803C19800837290080A124004C0C
71913+:108CF0003C0808008D083FD4241800023C010800FD
71914+:108D0000A0384019350F00083C010800AC2F3FD4B3
71915+:108D1000240500103C02800034440A009083003C8B
71916+:108D2000307F002013E0000500A02021240A00016C
71917+:108D30003C010800AC2A3FBC34A400018FBF0018DE
71918+:108D40008FB100148FB000100080102103E00008E4
71919+:108D500027BD00203C010800A4203FC410A0FF94C0
71920+:108D6000020018210A000CC000C018210A000CB72C
71921+:108D7000240300303C0508008CA53FBC00B0702BDC
71922+:108D800011C0FFA8000000003C19080097393FC43B
71923+:108D90000325C0210307782B11E000072CAA00044B
71924+:108DA0003C0360008C625404305F003F17E0FFE337
71925+:108DB000240400422CAA00041140FF9A240400421B
71926+:108DC0000A000D248FBF00181528FFB9000000000D
71927+:108DD0008CCA00183C1F800024020002015F182585
71928+:108DE000ACC3001837F90A00A0C200689329003C00
71929+:108DF0002404000400A01021312800203C010800B8
71930+:108E0000A0244019110000022405001024020001D2
71931+:108E10003C010800AC223FB40A000D1A3C0280005D
71932+:108E20008F8800288C8900600109282B14A000027B
71933+:108E3000010088218C9100603C048000348B0E007E
71934+:108E40008D640018240A000102202821022030210C
71935+:108E5000A38A001C0E000B83022080210A000CA6AE
71936+:108E6000AF82002C00045823122000073164000355
71937+:108E70003C0E800035C7098090ED007C31AC0004C9
71938+:108E800015800019248F00043C010800A4243FDA57
71939+:108E90003C1F080097FF3FDA03E5C82100D9C02B2B
71940+:108EA0001300FF6B8F8400242CA6000514C0FFA3C1
71941+:108EB0002404004230A200031440000200A2182340
71942+:108EC00024A3FFFC3C010800AC233FBC3C0108008C
71943+:108ED000A4203FDA0A000CE70060282100C77024B4
71944+:108EE0000A000D0D01C720263C010800A42F3FDA1F
71945+:108EF0000A000D78000000003C010800AC203FBCD7
71946+:108F00000A000D23240400428F8300283C058000C2
71947+:108F100034AA0A00146000060000102191470030B6
71948+:108F20002406000530E400FF108600030000000066
71949+:108F300003E0000800000000914B0048316900FF89
71950+:108F4000000941C21500FFFA3C0680083C040800F5
71951+:108F500094843FC43C0308008C633FDC3C19080048
71952+:108F60008F393FBC3C0F080095EF3FDA0064C02109
71953+:108F70008CCD00040319702101CF602134AB0E00A9
71954+:108F8000018D282318A0001D00000000914F004C07
71955+:108F90008F8C0034956D001031EE00FF8D89000438
71956+:108FA00001AE30238D8A000030CEFFFF000E290075
71957+:108FB0000125C82100003821014720210325182B55
71958+:108FC0000083C021AD990004AD980000918F000A84
71959+:108FD00001CF6821A18D000A956500128F8A0034A7
71960+:108FE000A5450008954B003825690001A5490038C2
71961+:108FF0009148000D35070008A147000D03E0000867
71962+:109000000000000027BDFFD8AFB000189388001CF7
71963+:109010008FB000143C0A80003C197FFF8F8700242A
71964+:109020003738FFFFAFBF0020AFB1001C355F0A002B
71965+:109030000218182493EB003C00087FC03C02BFFFDD
71966+:10904000006F60252CF000013449FFFF3C1F080031
71967+:109050008FFF3FDC8F9900303C18080097183FD2F3
71968+:1090600001897824001047803C07EFFF3C05F0FFA2
71969+:1090700001E818253C1180003169002034E2FFFF2F
71970+:1090800034ADFFFF362E098027A50010240600020C
71971+:1090900003F96023270B0002354A0E0000621824F2
71972+:1090A0000080802115200002000040218D48001C16
71973+:1090B000A7AB0012058000392407000030E800FF4C
71974+:1090C00000083F00006758253C028008AFAB001441
71975+:1090D000344F008091EA00683C08080091083FD9AD
71976+:1090E0003C09DFFF352CFFFF000AF82B3C0208008B
71977+:1090F00094423FCCA3A80011016CC024001FCF40B4
71978+:10910000031918258FA70010AFA300143C0C08000A
71979+:10911000918C3FDBA7A200168FAB001400ED482412
71980+:109120003C0F01003C0A0FFF012FC82531980003B6
71981+:10913000355FFFFF016D40243C027000033F38247F
71982+:1091400000181E0000E2482501037825AFAF001487
71983+:10915000AFA9001091CC007C0E000092A3AC0015CA
71984+:10916000362D0A0091A6003C30C400201080000675
71985+:10917000260200083C11080096313FC8262EFFFF4A
71986+:109180003C010800A42E3FC88FBF00208FB1001CF7
71987+:109190008FB0001803E0000827BD00288F8B002C3B
71988+:1091A000010B502B5540FFC5240700010A000E0497
71989+:1091B00030E800FF9383001C3C02800027BDFFD8ED
71990+:1091C00034480A0000805021AFBF002034460AC056
71991+:1091D000010028211060000E3444098091070030FE
71992+:1091E000240B00058F89002030EC003F118B000B11
71993+:1091F00000003821AFA900103C0B80088D69006C7D
71994+:10920000AFAA00180E00015AAFA90014A380001CD9
71995+:109210008FBF002003E0000827BD00288D1F0048F5
71996+:109220003C1808008F183FBC8F9900283C027FFF34
71997+:109230008D0800443443FFFFAFA900103C0B8008A9
71998+:109240008D69006C03E370240319782101CF682332
71999+:1092500001A83821AFAA00180E00015AAFA90014C6
72000+:109260000A000E58A380001C3C05800034A60A00AA
72001+:1092700090C7003C3C06080094C63FDA3C02080058
72002+:109280008C423FD430E30020000624001060001E12
72003+:10929000004438253C0880083505008090A300680C
72004+:1092A00000004821240800010000282124040001B6
72005+:1092B0003C0680008CCD017805A0FFFE34CF014034
72006+:1092C000ADE800083C0208008C423FDCA5E5000444
72007+:1092D000A5E40006ADE2000C3C04080090843FD9F0
72008+:1092E0003C03800834790080A1E40012ADE700144B
72009+:1092F000A5E900189338004C3C0E1000A1F8002D91
72010+:1093000003E00008ACCE017834A90E008D28001CC3
72011+:109310003C0C08008D8C3FBC952B0016952A001440
72012+:10932000018648213164FFFF0A000E803145FFFFAE
72013+:109330003C04800034830A009065003C30A2002089
72014+:109340001040001934870E00000040210000382131
72015+:10935000000020213C0680008CC901780520FFFE1A
72016+:1093600034CA014034CF010091EB0009AD48000838
72017+:109370003C0E08008DCE3FDC240DFF91240C0040F4
72018+:109380003C081000A5440004A5470006AD4E000CA3
72019+:10939000A14D0012AD4C0014A5400018A14B002DAA
72020+:1093A00003E00008ACC801788CE8001894E60012CD
72021+:1093B00094E4001030C7FFFF0A000EA93084FFFFBD
72022+:1093C0003C04800034830A009065003C30A20020F9
72023+:1093D0001040002727BDFFF82409000100003821B4
72024+:1093E000240800013C0680008CCA01780540FFFE7D
72025+:1093F0003C0280FF34C40100908D00093C0C080041
72026+:10940000918C4019A3AD00038FAB00003185007F24
72027+:109410003459FFFF01665025AFAA00009083000A6F
72028+:10942000A3A0000200057E00A3A300018FB80000E6
72029+:1094300034CB0140240C30000319702401CF68257F
72030+:10944000AD6D000C27BD0008AD6C0014A5600018C0
72031+:10945000AD690008A56700042409FF80A56800061F
72032+:109460003C081000A169001203E00008ACC80178B4
72033+:1094700034870E008CE9001894E6001294E4001082
72034+:1094800030C8FFFF0A000ECD3087FFFF27BDFFE089
72035+:10949000AFB100143C118000AFB00010AFBF001896
72036+:1094A00036380A00970F0032363001000E000B7F6D
72037+:1094B00031E43FFF8E0E0000240DFF803C042000AD
72038+:1094C00001C25821016D6024000C4940316A007FBF
72039+:1094D000012A4025010438253C048008AE270830C5
72040+:1094E0003486008090C500682403000230A200FF8B
72041+:1094F000104300048F9F00208F990024AC9F0068C8
72042+:10950000AC9900648FBF00188FB100148FB00010A9
72043+:1095100003E0000827BD00203C0A0800254A3A80E5
72044+:109520003C09080025293B103C08080025082F1C91
72045+:109530003C07080024E73BDC3C06080024C639044D
72046+:109540003C05080024A536583C0408002484325CFD
72047+:109550003C030800246339B83C0208002442375415
72048+:109560003C010800AC2A3F983C010800AC293F941C
72049+:109570003C010800AC283F903C010800AC273F9C10
72050+:109580003C010800AC263FAC3C010800AC253FA4E0
72051+:109590003C010800AC243FA03C010800AC233FB0D4
72052+:1095A0003C010800AC223FA803E0000800000000D6
72053+:1095B00080000940800009008008010080080080C8
72054+:1095C00080080000800E00008008008080080000F5
72055+:1095D00080000A8080000A00800009808000090065
72056+:00000001FF
72057diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
72058index 53f1e8a..2b96b597 100644
72059--- a/fs/9p/vfs_inode.c
72060+++ b/fs/9p/vfs_inode.c
72061@@ -1311,7 +1311,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
72062 void
72063 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
72064 {
72065- char *s = nd_get_link(nd);
72066+ const char *s = nd_get_link(nd);
72067
72068 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
72069 dentry, IS_ERR(s) ? "<error>" : s);
72070diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
72071index 2d0cbbd..a6d6149 100644
72072--- a/fs/Kconfig.binfmt
72073+++ b/fs/Kconfig.binfmt
72074@@ -103,7 +103,7 @@ config HAVE_AOUT
72075
72076 config BINFMT_AOUT
72077 tristate "Kernel support for a.out and ECOFF binaries"
72078- depends on HAVE_AOUT
72079+ depends on HAVE_AOUT && BROKEN
72080 ---help---
72081 A.out (Assembler.OUTput) is a set of formats for libraries and
72082 executables used in the earliest versions of UNIX. Linux used
72083diff --git a/fs/afs/inode.c b/fs/afs/inode.c
72084index e06f5a2..81d07ac 100644
72085--- a/fs/afs/inode.c
72086+++ b/fs/afs/inode.c
72087@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
72088 struct afs_vnode *vnode;
72089 struct super_block *sb;
72090 struct inode *inode;
72091- static atomic_t afs_autocell_ino;
72092+ static atomic_unchecked_t afs_autocell_ino;
72093
72094 _enter("{%x:%u},%*.*s,",
72095 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
72096@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
72097 data.fid.unique = 0;
72098 data.fid.vnode = 0;
72099
72100- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
72101+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
72102 afs_iget5_autocell_test, afs_iget5_set,
72103 &data);
72104 if (!inode) {
72105diff --git a/fs/aio.c b/fs/aio.c
72106index 480440f..623fd88 100644
72107--- a/fs/aio.c
72108+++ b/fs/aio.c
72109@@ -441,7 +441,7 @@ static int aio_setup_ring(struct kioctx *ctx)
72110 size += sizeof(struct io_event) * nr_events;
72111
72112 nr_pages = PFN_UP(size);
72113- if (nr_pages < 0)
72114+ if (nr_pages <= 0)
72115 return -EINVAL;
72116
72117 file = aio_private_file(ctx, nr_pages);
72118diff --git a/fs/attr.c b/fs/attr.c
72119index 6530ced..4a827e2 100644
72120--- a/fs/attr.c
72121+++ b/fs/attr.c
72122@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
72123 unsigned long limit;
72124
72125 limit = rlimit(RLIMIT_FSIZE);
72126+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
72127 if (limit != RLIM_INFINITY && offset > limit)
72128 goto out_sig;
72129 if (offset > inode->i_sb->s_maxbytes)
72130diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
72131index 35b755e..f4b9e0a 100644
72132--- a/fs/autofs4/waitq.c
72133+++ b/fs/autofs4/waitq.c
72134@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
72135 {
72136 unsigned long sigpipe, flags;
72137 mm_segment_t fs;
72138- const char *data = (const char *)addr;
72139+ const char __user *data = (const char __force_user *)addr;
72140 ssize_t wr = 0;
72141
72142 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
72143@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
72144 return 1;
72145 }
72146
72147+#ifdef CONFIG_GRKERNSEC_HIDESYM
72148+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
72149+#endif
72150+
72151 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
72152 enum autofs_notify notify)
72153 {
72154@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
72155
72156 /* If this is a direct mount request create a dummy name */
72157 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
72158+#ifdef CONFIG_GRKERNSEC_HIDESYM
72159+ /* this name does get written to userland via autofs4_write() */
72160+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
72161+#else
72162 qstr.len = sprintf(name, "%p", dentry);
72163+#endif
72164 else {
72165 qstr.len = autofs4_getpath(sbi, dentry, &name);
72166 if (!qstr.len) {
72167diff --git a/fs/befs/endian.h b/fs/befs/endian.h
72168index 2722387..56059b5 100644
72169--- a/fs/befs/endian.h
72170+++ b/fs/befs/endian.h
72171@@ -11,7 +11,7 @@
72172
72173 #include <asm/byteorder.h>
72174
72175-static inline u64
72176+static inline u64 __intentional_overflow(-1)
72177 fs64_to_cpu(const struct super_block *sb, fs64 n)
72178 {
72179 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72180@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
72181 return (__force fs64)cpu_to_be64(n);
72182 }
72183
72184-static inline u32
72185+static inline u32 __intentional_overflow(-1)
72186 fs32_to_cpu(const struct super_block *sb, fs32 n)
72187 {
72188 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72189@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
72190 return (__force fs32)cpu_to_be32(n);
72191 }
72192
72193-static inline u16
72194+static inline u16 __intentional_overflow(-1)
72195 fs16_to_cpu(const struct super_block *sb, fs16 n)
72196 {
72197 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
72198diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
72199index 4c55668..eeae150 100644
72200--- a/fs/binfmt_aout.c
72201+++ b/fs/binfmt_aout.c
72202@@ -16,6 +16,7 @@
72203 #include <linux/string.h>
72204 #include <linux/fs.h>
72205 #include <linux/file.h>
72206+#include <linux/security.h>
72207 #include <linux/stat.h>
72208 #include <linux/fcntl.h>
72209 #include <linux/ptrace.h>
72210@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
72211 #endif
72212 # define START_STACK(u) ((void __user *)u.start_stack)
72213
72214+ memset(&dump, 0, sizeof(dump));
72215+
72216 fs = get_fs();
72217 set_fs(KERNEL_DS);
72218 has_dumped = 1;
72219@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
72220
72221 /* If the size of the dump file exceeds the rlimit, then see what would happen
72222 if we wrote the stack, but not the data area. */
72223+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
72224 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
72225 dump.u_dsize = 0;
72226
72227 /* Make sure we have enough room to write the stack and data areas. */
72228+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
72229 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
72230 dump.u_ssize = 0;
72231
72232@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
72233 rlim = rlimit(RLIMIT_DATA);
72234 if (rlim >= RLIM_INFINITY)
72235 rlim = ~0;
72236+
72237+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
72238 if (ex.a_data + ex.a_bss > rlim)
72239 return -ENOMEM;
72240
72241@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
72242
72243 install_exec_creds(bprm);
72244
72245+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72246+ current->mm->pax_flags = 0UL;
72247+#endif
72248+
72249+#ifdef CONFIG_PAX_PAGEEXEC
72250+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
72251+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
72252+
72253+#ifdef CONFIG_PAX_EMUTRAMP
72254+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
72255+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
72256+#endif
72257+
72258+#ifdef CONFIG_PAX_MPROTECT
72259+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
72260+ current->mm->pax_flags |= MF_PAX_MPROTECT;
72261+#endif
72262+
72263+ }
72264+#endif
72265+
72266 if (N_MAGIC(ex) == OMAGIC) {
72267 unsigned long text_addr, map_size;
72268 loff_t pos;
72269@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
72270 return error;
72271
72272 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
72273- PROT_READ | PROT_WRITE | PROT_EXEC,
72274+ PROT_READ | PROT_WRITE,
72275 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
72276 fd_offset + ex.a_text);
72277 if (error != N_DATADDR(ex))
72278diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
72279index cd46e41..244f778 100644
72280--- a/fs/binfmt_elf.c
72281+++ b/fs/binfmt_elf.c
72282@@ -35,6 +35,7 @@
72283 #include <linux/utsname.h>
72284 #include <linux/coredump.h>
72285 #include <linux/sched.h>
72286+#include <linux/xattr.h>
72287 #include <asm/uaccess.h>
72288 #include <asm/param.h>
72289 #include <asm/page.h>
72290@@ -48,7 +49,7 @@
72291
72292 static int load_elf_binary(struct linux_binprm *bprm);
72293 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
72294- int, int, unsigned long);
72295+ int, int, unsigned long) __intentional_overflow(-1);
72296
72297 #ifdef CONFIG_USELIB
72298 static int load_elf_library(struct file *);
72299@@ -66,6 +67,14 @@ static int elf_core_dump(struct coredump_params *cprm);
72300 #define elf_core_dump NULL
72301 #endif
72302
72303+#ifdef CONFIG_PAX_MPROTECT
72304+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
72305+#endif
72306+
72307+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72308+static void elf_handle_mmap(struct file *file);
72309+#endif
72310+
72311 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
72312 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
72313 #else
72314@@ -85,6 +94,15 @@ static struct linux_binfmt elf_format = {
72315 .load_binary = load_elf_binary,
72316 .load_shlib = load_elf_library,
72317 .core_dump = elf_core_dump,
72318+
72319+#ifdef CONFIG_PAX_MPROTECT
72320+ .handle_mprotect= elf_handle_mprotect,
72321+#endif
72322+
72323+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
72324+ .handle_mmap = elf_handle_mmap,
72325+#endif
72326+
72327 .min_coredump = ELF_EXEC_PAGESIZE,
72328 };
72329
72330@@ -92,6 +110,8 @@ static struct linux_binfmt elf_format = {
72331
72332 static int set_brk(unsigned long start, unsigned long end)
72333 {
72334+ unsigned long e = end;
72335+
72336 start = ELF_PAGEALIGN(start);
72337 end = ELF_PAGEALIGN(end);
72338 if (end > start) {
72339@@ -100,7 +120,7 @@ static int set_brk(unsigned long start, unsigned long end)
72340 if (BAD_ADDR(addr))
72341 return addr;
72342 }
72343- current->mm->start_brk = current->mm->brk = end;
72344+ current->mm->start_brk = current->mm->brk = e;
72345 return 0;
72346 }
72347
72348@@ -161,12 +181,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72349 elf_addr_t __user *u_rand_bytes;
72350 const char *k_platform = ELF_PLATFORM;
72351 const char *k_base_platform = ELF_BASE_PLATFORM;
72352- unsigned char k_rand_bytes[16];
72353+ u32 k_rand_bytes[4];
72354 int items;
72355 elf_addr_t *elf_info;
72356 int ei_index = 0;
72357 const struct cred *cred = current_cred();
72358 struct vm_area_struct *vma;
72359+ unsigned long saved_auxv[AT_VECTOR_SIZE];
72360
72361 /*
72362 * In some cases (e.g. Hyper-Threading), we want to avoid L1
72363@@ -208,8 +229,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72364 * Generate 16 random bytes for userspace PRNG seeding.
72365 */
72366 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
72367- u_rand_bytes = (elf_addr_t __user *)
72368- STACK_ALLOC(p, sizeof(k_rand_bytes));
72369+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
72370+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
72371+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
72372+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
72373+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
72374+ u_rand_bytes = (elf_addr_t __user *) p;
72375 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
72376 return -EFAULT;
72377
72378@@ -324,9 +349,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
72379 return -EFAULT;
72380 current->mm->env_end = p;
72381
72382+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
72383+
72384 /* Put the elf_info on the stack in the right place. */
72385 sp = (elf_addr_t __user *)envp + 1;
72386- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
72387+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
72388 return -EFAULT;
72389 return 0;
72390 }
72391@@ -515,14 +542,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
72392 an ELF header */
72393
72394 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72395- struct file *interpreter, unsigned long *interp_map_addr,
72396+ struct file *interpreter,
72397 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
72398 {
72399 struct elf_phdr *eppnt;
72400- unsigned long load_addr = 0;
72401+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
72402 int load_addr_set = 0;
72403 unsigned long last_bss = 0, elf_bss = 0;
72404- unsigned long error = ~0UL;
72405+ unsigned long error = -EINVAL;
72406 unsigned long total_size;
72407 int i;
72408
72409@@ -542,6 +569,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72410 goto out;
72411 }
72412
72413+#ifdef CONFIG_PAX_SEGMEXEC
72414+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
72415+ pax_task_size = SEGMEXEC_TASK_SIZE;
72416+#endif
72417+
72418 eppnt = interp_elf_phdata;
72419 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
72420 if (eppnt->p_type == PT_LOAD) {
72421@@ -565,8 +597,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72422 map_addr = elf_map(interpreter, load_addr + vaddr,
72423 eppnt, elf_prot, elf_type, total_size);
72424 total_size = 0;
72425- if (!*interp_map_addr)
72426- *interp_map_addr = map_addr;
72427 error = map_addr;
72428 if (BAD_ADDR(map_addr))
72429 goto out;
72430@@ -585,8 +615,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72431 k = load_addr + eppnt->p_vaddr;
72432 if (BAD_ADDR(k) ||
72433 eppnt->p_filesz > eppnt->p_memsz ||
72434- eppnt->p_memsz > TASK_SIZE ||
72435- TASK_SIZE - eppnt->p_memsz < k) {
72436+ eppnt->p_memsz > pax_task_size ||
72437+ pax_task_size - eppnt->p_memsz < k) {
72438 error = -ENOMEM;
72439 goto out;
72440 }
72441@@ -625,9 +655,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
72442 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
72443
72444 /* Map the last of the bss segment */
72445- error = vm_brk(elf_bss, last_bss - elf_bss);
72446- if (BAD_ADDR(error))
72447- goto out;
72448+ if (last_bss > elf_bss) {
72449+ error = vm_brk(elf_bss, last_bss - elf_bss);
72450+ if (BAD_ADDR(error))
72451+ goto out;
72452+ }
72453 }
72454
72455 error = load_addr;
72456@@ -635,6 +667,336 @@ out:
72457 return error;
72458 }
72459
72460+#ifdef CONFIG_PAX_PT_PAX_FLAGS
72461+#ifdef CONFIG_PAX_SOFTMODE
72462+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
72463+{
72464+ unsigned long pax_flags = 0UL;
72465+
72466+#ifdef CONFIG_PAX_PAGEEXEC
72467+ if (elf_phdata->p_flags & PF_PAGEEXEC)
72468+ pax_flags |= MF_PAX_PAGEEXEC;
72469+#endif
72470+
72471+#ifdef CONFIG_PAX_SEGMEXEC
72472+ if (elf_phdata->p_flags & PF_SEGMEXEC)
72473+ pax_flags |= MF_PAX_SEGMEXEC;
72474+#endif
72475+
72476+#ifdef CONFIG_PAX_EMUTRAMP
72477+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
72478+ pax_flags |= MF_PAX_EMUTRAMP;
72479+#endif
72480+
72481+#ifdef CONFIG_PAX_MPROTECT
72482+ if (elf_phdata->p_flags & PF_MPROTECT)
72483+ pax_flags |= MF_PAX_MPROTECT;
72484+#endif
72485+
72486+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72487+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
72488+ pax_flags |= MF_PAX_RANDMMAP;
72489+#endif
72490+
72491+ return pax_flags;
72492+}
72493+#endif
72494+
72495+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
72496+{
72497+ unsigned long pax_flags = 0UL;
72498+
72499+#ifdef CONFIG_PAX_PAGEEXEC
72500+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
72501+ pax_flags |= MF_PAX_PAGEEXEC;
72502+#endif
72503+
72504+#ifdef CONFIG_PAX_SEGMEXEC
72505+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
72506+ pax_flags |= MF_PAX_SEGMEXEC;
72507+#endif
72508+
72509+#ifdef CONFIG_PAX_EMUTRAMP
72510+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
72511+ pax_flags |= MF_PAX_EMUTRAMP;
72512+#endif
72513+
72514+#ifdef CONFIG_PAX_MPROTECT
72515+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
72516+ pax_flags |= MF_PAX_MPROTECT;
72517+#endif
72518+
72519+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72520+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
72521+ pax_flags |= MF_PAX_RANDMMAP;
72522+#endif
72523+
72524+ return pax_flags;
72525+}
72526+#endif
72527+
72528+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
72529+#ifdef CONFIG_PAX_SOFTMODE
72530+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
72531+{
72532+ unsigned long pax_flags = 0UL;
72533+
72534+#ifdef CONFIG_PAX_PAGEEXEC
72535+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
72536+ pax_flags |= MF_PAX_PAGEEXEC;
72537+#endif
72538+
72539+#ifdef CONFIG_PAX_SEGMEXEC
72540+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
72541+ pax_flags |= MF_PAX_SEGMEXEC;
72542+#endif
72543+
72544+#ifdef CONFIG_PAX_EMUTRAMP
72545+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
72546+ pax_flags |= MF_PAX_EMUTRAMP;
72547+#endif
72548+
72549+#ifdef CONFIG_PAX_MPROTECT
72550+ if (pax_flags_softmode & MF_PAX_MPROTECT)
72551+ pax_flags |= MF_PAX_MPROTECT;
72552+#endif
72553+
72554+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72555+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
72556+ pax_flags |= MF_PAX_RANDMMAP;
72557+#endif
72558+
72559+ return pax_flags;
72560+}
72561+#endif
72562+
72563+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
72564+{
72565+ unsigned long pax_flags = 0UL;
72566+
72567+#ifdef CONFIG_PAX_PAGEEXEC
72568+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
72569+ pax_flags |= MF_PAX_PAGEEXEC;
72570+#endif
72571+
72572+#ifdef CONFIG_PAX_SEGMEXEC
72573+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
72574+ pax_flags |= MF_PAX_SEGMEXEC;
72575+#endif
72576+
72577+#ifdef CONFIG_PAX_EMUTRAMP
72578+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
72579+ pax_flags |= MF_PAX_EMUTRAMP;
72580+#endif
72581+
72582+#ifdef CONFIG_PAX_MPROTECT
72583+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
72584+ pax_flags |= MF_PAX_MPROTECT;
72585+#endif
72586+
72587+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
72588+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
72589+ pax_flags |= MF_PAX_RANDMMAP;
72590+#endif
72591+
72592+ return pax_flags;
72593+}
72594+#endif
72595+
72596+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72597+static unsigned long pax_parse_defaults(void)
72598+{
72599+ unsigned long pax_flags = 0UL;
72600+
72601+#ifdef CONFIG_PAX_SOFTMODE
72602+ if (pax_softmode)
72603+ return pax_flags;
72604+#endif
72605+
72606+#ifdef CONFIG_PAX_PAGEEXEC
72607+ pax_flags |= MF_PAX_PAGEEXEC;
72608+#endif
72609+
72610+#ifdef CONFIG_PAX_SEGMEXEC
72611+ pax_flags |= MF_PAX_SEGMEXEC;
72612+#endif
72613+
72614+#ifdef CONFIG_PAX_MPROTECT
72615+ pax_flags |= MF_PAX_MPROTECT;
72616+#endif
72617+
72618+#ifdef CONFIG_PAX_RANDMMAP
72619+ if (randomize_va_space)
72620+ pax_flags |= MF_PAX_RANDMMAP;
72621+#endif
72622+
72623+ return pax_flags;
72624+}
72625+
72626+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
72627+{
72628+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
72629+
72630+#ifdef CONFIG_PAX_EI_PAX
72631+
72632+#ifdef CONFIG_PAX_SOFTMODE
72633+ if (pax_softmode)
72634+ return pax_flags;
72635+#endif
72636+
72637+ pax_flags = 0UL;
72638+
72639+#ifdef CONFIG_PAX_PAGEEXEC
72640+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
72641+ pax_flags |= MF_PAX_PAGEEXEC;
72642+#endif
72643+
72644+#ifdef CONFIG_PAX_SEGMEXEC
72645+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
72646+ pax_flags |= MF_PAX_SEGMEXEC;
72647+#endif
72648+
72649+#ifdef CONFIG_PAX_EMUTRAMP
72650+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
72651+ pax_flags |= MF_PAX_EMUTRAMP;
72652+#endif
72653+
72654+#ifdef CONFIG_PAX_MPROTECT
72655+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
72656+ pax_flags |= MF_PAX_MPROTECT;
72657+#endif
72658+
72659+#ifdef CONFIG_PAX_ASLR
72660+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
72661+ pax_flags |= MF_PAX_RANDMMAP;
72662+#endif
72663+
72664+#endif
72665+
72666+ return pax_flags;
72667+
72668+}
72669+
72670+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
72671+{
72672+
72673+#ifdef CONFIG_PAX_PT_PAX_FLAGS
72674+ unsigned long i;
72675+
72676+ for (i = 0UL; i < elf_ex->e_phnum; i++)
72677+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
72678+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
72679+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
72680+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
72681+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
72682+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
72683+ return PAX_PARSE_FLAGS_FALLBACK;
72684+
72685+#ifdef CONFIG_PAX_SOFTMODE
72686+ if (pax_softmode)
72687+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
72688+ else
72689+#endif
72690+
72691+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
72692+ break;
72693+ }
72694+#endif
72695+
72696+ return PAX_PARSE_FLAGS_FALLBACK;
72697+}
72698+
72699+static unsigned long pax_parse_xattr_pax(struct file * const file)
72700+{
72701+
72702+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
72703+ ssize_t xattr_size, i;
72704+ unsigned char xattr_value[sizeof("pemrs") - 1];
72705+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
72706+
72707+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
72708+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
72709+ return PAX_PARSE_FLAGS_FALLBACK;
72710+
72711+ for (i = 0; i < xattr_size; i++)
72712+ switch (xattr_value[i]) {
72713+ default:
72714+ return PAX_PARSE_FLAGS_FALLBACK;
72715+
72716+#define parse_flag(option1, option2, flag) \
72717+ case option1: \
72718+ if (pax_flags_hardmode & MF_PAX_##flag) \
72719+ return PAX_PARSE_FLAGS_FALLBACK;\
72720+ pax_flags_hardmode |= MF_PAX_##flag; \
72721+ break; \
72722+ case option2: \
72723+ if (pax_flags_softmode & MF_PAX_##flag) \
72724+ return PAX_PARSE_FLAGS_FALLBACK;\
72725+ pax_flags_softmode |= MF_PAX_##flag; \
72726+ break;
72727+
72728+ parse_flag('p', 'P', PAGEEXEC);
72729+ parse_flag('e', 'E', EMUTRAMP);
72730+ parse_flag('m', 'M', MPROTECT);
72731+ parse_flag('r', 'R', RANDMMAP);
72732+ parse_flag('s', 'S', SEGMEXEC);
72733+
72734+#undef parse_flag
72735+ }
72736+
72737+ if (pax_flags_hardmode & pax_flags_softmode)
72738+ return PAX_PARSE_FLAGS_FALLBACK;
72739+
72740+#ifdef CONFIG_PAX_SOFTMODE
72741+ if (pax_softmode)
72742+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
72743+ else
72744+#endif
72745+
72746+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
72747+#else
72748+ return PAX_PARSE_FLAGS_FALLBACK;
72749+#endif
72750+
72751+}
72752+
72753+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
72754+{
72755+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
72756+
72757+ pax_flags = pax_parse_defaults();
72758+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
72759+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
72760+ xattr_pax_flags = pax_parse_xattr_pax(file);
72761+
72762+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
72763+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
72764+ pt_pax_flags != xattr_pax_flags)
72765+ return -EINVAL;
72766+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72767+ pax_flags = xattr_pax_flags;
72768+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72769+ pax_flags = pt_pax_flags;
72770+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
72771+ pax_flags = ei_pax_flags;
72772+
72773+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
72774+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72775+ if ((__supported_pte_mask & _PAGE_NX))
72776+ pax_flags &= ~MF_PAX_SEGMEXEC;
72777+ else
72778+ pax_flags &= ~MF_PAX_PAGEEXEC;
72779+ }
72780+#endif
72781+
72782+ if (0 > pax_check_flags(&pax_flags))
72783+ return -EINVAL;
72784+
72785+ current->mm->pax_flags = pax_flags;
72786+ return 0;
72787+}
72788+#endif
72789+
72790 /*
72791 * These are the functions used to load ELF style executables and shared
72792 * libraries. There is no binary dependent code anywhere else.
72793@@ -648,6 +1010,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
72794 {
72795 unsigned long random_variable = 0;
72796
72797+#ifdef CONFIG_PAX_RANDUSTACK
72798+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
72799+ return stack_top - current->mm->delta_stack;
72800+#endif
72801+
72802 if ((current->flags & PF_RANDOMIZE) &&
72803 !(current->personality & ADDR_NO_RANDOMIZE)) {
72804 random_variable = (unsigned long) get_random_int();
72805@@ -667,7 +1034,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72806 unsigned long load_addr = 0, load_bias = 0;
72807 int load_addr_set = 0;
72808 char * elf_interpreter = NULL;
72809- unsigned long error;
72810+ unsigned long error = 0;
72811 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
72812 unsigned long elf_bss, elf_brk;
72813 int retval, i;
72814@@ -682,6 +1049,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72815 struct elfhdr interp_elf_ex;
72816 } *loc;
72817 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
72818+ unsigned long pax_task_size;
72819
72820 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
72821 if (!loc) {
72822@@ -840,6 +1208,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
72823 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
72824 may depend on the personality. */
72825 SET_PERSONALITY2(loc->elf_ex, &arch_state);
72826+
72827+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72828+ current->mm->pax_flags = 0UL;
72829+#endif
72830+
72831+#ifdef CONFIG_PAX_DLRESOLVE
72832+ current->mm->call_dl_resolve = 0UL;
72833+#endif
72834+
72835+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
72836+ current->mm->call_syscall = 0UL;
72837+#endif
72838+
72839+#ifdef CONFIG_PAX_ASLR
72840+ current->mm->delta_mmap = 0UL;
72841+ current->mm->delta_stack = 0UL;
72842+#endif
72843+
72844+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
72845+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
72846+ send_sig(SIGKILL, current, 0);
72847+ goto out_free_dentry;
72848+ }
72849+#endif
72850+
72851+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
72852+ pax_set_initial_flags(bprm);
72853+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
72854+ if (pax_set_initial_flags_func)
72855+ (pax_set_initial_flags_func)(bprm);
72856+#endif
72857+
72858+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
72859+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
72860+ current->mm->context.user_cs_limit = PAGE_SIZE;
72861+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
72862+ }
72863+#endif
72864+
72865+#ifdef CONFIG_PAX_SEGMEXEC
72866+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
72867+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
72868+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
72869+ pax_task_size = SEGMEXEC_TASK_SIZE;
72870+ current->mm->def_flags |= VM_NOHUGEPAGE;
72871+ } else
72872+#endif
72873+
72874+ pax_task_size = TASK_SIZE;
72875+
72876+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
72877+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72878+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
72879+ put_cpu();
72880+ }
72881+#endif
72882+
72883+#ifdef CONFIG_PAX_ASLR
72884+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
72885+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
72886+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
72887+ }
72888+#endif
72889+
72890+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
72891+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72892+ executable_stack = EXSTACK_DISABLE_X;
72893+ current->personality &= ~READ_IMPLIES_EXEC;
72894+ } else
72895+#endif
72896+
72897 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
72898 current->personality |= READ_IMPLIES_EXEC;
72899
72900@@ -915,8 +1354,21 @@ static int load_elf_binary(struct linux_binprm *bprm)
72901 if (current->flags & PF_RANDOMIZE)
72902 load_bias += arch_mmap_rnd();
72903 load_bias = ELF_PAGESTART(load_bias);
72904- total_size = total_mapping_size(elf_phdata,
72905- loc->elf_ex.e_phnum);
72906+
72907+#ifdef CONFIG_PAX_RANDMMAP
72908+ /* PaX: randomize base address at the default exe base if requested */
72909+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
72910+#ifdef CONFIG_SPARC64
72911+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
72912+#else
72913+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
72914+#endif
72915+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
72916+ elf_flags |= MAP_FIXED;
72917+ }
72918+#endif
72919+
72920+ total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum);
72921 if (!total_size) {
72922 retval = -EINVAL;
72923 goto out_free_dentry;
72924@@ -952,9 +1404,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
72925 * allowed task size. Note that p_filesz must always be
72926 * <= p_memsz so it is only necessary to check p_memsz.
72927 */
72928- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
72929- elf_ppnt->p_memsz > TASK_SIZE ||
72930- TASK_SIZE - elf_ppnt->p_memsz < k) {
72931+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
72932+ elf_ppnt->p_memsz > pax_task_size ||
72933+ pax_task_size - elf_ppnt->p_memsz < k) {
72934 /* set_brk can never work. Avoid overflows. */
72935 retval = -EINVAL;
72936 goto out_free_dentry;
72937@@ -990,16 +1442,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
72938 if (retval)
72939 goto out_free_dentry;
72940 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
72941- retval = -EFAULT; /* Nobody gets to see this, but.. */
72942- goto out_free_dentry;
72943+ /*
72944+ * This bss-zeroing can fail if the ELF
72945+ * file specifies odd protections. So
72946+ * we don't check the return value
72947+ */
72948 }
72949
72950+#ifdef CONFIG_PAX_RANDMMAP
72951+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
72952+ unsigned long start, size, flags;
72953+ vm_flags_t vm_flags;
72954+
72955+ start = ELF_PAGEALIGN(elf_brk);
72956+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
72957+ flags = MAP_FIXED | MAP_PRIVATE;
72958+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
72959+
72960+ down_write(&current->mm->mmap_sem);
72961+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
72962+ retval = -ENOMEM;
72963+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
72964+// if (current->personality & ADDR_NO_RANDOMIZE)
72965+// vm_flags |= VM_READ | VM_MAYREAD;
72966+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
72967+ retval = IS_ERR_VALUE(start) ? start : 0;
72968+ }
72969+ up_write(&current->mm->mmap_sem);
72970+ if (retval == 0)
72971+ retval = set_brk(start + size, start + size + PAGE_SIZE);
72972+ if (retval < 0)
72973+ goto out_free_dentry;
72974+ }
72975+#endif
72976+
72977 if (elf_interpreter) {
72978- unsigned long interp_map_addr = 0;
72979-
72980 elf_entry = load_elf_interp(&loc->interp_elf_ex,
72981 interpreter,
72982- &interp_map_addr,
72983 load_bias, interp_elf_phdata);
72984 if (!IS_ERR((void *)elf_entry)) {
72985 /*
72986@@ -1050,6 +1529,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72987 current->mm->end_data = end_data;
72988 current->mm->start_stack = bprm->p;
72989
72990+#ifndef CONFIG_PAX_RANDMMAP
72991 if ((current->flags & PF_RANDOMIZE) && (randomize_va_space > 1)) {
72992 current->mm->brk = current->mm->start_brk =
72993 arch_randomize_brk(current->mm);
72994@@ -1057,6 +1537,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
72995 current->brk_randomized = 1;
72996 #endif
72997 }
72998+#endif
72999
73000 if (current->personality & MMAP_PAGE_ZERO) {
73001 /* Why this, you ask??? Well SVr4 maps page 0 as read-only,
73002@@ -1225,7 +1706,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
73003 * Decide what to dump of a segment, part, all or none.
73004 */
73005 static unsigned long vma_dump_size(struct vm_area_struct *vma,
73006- unsigned long mm_flags)
73007+ unsigned long mm_flags, long signr)
73008 {
73009 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
73010
73011@@ -1263,7 +1744,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
73012 if (vma->vm_file == NULL)
73013 return 0;
73014
73015- if (FILTER(MAPPED_PRIVATE))
73016+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
73017 goto whole;
73018
73019 /*
73020@@ -1470,9 +1951,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
73021 {
73022 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
73023 int i = 0;
73024- do
73025+ do {
73026 i += 2;
73027- while (auxv[i - 2] != AT_NULL);
73028+ } while (auxv[i - 2] != AT_NULL);
73029 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
73030 }
73031
73032@@ -1481,7 +1962,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
73033 {
73034 mm_segment_t old_fs = get_fs();
73035 set_fs(KERNEL_DS);
73036- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
73037+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
73038 set_fs(old_fs);
73039 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
73040 }
73041@@ -2201,7 +2682,7 @@ static int elf_core_dump(struct coredump_params *cprm)
73042 vma = next_vma(vma, gate_vma)) {
73043 unsigned long dump_size;
73044
73045- dump_size = vma_dump_size(vma, cprm->mm_flags);
73046+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
73047 vma_filesz[i++] = dump_size;
73048 vma_data_size += dump_size;
73049 }
73050@@ -2309,6 +2790,167 @@ out:
73051
73052 #endif /* CONFIG_ELF_CORE */
73053
73054+#ifdef CONFIG_PAX_MPROTECT
73055+/* PaX: non-PIC ELF libraries need relocations on their executable segments
73056+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
73057+ * we'll remove VM_MAYWRITE for good on RELRO segments.
73058+ *
73059+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
73060+ * basis because we want to allow the common case and not the special ones.
73061+ */
73062+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
73063+{
73064+ struct elfhdr elf_h;
73065+ struct elf_phdr elf_p;
73066+ unsigned long i;
73067+ unsigned long oldflags;
73068+ bool is_textrel_rw, is_textrel_rx, is_relro;
73069+
73070+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
73071+ return;
73072+
73073+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
73074+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
73075+
73076+#ifdef CONFIG_PAX_ELFRELOCS
73077+ /* possible TEXTREL */
73078+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
73079+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
73080+#else
73081+ is_textrel_rw = false;
73082+ is_textrel_rx = false;
73083+#endif
73084+
73085+ /* possible RELRO */
73086+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
73087+
73088+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
73089+ return;
73090+
73091+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
73092+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
73093+
73094+#ifdef CONFIG_PAX_ETEXECRELOCS
73095+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
73096+#else
73097+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
73098+#endif
73099+
73100+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
73101+ !elf_check_arch(&elf_h) ||
73102+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
73103+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
73104+ return;
73105+
73106+ for (i = 0UL; i < elf_h.e_phnum; i++) {
73107+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
73108+ return;
73109+ switch (elf_p.p_type) {
73110+ case PT_DYNAMIC:
73111+ if (!is_textrel_rw && !is_textrel_rx)
73112+ continue;
73113+ i = 0UL;
73114+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
73115+ elf_dyn dyn;
73116+
73117+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
73118+ break;
73119+ if (dyn.d_tag == DT_NULL)
73120+ break;
73121+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
73122+ gr_log_textrel(vma);
73123+ if (is_textrel_rw)
73124+ vma->vm_flags |= VM_MAYWRITE;
73125+ else
73126+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
73127+ vma->vm_flags &= ~VM_MAYWRITE;
73128+ break;
73129+ }
73130+ i++;
73131+ }
73132+ is_textrel_rw = false;
73133+ is_textrel_rx = false;
73134+ continue;
73135+
73136+ case PT_GNU_RELRO:
73137+ if (!is_relro)
73138+ continue;
73139+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
73140+ vma->vm_flags &= ~VM_MAYWRITE;
73141+ is_relro = false;
73142+ continue;
73143+
73144+#ifdef CONFIG_PAX_PT_PAX_FLAGS
73145+ case PT_PAX_FLAGS: {
73146+ const char *msg_mprotect = "", *msg_emutramp = "";
73147+ char *buffer_lib, *buffer_exe;
73148+
73149+ if (elf_p.p_flags & PF_NOMPROTECT)
73150+ msg_mprotect = "MPROTECT disabled";
73151+
73152+#ifdef CONFIG_PAX_EMUTRAMP
73153+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
73154+ msg_emutramp = "EMUTRAMP enabled";
73155+#endif
73156+
73157+ if (!msg_mprotect[0] && !msg_emutramp[0])
73158+ continue;
73159+
73160+ if (!printk_ratelimit())
73161+ continue;
73162+
73163+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
73164+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
73165+ if (buffer_lib && buffer_exe) {
73166+ char *path_lib, *path_exe;
73167+
73168+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
73169+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
73170+
73171+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
73172+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
73173+
73174+ }
73175+ free_page((unsigned long)buffer_exe);
73176+ free_page((unsigned long)buffer_lib);
73177+ continue;
73178+ }
73179+#endif
73180+
73181+ }
73182+ }
73183+}
73184+#endif
73185+
73186+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
73187+
73188+extern int grsec_enable_log_rwxmaps;
73189+
73190+static void elf_handle_mmap(struct file *file)
73191+{
73192+ struct elfhdr elf_h;
73193+ struct elf_phdr elf_p;
73194+ unsigned long i;
73195+
73196+ if (!grsec_enable_log_rwxmaps)
73197+ return;
73198+
73199+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
73200+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
73201+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
73202+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
73203+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
73204+ return;
73205+
73206+ for (i = 0UL; i < elf_h.e_phnum; i++) {
73207+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
73208+ return;
73209+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
73210+ gr_log_ptgnustack(file);
73211+ }
73212+}
73213+#endif
73214+
73215 static int __init init_elf_binfmt(void)
73216 {
73217 register_binfmt(&elf_format);
73218diff --git a/fs/block_dev.c b/fs/block_dev.c
73219index c7e4163..6939003 100644
73220--- a/fs/block_dev.c
73221+++ b/fs/block_dev.c
73222@@ -732,7 +732,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
73223 else if (bdev->bd_contains == bdev)
73224 return true; /* is a whole device which isn't held */
73225
73226- else if (whole->bd_holder == bd_may_claim)
73227+ else if (whole->bd_holder == (void *)bd_may_claim)
73228 return true; /* is a partition of a device that is being partitioned */
73229 else if (whole->bd_holder != NULL)
73230 return false; /* is a partition of a held device */
73231diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
73232index 0f11ebc..1bf3321 100644
73233--- a/fs/btrfs/ctree.c
73234+++ b/fs/btrfs/ctree.c
73235@@ -1180,9 +1180,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
73236 free_extent_buffer(buf);
73237 add_root_to_dirty_list(root);
73238 } else {
73239- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
73240- parent_start = parent->start;
73241- else
73242+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
73243+ if (parent)
73244+ parent_start = parent->start;
73245+ else
73246+ parent_start = 0;
73247+ } else
73248 parent_start = 0;
73249
73250 WARN_ON(trans->transid != btrfs_header_generation(parent));
73251diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
73252index a2ae427..53c2e98 100644
73253--- a/fs/btrfs/delayed-inode.c
73254+++ b/fs/btrfs/delayed-inode.c
73255@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
73256
73257 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
73258 {
73259- int seq = atomic_inc_return(&delayed_root->items_seq);
73260+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
73261 if ((atomic_dec_return(&delayed_root->items) <
73262 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
73263 waitqueue_active(&delayed_root->wait))
73264@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
73265
73266 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
73267 {
73268- int val = atomic_read(&delayed_root->items_seq);
73269+ int val = atomic_read_unchecked(&delayed_root->items_seq);
73270
73271 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
73272 return 1;
73273@@ -1437,7 +1437,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
73274 int seq;
73275 int ret;
73276
73277- seq = atomic_read(&delayed_root->items_seq);
73278+ seq = atomic_read_unchecked(&delayed_root->items_seq);
73279
73280 ret = btrfs_wq_run_delayed_node(delayed_root, fs_info, 0);
73281 if (ret)
73282diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
73283index f70119f..ab5894d 100644
73284--- a/fs/btrfs/delayed-inode.h
73285+++ b/fs/btrfs/delayed-inode.h
73286@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
73287 */
73288 struct list_head prepare_list;
73289 atomic_t items; /* for delayed items */
73290- atomic_t items_seq; /* for delayed items */
73291+ atomic_unchecked_t items_seq; /* for delayed items */
73292 int nodes; /* for delayed nodes */
73293 wait_queue_head_t wait;
73294 };
73295@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
73296 struct btrfs_delayed_root *delayed_root)
73297 {
73298 atomic_set(&delayed_root->items, 0);
73299- atomic_set(&delayed_root->items_seq, 0);
73300+ atomic_set_unchecked(&delayed_root->items_seq, 0);
73301 delayed_root->nodes = 0;
73302 spin_lock_init(&delayed_root->lock);
73303 init_waitqueue_head(&delayed_root->wait);
73304diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
73305index 9e66f5e..f7caaf0 100644
73306--- a/fs/btrfs/super.c
73307+++ b/fs/btrfs/super.c
73308@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
73309 function, line, errstr);
73310 return;
73311 }
73312- ACCESS_ONCE(trans->transaction->aborted) = errno;
73313+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
73314 /* Wake up anybody who may be waiting on this transaction */
73315 wake_up(&root->fs_info->transaction_wait);
73316 wake_up(&root->fs_info->transaction_blocked_wait);
73317diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
73318index e8a4c86..f8c22ae 100644
73319--- a/fs/btrfs/sysfs.c
73320+++ b/fs/btrfs/sysfs.c
73321@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
73322 for (set = 0; set < FEAT_MAX; set++) {
73323 int i;
73324 struct attribute *attrs[2];
73325- struct attribute_group agroup = {
73326+ attribute_group_no_const agroup = {
73327 .name = "features",
73328 .attrs = attrs,
73329 };
73330diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
73331index 2299bfd..4098e72 100644
73332--- a/fs/btrfs/tests/free-space-tests.c
73333+++ b/fs/btrfs/tests/free-space-tests.c
73334@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
73335 * extent entry.
73336 */
73337 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
73338- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
73339+ pax_open_kernel();
73340+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
73341+ pax_close_kernel();
73342
73343 /*
73344 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
73345@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
73346 if (ret)
73347 return ret;
73348
73349- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
73350+ pax_open_kernel();
73351+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
73352+ pax_close_kernel();
73353 __btrfs_remove_free_space_cache(cache->free_space_ctl);
73354
73355 return 0;
73356diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
73357index 6916a78..4598936 100644
73358--- a/fs/btrfs/tree-log.h
73359+++ b/fs/btrfs/tree-log.h
73360@@ -45,7 +45,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
73361 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
73362 struct btrfs_trans_handle *trans)
73363 {
73364- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
73365+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
73366 }
73367
73368 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
73369diff --git a/fs/buffer.c b/fs/buffer.c
73370index c7a5602..18eabd1 100644
73371--- a/fs/buffer.c
73372+++ b/fs/buffer.c
73373@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
73374 bh_cachep = kmem_cache_create("buffer_head",
73375 sizeof(struct buffer_head), 0,
73376 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
73377- SLAB_MEM_SPREAD),
73378+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
73379 NULL);
73380
73381 /*
73382diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
73383index 6af790f..ec4c1e6 100644
73384--- a/fs/cachefiles/bind.c
73385+++ b/fs/cachefiles/bind.c
73386@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
73387 args);
73388
73389 /* start by checking things over */
73390- ASSERT(cache->fstop_percent >= 0 &&
73391- cache->fstop_percent < cache->fcull_percent &&
73392+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
73393 cache->fcull_percent < cache->frun_percent &&
73394 cache->frun_percent < 100);
73395
73396- ASSERT(cache->bstop_percent >= 0 &&
73397- cache->bstop_percent < cache->bcull_percent &&
73398+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
73399 cache->bcull_percent < cache->brun_percent &&
73400 cache->brun_percent < 100);
73401
73402diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
73403index f601def..b2cf704 100644
73404--- a/fs/cachefiles/daemon.c
73405+++ b/fs/cachefiles/daemon.c
73406@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
73407 if (n > buflen)
73408 return -EMSGSIZE;
73409
73410- if (copy_to_user(_buffer, buffer, n) != 0)
73411+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
73412 return -EFAULT;
73413
73414 return n;
73415@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
73416 if (test_bit(CACHEFILES_DEAD, &cache->flags))
73417 return -EIO;
73418
73419- if (datalen < 0 || datalen > PAGE_SIZE - 1)
73420+ if (datalen > PAGE_SIZE - 1)
73421 return -EOPNOTSUPP;
73422
73423 /* drag the command string into the kernel so we can parse it */
73424@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
73425 if (args[0] != '%' || args[1] != '\0')
73426 return -EINVAL;
73427
73428- if (fstop < 0 || fstop >= cache->fcull_percent)
73429+ if (fstop >= cache->fcull_percent)
73430 return cachefiles_daemon_range_error(cache, args);
73431
73432 cache->fstop_percent = fstop;
73433@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
73434 if (args[0] != '%' || args[1] != '\0')
73435 return -EINVAL;
73436
73437- if (bstop < 0 || bstop >= cache->bcull_percent)
73438+ if (bstop >= cache->bcull_percent)
73439 return cachefiles_daemon_range_error(cache, args);
73440
73441 cache->bstop_percent = bstop;
73442diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
73443index 8c52472..c4e3a69 100644
73444--- a/fs/cachefiles/internal.h
73445+++ b/fs/cachefiles/internal.h
73446@@ -66,7 +66,7 @@ struct cachefiles_cache {
73447 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
73448 struct rb_root active_nodes; /* active nodes (can't be culled) */
73449 rwlock_t active_lock; /* lock for active_nodes */
73450- atomic_t gravecounter; /* graveyard uniquifier */
73451+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
73452 unsigned frun_percent; /* when to stop culling (% files) */
73453 unsigned fcull_percent; /* when to start culling (% files) */
73454 unsigned fstop_percent; /* when to stop allocating (% files) */
73455@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
73456 * proc.c
73457 */
73458 #ifdef CONFIG_CACHEFILES_HISTOGRAM
73459-extern atomic_t cachefiles_lookup_histogram[HZ];
73460-extern atomic_t cachefiles_mkdir_histogram[HZ];
73461-extern atomic_t cachefiles_create_histogram[HZ];
73462+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
73463+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
73464+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
73465
73466 extern int __init cachefiles_proc_init(void);
73467 extern void cachefiles_proc_cleanup(void);
73468 static inline
73469-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
73470+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
73471 {
73472 unsigned long jif = jiffies - start_jif;
73473 if (jif >= HZ)
73474 jif = HZ - 1;
73475- atomic_inc(&histogram[jif]);
73476+ atomic_inc_unchecked(&histogram[jif]);
73477 }
73478
73479 #else
73480diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
73481index ab857ab..ff8d593 100644
73482--- a/fs/cachefiles/namei.c
73483+++ b/fs/cachefiles/namei.c
73484@@ -309,7 +309,7 @@ try_again:
73485 /* first step is to make up a grave dentry in the graveyard */
73486 sprintf(nbuffer, "%08x%08x",
73487 (uint32_t) get_seconds(),
73488- (uint32_t) atomic_inc_return(&cache->gravecounter));
73489+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
73490
73491 /* do the multiway lock magic */
73492 trap = lock_rename(cache->graveyard, dir);
73493diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
73494index eccd339..4c1d995 100644
73495--- a/fs/cachefiles/proc.c
73496+++ b/fs/cachefiles/proc.c
73497@@ -14,9 +14,9 @@
73498 #include <linux/seq_file.h>
73499 #include "internal.h"
73500
73501-atomic_t cachefiles_lookup_histogram[HZ];
73502-atomic_t cachefiles_mkdir_histogram[HZ];
73503-atomic_t cachefiles_create_histogram[HZ];
73504+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
73505+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
73506+atomic_unchecked_t cachefiles_create_histogram[HZ];
73507
73508 /*
73509 * display the latency histogram
73510@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
73511 return 0;
73512 default:
73513 index = (unsigned long) v - 3;
73514- x = atomic_read(&cachefiles_lookup_histogram[index]);
73515- y = atomic_read(&cachefiles_mkdir_histogram[index]);
73516- z = atomic_read(&cachefiles_create_histogram[index]);
73517+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
73518+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
73519+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
73520 if (x == 0 && y == 0 && z == 0)
73521 return 0;
73522
73523diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
73524index 4248307..f41e44e 100644
73525--- a/fs/ceph/dir.c
73526+++ b/fs/ceph/dir.c
73527@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
73528 struct dentry *dentry, *last;
73529 struct ceph_dentry_info *di;
73530 int err = 0;
73531+ char d_name[DNAME_INLINE_LEN];
73532+ const unsigned char *name;
73533
73534 /* claim ref on last dentry we returned */
73535 last = fi->dentry;
73536@@ -190,7 +192,12 @@ more:
73537
73538 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
73539 dentry, dentry, d_inode(dentry));
73540- if (!dir_emit(ctx, dentry->d_name.name,
73541+ name = dentry->d_name.name;
73542+ if (name == dentry->d_iname) {
73543+ memcpy(d_name, name, dentry->d_name.len);
73544+ name = d_name;
73545+ }
73546+ if (!dir_emit(ctx, name,
73547 dentry->d_name.len,
73548 ceph_translate_ino(dentry->d_sb, d_inode(dentry)->i_ino),
73549 d_inode(dentry)->i_mode >> 12)) {
73550@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
73551 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
73552 struct ceph_mds_client *mdsc = fsc->mdsc;
73553 unsigned frag = fpos_frag(ctx->pos);
73554- int off = fpos_off(ctx->pos);
73555+ unsigned int off = fpos_off(ctx->pos);
73556 int err;
73557 u32 ftype;
73558 struct ceph_mds_reply_info_parsed *rinfo;
73559diff --git a/fs/ceph/super.c b/fs/ceph/super.c
73560index 4e99053..a7e2a5f 100644
73561--- a/fs/ceph/super.c
73562+++ b/fs/ceph/super.c
73563@@ -885,7 +885,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
73564 /*
73565 * construct our own bdi so we can control readahead, etc.
73566 */
73567-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
73568+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
73569
73570 static int ceph_register_bdi(struct super_block *sb,
73571 struct ceph_fs_client *fsc)
73572@@ -902,7 +902,7 @@ static int ceph_register_bdi(struct super_block *sb,
73573 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
73574
73575 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
73576- atomic_long_inc_return(&bdi_seq));
73577+ atomic_long_inc_return_unchecked(&bdi_seq));
73578 if (!err)
73579 sb->s_bdi = &fsc->backing_dev_info;
73580 return err;
73581diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
73582index 7febcf2..62a5721 100644
73583--- a/fs/cifs/cifs_debug.c
73584+++ b/fs/cifs/cifs_debug.c
73585@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
73586
73587 if (strtobool(&c, &bv) == 0) {
73588 #ifdef CONFIG_CIFS_STATS2
73589- atomic_set(&totBufAllocCount, 0);
73590- atomic_set(&totSmBufAllocCount, 0);
73591+ atomic_set_unchecked(&totBufAllocCount, 0);
73592+ atomic_set_unchecked(&totSmBufAllocCount, 0);
73593 #endif /* CONFIG_CIFS_STATS2 */
73594 spin_lock(&cifs_tcp_ses_lock);
73595 list_for_each(tmp1, &cifs_tcp_ses_list) {
73596@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
73597 tcon = list_entry(tmp3,
73598 struct cifs_tcon,
73599 tcon_list);
73600- atomic_set(&tcon->num_smbs_sent, 0);
73601+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
73602 if (server->ops->clear_stats)
73603 server->ops->clear_stats(tcon);
73604 }
73605@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
73606 smBufAllocCount.counter, cifs_min_small);
73607 #ifdef CONFIG_CIFS_STATS2
73608 seq_printf(m, "Total Large %d Small %d Allocations\n",
73609- atomic_read(&totBufAllocCount),
73610- atomic_read(&totSmBufAllocCount));
73611+ atomic_read_unchecked(&totBufAllocCount),
73612+ atomic_read_unchecked(&totSmBufAllocCount));
73613 #endif /* CONFIG_CIFS_STATS2 */
73614
73615 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
73616@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
73617 if (tcon->need_reconnect)
73618 seq_puts(m, "\tDISCONNECTED ");
73619 seq_printf(m, "\nSMBs: %d",
73620- atomic_read(&tcon->num_smbs_sent));
73621+ atomic_read_unchecked(&tcon->num_smbs_sent));
73622 if (server->ops->print_stats)
73623 server->ops->print_stats(m, tcon);
73624 }
73625diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
73626index 0a9fb6b..9def7fa 100644
73627--- a/fs/cifs/cifsfs.c
73628+++ b/fs/cifs/cifsfs.c
73629@@ -1082,7 +1082,7 @@ cifs_init_request_bufs(void)
73630 */
73631 cifs_req_cachep = kmem_cache_create("cifs_request",
73632 CIFSMaxBufSize + max_hdr_size, 0,
73633- SLAB_HWCACHE_ALIGN, NULL);
73634+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
73635 if (cifs_req_cachep == NULL)
73636 return -ENOMEM;
73637
73638@@ -1109,7 +1109,7 @@ cifs_init_request_bufs(void)
73639 efficient to alloc 1 per page off the slab compared to 17K (5page)
73640 alloc of large cifs buffers even when page debugging is on */
73641 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
73642- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
73643+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
73644 NULL);
73645 if (cifs_sm_req_cachep == NULL) {
73646 mempool_destroy(cifs_req_poolp);
73647@@ -1194,8 +1194,8 @@ init_cifs(void)
73648 atomic_set(&bufAllocCount, 0);
73649 atomic_set(&smBufAllocCount, 0);
73650 #ifdef CONFIG_CIFS_STATS2
73651- atomic_set(&totBufAllocCount, 0);
73652- atomic_set(&totSmBufAllocCount, 0);
73653+ atomic_set_unchecked(&totBufAllocCount, 0);
73654+ atomic_set_unchecked(&totSmBufAllocCount, 0);
73655 #endif /* CONFIG_CIFS_STATS2 */
73656
73657 atomic_set(&midCount, 0);
73658diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
73659index 22b289a..bbbba082 100644
73660--- a/fs/cifs/cifsglob.h
73661+++ b/fs/cifs/cifsglob.h
73662@@ -823,35 +823,35 @@ struct cifs_tcon {
73663 __u16 Flags; /* optional support bits */
73664 enum statusEnum tidStatus;
73665 #ifdef CONFIG_CIFS_STATS
73666- atomic_t num_smbs_sent;
73667+ atomic_unchecked_t num_smbs_sent;
73668 union {
73669 struct {
73670- atomic_t num_writes;
73671- atomic_t num_reads;
73672- atomic_t num_flushes;
73673- atomic_t num_oplock_brks;
73674- atomic_t num_opens;
73675- atomic_t num_closes;
73676- atomic_t num_deletes;
73677- atomic_t num_mkdirs;
73678- atomic_t num_posixopens;
73679- atomic_t num_posixmkdirs;
73680- atomic_t num_rmdirs;
73681- atomic_t num_renames;
73682- atomic_t num_t2renames;
73683- atomic_t num_ffirst;
73684- atomic_t num_fnext;
73685- atomic_t num_fclose;
73686- atomic_t num_hardlinks;
73687- atomic_t num_symlinks;
73688- atomic_t num_locks;
73689- atomic_t num_acl_get;
73690- atomic_t num_acl_set;
73691+ atomic_unchecked_t num_writes;
73692+ atomic_unchecked_t num_reads;
73693+ atomic_unchecked_t num_flushes;
73694+ atomic_unchecked_t num_oplock_brks;
73695+ atomic_unchecked_t num_opens;
73696+ atomic_unchecked_t num_closes;
73697+ atomic_unchecked_t num_deletes;
73698+ atomic_unchecked_t num_mkdirs;
73699+ atomic_unchecked_t num_posixopens;
73700+ atomic_unchecked_t num_posixmkdirs;
73701+ atomic_unchecked_t num_rmdirs;
73702+ atomic_unchecked_t num_renames;
73703+ atomic_unchecked_t num_t2renames;
73704+ atomic_unchecked_t num_ffirst;
73705+ atomic_unchecked_t num_fnext;
73706+ atomic_unchecked_t num_fclose;
73707+ atomic_unchecked_t num_hardlinks;
73708+ atomic_unchecked_t num_symlinks;
73709+ atomic_unchecked_t num_locks;
73710+ atomic_unchecked_t num_acl_get;
73711+ atomic_unchecked_t num_acl_set;
73712 } cifs_stats;
73713 #ifdef CONFIG_CIFS_SMB2
73714 struct {
73715- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
73716- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
73717+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
73718+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
73719 } smb2_stats;
73720 #endif /* CONFIG_CIFS_SMB2 */
73721 } stats;
73722@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
73723 }
73724
73725 #ifdef CONFIG_CIFS_STATS
73726-#define cifs_stats_inc atomic_inc
73727+#define cifs_stats_inc atomic_inc_unchecked
73728
73729 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
73730 unsigned int bytes)
73731@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
73732 /* Various Debug counters */
73733 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
73734 #ifdef CONFIG_CIFS_STATS2
73735-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
73736-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
73737+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
73738+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
73739 #endif
73740 GLOBAL_EXTERN atomic_t smBufAllocCount;
73741 GLOBAL_EXTERN atomic_t midCount;
73742diff --git a/fs/cifs/file.c b/fs/cifs/file.c
73743index 3f50cee..7741620 100644
73744--- a/fs/cifs/file.c
73745+++ b/fs/cifs/file.c
73746@@ -2054,10 +2054,14 @@ static int cifs_writepages(struct address_space *mapping,
73747 index = mapping->writeback_index; /* Start from prev offset */
73748 end = -1;
73749 } else {
73750- index = wbc->range_start >> PAGE_CACHE_SHIFT;
73751- end = wbc->range_end >> PAGE_CACHE_SHIFT;
73752- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
73753+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
73754 range_whole = true;
73755+ index = 0;
73756+ end = ULONG_MAX;
73757+ } else {
73758+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
73759+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
73760+ }
73761 scanned = true;
73762 }
73763 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
73764diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
73765index 8442b8b..ea6986f 100644
73766--- a/fs/cifs/misc.c
73767+++ b/fs/cifs/misc.c
73768@@ -170,7 +170,7 @@ cifs_buf_get(void)
73769 memset(ret_buf, 0, buf_size + 3);
73770 atomic_inc(&bufAllocCount);
73771 #ifdef CONFIG_CIFS_STATS2
73772- atomic_inc(&totBufAllocCount);
73773+ atomic_inc_unchecked(&totBufAllocCount);
73774 #endif /* CONFIG_CIFS_STATS2 */
73775 }
73776
73777@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
73778 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
73779 atomic_inc(&smBufAllocCount);
73780 #ifdef CONFIG_CIFS_STATS2
73781- atomic_inc(&totSmBufAllocCount);
73782+ atomic_inc_unchecked(&totSmBufAllocCount);
73783 #endif /* CONFIG_CIFS_STATS2 */
73784
73785 }
73786diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
73787index fc537c2..47d654c 100644
73788--- a/fs/cifs/smb1ops.c
73789+++ b/fs/cifs/smb1ops.c
73790@@ -622,27 +622,27 @@ static void
73791 cifs_clear_stats(struct cifs_tcon *tcon)
73792 {
73793 #ifdef CONFIG_CIFS_STATS
73794- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
73795- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
73796- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
73797- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
73798- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
73799- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
73800- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
73801- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
73802- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
73803- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
73804- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
73805- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
73806- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
73807- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
73808- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
73809- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
73810- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
73811- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
73812- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
73813- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
73814- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
73815+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
73816+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
73817+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
73818+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
73819+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
73820+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
73821+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
73822+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
73823+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
73824+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
73825+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
73826+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
73827+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
73828+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
73829+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
73830+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
73831+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
73832+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
73833+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
73834+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
73835+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
73836 #endif
73837 }
73838
73839@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
73840 {
73841 #ifdef CONFIG_CIFS_STATS
73842 seq_printf(m, " Oplocks breaks: %d",
73843- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
73844+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
73845 seq_printf(m, "\nReads: %d Bytes: %llu",
73846- atomic_read(&tcon->stats.cifs_stats.num_reads),
73847+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
73848 (long long)(tcon->bytes_read));
73849 seq_printf(m, "\nWrites: %d Bytes: %llu",
73850- atomic_read(&tcon->stats.cifs_stats.num_writes),
73851+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
73852 (long long)(tcon->bytes_written));
73853 seq_printf(m, "\nFlushes: %d",
73854- atomic_read(&tcon->stats.cifs_stats.num_flushes));
73855+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
73856 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
73857- atomic_read(&tcon->stats.cifs_stats.num_locks),
73858- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
73859- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
73860+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
73861+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
73862+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
73863 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
73864- atomic_read(&tcon->stats.cifs_stats.num_opens),
73865- atomic_read(&tcon->stats.cifs_stats.num_closes),
73866- atomic_read(&tcon->stats.cifs_stats.num_deletes));
73867+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
73868+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
73869+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
73870 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
73871- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
73872- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
73873+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
73874+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
73875 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
73876- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
73877- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
73878+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
73879+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
73880 seq_printf(m, "\nRenames: %d T2 Renames %d",
73881- atomic_read(&tcon->stats.cifs_stats.num_renames),
73882- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
73883+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
73884+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
73885 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
73886- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
73887- atomic_read(&tcon->stats.cifs_stats.num_fnext),
73888- atomic_read(&tcon->stats.cifs_stats.num_fclose));
73889+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
73890+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
73891+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
73892 #endif
73893 }
73894
73895diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
73896index 54daee5..2669fcb 100644
73897--- a/fs/cifs/smb2ops.c
73898+++ b/fs/cifs/smb2ops.c
73899@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
73900 #ifdef CONFIG_CIFS_STATS
73901 int i;
73902 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
73903- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
73904- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
73905+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
73906+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
73907 }
73908 #endif
73909 }
73910@@ -459,65 +459,65 @@ static void
73911 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
73912 {
73913 #ifdef CONFIG_CIFS_STATS
73914- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
73915- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
73916+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
73917+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
73918 seq_printf(m, "\nNegotiates: %d sent %d failed",
73919- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
73920- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
73921+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
73922+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
73923 seq_printf(m, "\nSessionSetups: %d sent %d failed",
73924- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
73925- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
73926+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
73927+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
73928 seq_printf(m, "\nLogoffs: %d sent %d failed",
73929- atomic_read(&sent[SMB2_LOGOFF_HE]),
73930- atomic_read(&failed[SMB2_LOGOFF_HE]));
73931+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
73932+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
73933 seq_printf(m, "\nTreeConnects: %d sent %d failed",
73934- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
73935- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
73936+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
73937+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
73938 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
73939- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
73940- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
73941+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
73942+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
73943 seq_printf(m, "\nCreates: %d sent %d failed",
73944- atomic_read(&sent[SMB2_CREATE_HE]),
73945- atomic_read(&failed[SMB2_CREATE_HE]));
73946+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
73947+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
73948 seq_printf(m, "\nCloses: %d sent %d failed",
73949- atomic_read(&sent[SMB2_CLOSE_HE]),
73950- atomic_read(&failed[SMB2_CLOSE_HE]));
73951+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
73952+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
73953 seq_printf(m, "\nFlushes: %d sent %d failed",
73954- atomic_read(&sent[SMB2_FLUSH_HE]),
73955- atomic_read(&failed[SMB2_FLUSH_HE]));
73956+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
73957+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
73958 seq_printf(m, "\nReads: %d sent %d failed",
73959- atomic_read(&sent[SMB2_READ_HE]),
73960- atomic_read(&failed[SMB2_READ_HE]));
73961+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
73962+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
73963 seq_printf(m, "\nWrites: %d sent %d failed",
73964- atomic_read(&sent[SMB2_WRITE_HE]),
73965- atomic_read(&failed[SMB2_WRITE_HE]));
73966+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
73967+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
73968 seq_printf(m, "\nLocks: %d sent %d failed",
73969- atomic_read(&sent[SMB2_LOCK_HE]),
73970- atomic_read(&failed[SMB2_LOCK_HE]));
73971+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
73972+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
73973 seq_printf(m, "\nIOCTLs: %d sent %d failed",
73974- atomic_read(&sent[SMB2_IOCTL_HE]),
73975- atomic_read(&failed[SMB2_IOCTL_HE]));
73976+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
73977+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
73978 seq_printf(m, "\nCancels: %d sent %d failed",
73979- atomic_read(&sent[SMB2_CANCEL_HE]),
73980- atomic_read(&failed[SMB2_CANCEL_HE]));
73981+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
73982+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
73983 seq_printf(m, "\nEchos: %d sent %d failed",
73984- atomic_read(&sent[SMB2_ECHO_HE]),
73985- atomic_read(&failed[SMB2_ECHO_HE]));
73986+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
73987+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
73988 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
73989- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
73990- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
73991+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
73992+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
73993 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
73994- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
73995- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
73996+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
73997+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
73998 seq_printf(m, "\nQueryInfos: %d sent %d failed",
73999- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
74000- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
74001+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
74002+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
74003 seq_printf(m, "\nSetInfos: %d sent %d failed",
74004- atomic_read(&sent[SMB2_SET_INFO_HE]),
74005- atomic_read(&failed[SMB2_SET_INFO_HE]));
74006+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
74007+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
74008 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
74009- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
74010- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
74011+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
74012+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
74013 #endif
74014 }
74015
74016diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
74017index 54cbe19..fcd4a1b 100644
74018--- a/fs/cifs/smb2pdu.c
74019+++ b/fs/cifs/smb2pdu.c
74020@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
74021 default:
74022 cifs_dbg(VFS, "info level %u isn't supported\n",
74023 srch_inf->info_level);
74024- rc = -EINVAL;
74025- goto qdir_exit;
74026+ return -EINVAL;
74027 }
74028
74029 req->FileIndex = cpu_to_le32(index);
74030diff --git a/fs/coda/cache.c b/fs/coda/cache.c
74031index 5bb630a..043dc70 100644
74032--- a/fs/coda/cache.c
74033+++ b/fs/coda/cache.c
74034@@ -24,7 +24,7 @@
74035 #include "coda_linux.h"
74036 #include "coda_cache.h"
74037
74038-static atomic_t permission_epoch = ATOMIC_INIT(0);
74039+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
74040
74041 /* replace or extend an acl cache hit */
74042 void coda_cache_enter(struct inode *inode, int mask)
74043@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
74044 struct coda_inode_info *cii = ITOC(inode);
74045
74046 spin_lock(&cii->c_lock);
74047- cii->c_cached_epoch = atomic_read(&permission_epoch);
74048+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
74049 if (!uid_eq(cii->c_uid, current_fsuid())) {
74050 cii->c_uid = current_fsuid();
74051 cii->c_cached_perm = mask;
74052@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
74053 {
74054 struct coda_inode_info *cii = ITOC(inode);
74055 spin_lock(&cii->c_lock);
74056- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
74057+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
74058 spin_unlock(&cii->c_lock);
74059 }
74060
74061 /* remove all acl caches */
74062 void coda_cache_clear_all(struct super_block *sb)
74063 {
74064- atomic_inc(&permission_epoch);
74065+ atomic_inc_unchecked(&permission_epoch);
74066 }
74067
74068
74069@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
74070 spin_lock(&cii->c_lock);
74071 hit = (mask & cii->c_cached_perm) == mask &&
74072 uid_eq(cii->c_uid, current_fsuid()) &&
74073- cii->c_cached_epoch == atomic_read(&permission_epoch);
74074+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
74075 spin_unlock(&cii->c_lock);
74076
74077 return hit;
74078diff --git a/fs/compat.c b/fs/compat.c
74079index 6fd272d..dd34ba2 100644
74080--- a/fs/compat.c
74081+++ b/fs/compat.c
74082@@ -54,7 +54,7 @@
74083 #include <asm/ioctls.h>
74084 #include "internal.h"
74085
74086-int compat_log = 1;
74087+int compat_log = 0;
74088
74089 int compat_printk(const char *fmt, ...)
74090 {
74091@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
74092
74093 set_fs(KERNEL_DS);
74094 /* The __user pointer cast is valid because of the set_fs() */
74095- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
74096+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
74097 set_fs(oldfs);
74098 /* truncating is ok because it's a user address */
74099 if (!ret)
74100@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
74101 goto out;
74102
74103 ret = -EINVAL;
74104- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
74105+ if (nr_segs > UIO_MAXIOV)
74106 goto out;
74107 if (nr_segs > fast_segs) {
74108 ret = -ENOMEM;
74109@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
74110 struct compat_readdir_callback {
74111 struct dir_context ctx;
74112 struct compat_old_linux_dirent __user *dirent;
74113+ struct file * file;
74114 int result;
74115 };
74116
74117@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
74118 buf->result = -EOVERFLOW;
74119 return -EOVERFLOW;
74120 }
74121+
74122+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74123+ return 0;
74124+
74125 buf->result++;
74126 dirent = buf->dirent;
74127 if (!access_ok(VERIFY_WRITE, dirent,
74128@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
74129 if (!f.file)
74130 return -EBADF;
74131
74132+ buf.file = f.file;
74133 error = iterate_dir(f.file, &buf.ctx);
74134 if (buf.result)
74135 error = buf.result;
74136@@ -913,6 +919,7 @@ struct compat_getdents_callback {
74137 struct dir_context ctx;
74138 struct compat_linux_dirent __user *current_dir;
74139 struct compat_linux_dirent __user *previous;
74140+ struct file * file;
74141 int count;
74142 int error;
74143 };
74144@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
74145 buf->error = -EOVERFLOW;
74146 return -EOVERFLOW;
74147 }
74148+
74149+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74150+ return 0;
74151+
74152 dirent = buf->previous;
74153 if (dirent) {
74154 if (__put_user(offset, &dirent->d_off))
74155@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
74156 if (!f.file)
74157 return -EBADF;
74158
74159+ buf.file = f.file;
74160 error = iterate_dir(f.file, &buf.ctx);
74161 if (error >= 0)
74162 error = buf.error;
74163@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
74164 struct dir_context ctx;
74165 struct linux_dirent64 __user *current_dir;
74166 struct linux_dirent64 __user *previous;
74167+ struct file * file;
74168 int count;
74169 int error;
74170 };
74171@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
74172 buf->error = -EINVAL; /* only used if we fail.. */
74173 if (reclen > buf->count)
74174 return -EINVAL;
74175+
74176+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
74177+ return 0;
74178+
74179 dirent = buf->previous;
74180
74181 if (dirent) {
74182@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
74183 if (!f.file)
74184 return -EBADF;
74185
74186+ buf.file = f.file;
74187 error = iterate_dir(f.file, &buf.ctx);
74188 if (error >= 0)
74189 error = buf.error;
74190diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
74191index 4d24d17..4f8c09e 100644
74192--- a/fs/compat_binfmt_elf.c
74193+++ b/fs/compat_binfmt_elf.c
74194@@ -30,11 +30,13 @@
74195 #undef elf_phdr
74196 #undef elf_shdr
74197 #undef elf_note
74198+#undef elf_dyn
74199 #undef elf_addr_t
74200 #define elfhdr elf32_hdr
74201 #define elf_phdr elf32_phdr
74202 #define elf_shdr elf32_shdr
74203 #define elf_note elf32_note
74204+#define elf_dyn Elf32_Dyn
74205 #define elf_addr_t Elf32_Addr
74206
74207 /*
74208diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
74209index 6b8e2f0..9b13a5e 100644
74210--- a/fs/compat_ioctl.c
74211+++ b/fs/compat_ioctl.c
74212@@ -622,7 +622,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
74213 return -EFAULT;
74214 if (__get_user(udata, &ss32->iomem_base))
74215 return -EFAULT;
74216- ss.iomem_base = compat_ptr(udata);
74217+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
74218 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
74219 __get_user(ss.port_high, &ss32->port_high))
74220 return -EFAULT;
74221@@ -704,8 +704,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
74222 for (i = 0; i < nmsgs; i++) {
74223 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
74224 return -EFAULT;
74225- if (get_user(datap, &umsgs[i].buf) ||
74226- put_user(compat_ptr(datap), &tmsgs[i].buf))
74227+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
74228+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
74229 return -EFAULT;
74230 }
74231 return sys_ioctl(fd, cmd, (unsigned long)tdata);
74232@@ -798,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
74233 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
74234 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
74235 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
74236- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
74237+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
74238 return -EFAULT;
74239
74240 return ioctl_preallocate(file, p);
74241@@ -1620,8 +1620,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
74242 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
74243 {
74244 unsigned int a, b;
74245- a = *(unsigned int *)p;
74246- b = *(unsigned int *)q;
74247+ a = *(const unsigned int *)p;
74248+ b = *(const unsigned int *)q;
74249 if (a > b)
74250 return 1;
74251 if (a < b)
74252diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
74253index c81ce7f..f3de5fd 100644
74254--- a/fs/configfs/dir.c
74255+++ b/fs/configfs/dir.c
74256@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
74257 }
74258 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
74259 struct configfs_dirent *next;
74260- const char *name;
74261+ const unsigned char * name;
74262+ char d_name[sizeof(next->s_dentry->d_iname)];
74263 int len;
74264 struct inode *inode = NULL;
74265
74266@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
74267 continue;
74268
74269 name = configfs_get_name(next);
74270- len = strlen(name);
74271+ if (next->s_dentry && name == next->s_dentry->d_iname) {
74272+ len = next->s_dentry->d_name.len;
74273+ memcpy(d_name, name, len);
74274+ name = d_name;
74275+ } else
74276+ len = strlen(name);
74277
74278 /*
74279 * We'll have a dentry and an inode for
74280diff --git a/fs/configfs/item.c b/fs/configfs/item.c
74281index e65f9ff..3ed264d 100644
74282--- a/fs/configfs/item.c
74283+++ b/fs/configfs/item.c
74284@@ -116,7 +116,7 @@ void config_item_init_type_name(struct config_item *item,
74285 const char *name,
74286 struct config_item_type *type)
74287 {
74288- config_item_set_name(item, name);
74289+ config_item_set_name(item, "%s", name);
74290 item->ci_type = type;
74291 config_item_init(item);
74292 }
74293@@ -125,7 +125,7 @@ EXPORT_SYMBOL(config_item_init_type_name);
74294 void config_group_init_type_name(struct config_group *group, const char *name,
74295 struct config_item_type *type)
74296 {
74297- config_item_set_name(&group->cg_item, name);
74298+ config_item_set_name(&group->cg_item, "%s", name);
74299 group->cg_item.ci_type = type;
74300 config_group_init(group);
74301 }
74302diff --git a/fs/coredump.c b/fs/coredump.c
74303index bbbe139..b76fae5 100644
74304--- a/fs/coredump.c
74305+++ b/fs/coredump.c
74306@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
74307 struct pipe_inode_info *pipe = file->private_data;
74308
74309 pipe_lock(pipe);
74310- pipe->readers++;
74311- pipe->writers--;
74312+ atomic_inc(&pipe->readers);
74313+ atomic_dec(&pipe->writers);
74314 wake_up_interruptible_sync(&pipe->wait);
74315 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
74316 pipe_unlock(pipe);
74317@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
74318 * We actually want wait_event_freezable() but then we need
74319 * to clear TIF_SIGPENDING and improve dump_interrupted().
74320 */
74321- wait_event_interruptible(pipe->wait, pipe->readers == 1);
74322+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
74323
74324 pipe_lock(pipe);
74325- pipe->readers--;
74326- pipe->writers++;
74327+ atomic_dec(&pipe->readers);
74328+ atomic_inc(&pipe->writers);
74329 pipe_unlock(pipe);
74330 }
74331
74332@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
74333 struct files_struct *displaced;
74334 bool need_nonrelative = false;
74335 bool core_dumped = false;
74336- static atomic_t core_dump_count = ATOMIC_INIT(0);
74337+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
74338+ long signr = siginfo->si_signo;
74339+ int dumpable;
74340 struct coredump_params cprm = {
74341 .siginfo = siginfo,
74342 .regs = signal_pt_regs(),
74343@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
74344 .mm_flags = mm->flags,
74345 };
74346
74347- audit_core_dumps(siginfo->si_signo);
74348+ audit_core_dumps(signr);
74349+
74350+ dumpable = __get_dumpable(cprm.mm_flags);
74351+
74352+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
74353+ gr_handle_brute_attach(dumpable);
74354
74355 binfmt = mm->binfmt;
74356 if (!binfmt || !binfmt->core_dump)
74357 goto fail;
74358- if (!__get_dumpable(cprm.mm_flags))
74359+ if (!dumpable)
74360 goto fail;
74361
74362 cred = prepare_creds();
74363@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
74364 need_nonrelative = true;
74365 }
74366
74367- retval = coredump_wait(siginfo->si_signo, &core_state);
74368+ retval = coredump_wait(signr, &core_state);
74369 if (retval < 0)
74370 goto fail_creds;
74371
74372@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
74373 }
74374 cprm.limit = RLIM_INFINITY;
74375
74376- dump_count = atomic_inc_return(&core_dump_count);
74377+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
74378 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
74379 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
74380 task_tgid_vnr(current), current->comm);
74381@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
74382 } else {
74383 struct inode *inode;
74384
74385+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
74386+
74387 if (cprm.limit < binfmt->min_coredump)
74388 goto fail_unlock;
74389
74390@@ -681,7 +690,7 @@ close_fail:
74391 filp_close(cprm.file, NULL);
74392 fail_dropcount:
74393 if (ispipe)
74394- atomic_dec(&core_dump_count);
74395+ atomic_dec_unchecked(&core_dump_count);
74396 fail_unlock:
74397 kfree(cn.corename);
74398 coredump_finish(mm, core_dumped);
74399@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
74400 struct file *file = cprm->file;
74401 loff_t pos = file->f_pos;
74402 ssize_t n;
74403+
74404+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
74405 if (cprm->written + nr > cprm->limit)
74406 return 0;
74407 while (nr) {
74408diff --git a/fs/dcache.c b/fs/dcache.c
74409index 5d03eb0..d874b57 100644
74410--- a/fs/dcache.c
74411+++ b/fs/dcache.c
74412@@ -545,7 +545,7 @@ static void __dentry_kill(struct dentry *dentry)
74413 * dentry_iput drops the locks, at which point nobody (except
74414 * transient RCU lookups) can reach this dentry.
74415 */
74416- BUG_ON(dentry->d_lockref.count > 0);
74417+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
74418 this_cpu_dec(nr_dentry);
74419 if (dentry->d_op && dentry->d_op->d_release)
74420 dentry->d_op->d_release(dentry);
74421@@ -598,7 +598,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
74422 struct dentry *parent = dentry->d_parent;
74423 if (IS_ROOT(dentry))
74424 return NULL;
74425- if (unlikely(dentry->d_lockref.count < 0))
74426+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
74427 return NULL;
74428 if (likely(spin_trylock(&parent->d_lock)))
74429 return parent;
74430@@ -660,8 +660,8 @@ static inline bool fast_dput(struct dentry *dentry)
74431 */
74432 if (unlikely(ret < 0)) {
74433 spin_lock(&dentry->d_lock);
74434- if (dentry->d_lockref.count > 1) {
74435- dentry->d_lockref.count--;
74436+ if (__lockref_read(&dentry->d_lockref) > 1) {
74437+ __lockref_dec(&dentry->d_lockref);
74438 spin_unlock(&dentry->d_lock);
74439 return 1;
74440 }
74441@@ -716,7 +716,7 @@ static inline bool fast_dput(struct dentry *dentry)
74442 * else could have killed it and marked it dead. Either way, we
74443 * don't need to do anything else.
74444 */
74445- if (dentry->d_lockref.count) {
74446+ if (__lockref_read(&dentry->d_lockref)) {
74447 spin_unlock(&dentry->d_lock);
74448 return 1;
74449 }
74450@@ -726,7 +726,7 @@ static inline bool fast_dput(struct dentry *dentry)
74451 * lock, and we just tested that it was zero, so we can just
74452 * set it to 1.
74453 */
74454- dentry->d_lockref.count = 1;
74455+ __lockref_set(&dentry->d_lockref, 1);
74456 return 0;
74457 }
74458
74459@@ -788,7 +788,7 @@ repeat:
74460 dentry->d_flags |= DCACHE_REFERENCED;
74461 dentry_lru_add(dentry);
74462
74463- dentry->d_lockref.count--;
74464+ __lockref_dec(&dentry->d_lockref);
74465 spin_unlock(&dentry->d_lock);
74466 return;
74467
74468@@ -803,7 +803,7 @@ EXPORT_SYMBOL(dput);
74469 /* This must be called with d_lock held */
74470 static inline void __dget_dlock(struct dentry *dentry)
74471 {
74472- dentry->d_lockref.count++;
74473+ __lockref_inc(&dentry->d_lockref);
74474 }
74475
74476 static inline void __dget(struct dentry *dentry)
74477@@ -844,8 +844,8 @@ repeat:
74478 goto repeat;
74479 }
74480 rcu_read_unlock();
74481- BUG_ON(!ret->d_lockref.count);
74482- ret->d_lockref.count++;
74483+ BUG_ON(!__lockref_read(&ret->d_lockref));
74484+ __lockref_inc(&ret->d_lockref);
74485 spin_unlock(&ret->d_lock);
74486 return ret;
74487 }
74488@@ -923,9 +923,9 @@ restart:
74489 spin_lock(&inode->i_lock);
74490 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
74491 spin_lock(&dentry->d_lock);
74492- if (!dentry->d_lockref.count) {
74493+ if (!__lockref_read(&dentry->d_lockref)) {
74494 struct dentry *parent = lock_parent(dentry);
74495- if (likely(!dentry->d_lockref.count)) {
74496+ if (likely(!__lockref_read(&dentry->d_lockref))) {
74497 __dentry_kill(dentry);
74498 dput(parent);
74499 goto restart;
74500@@ -960,7 +960,7 @@ static void shrink_dentry_list(struct list_head *list)
74501 * We found an inuse dentry which was not removed from
74502 * the LRU because of laziness during lookup. Do not free it.
74503 */
74504- if (dentry->d_lockref.count > 0) {
74505+ if (__lockref_read(&dentry->d_lockref) > 0) {
74506 spin_unlock(&dentry->d_lock);
74507 if (parent)
74508 spin_unlock(&parent->d_lock);
74509@@ -998,8 +998,8 @@ static void shrink_dentry_list(struct list_head *list)
74510 dentry = parent;
74511 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
74512 parent = lock_parent(dentry);
74513- if (dentry->d_lockref.count != 1) {
74514- dentry->d_lockref.count--;
74515+ if (__lockref_read(&dentry->d_lockref) != 1) {
74516+ __lockref_inc(&dentry->d_lockref);
74517 spin_unlock(&dentry->d_lock);
74518 if (parent)
74519 spin_unlock(&parent->d_lock);
74520@@ -1039,7 +1039,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
74521 * counts, just remove them from the LRU. Otherwise give them
74522 * another pass through the LRU.
74523 */
74524- if (dentry->d_lockref.count) {
74525+ if (__lockref_read(&dentry->d_lockref)) {
74526 d_lru_isolate(lru, dentry);
74527 spin_unlock(&dentry->d_lock);
74528 return LRU_REMOVED;
74529@@ -1373,7 +1373,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
74530 } else {
74531 if (dentry->d_flags & DCACHE_LRU_LIST)
74532 d_lru_del(dentry);
74533- if (!dentry->d_lockref.count) {
74534+ if (!__lockref_read(&dentry->d_lockref)) {
74535 d_shrink_add(dentry, &data->dispose);
74536 data->found++;
74537 }
74538@@ -1421,7 +1421,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
74539 return D_WALK_CONTINUE;
74540
74541 /* root with refcount 1 is fine */
74542- if (dentry == _data && dentry->d_lockref.count == 1)
74543+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
74544 return D_WALK_CONTINUE;
74545
74546 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
74547@@ -1430,7 +1430,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
74548 dentry->d_inode ?
74549 dentry->d_inode->i_ino : 0UL,
74550 dentry,
74551- dentry->d_lockref.count,
74552+ __lockref_read(&dentry->d_lockref),
74553 dentry->d_sb->s_type->name,
74554 dentry->d_sb->s_id);
74555 WARN_ON(1);
74556@@ -1571,7 +1571,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74557 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
74558 if (name->len > DNAME_INLINE_LEN-1) {
74559 size_t size = offsetof(struct external_name, name[1]);
74560- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
74561+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
74562 if (!p) {
74563 kmem_cache_free(dentry_cache, dentry);
74564 return NULL;
74565@@ -1594,7 +1594,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74566 smp_wmb();
74567 dentry->d_name.name = dname;
74568
74569- dentry->d_lockref.count = 1;
74570+ __lockref_set(&dentry->d_lockref, 1);
74571 dentry->d_flags = 0;
74572 spin_lock_init(&dentry->d_lock);
74573 seqcount_init(&dentry->d_seq);
74574@@ -1603,6 +1603,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
74575 dentry->d_sb = sb;
74576 dentry->d_op = NULL;
74577 dentry->d_fsdata = NULL;
74578+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
74579+ atomic_set(&dentry->chroot_refcnt, 0);
74580+#endif
74581 INIT_HLIST_BL_NODE(&dentry->d_hash);
74582 INIT_LIST_HEAD(&dentry->d_lru);
74583 INIT_LIST_HEAD(&dentry->d_subdirs);
74584@@ -2324,7 +2327,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
74585 goto next;
74586 }
74587
74588- dentry->d_lockref.count++;
74589+ __lockref_inc(&dentry->d_lockref);
74590 found = dentry;
74591 spin_unlock(&dentry->d_lock);
74592 break;
74593@@ -2392,7 +2395,7 @@ again:
74594 spin_lock(&dentry->d_lock);
74595 inode = dentry->d_inode;
74596 isdir = S_ISDIR(inode->i_mode);
74597- if (dentry->d_lockref.count == 1) {
74598+ if (__lockref_read(&dentry->d_lockref) == 1) {
74599 if (!spin_trylock(&inode->i_lock)) {
74600 spin_unlock(&dentry->d_lock);
74601 cpu_relax();
74602@@ -3334,7 +3337,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
74603
74604 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
74605 dentry->d_flags |= DCACHE_GENOCIDE;
74606- dentry->d_lockref.count--;
74607+ __lockref_dec(&dentry->d_lockref);
74608 }
74609 }
74610 return D_WALK_CONTINUE;
74611@@ -3450,7 +3453,8 @@ void __init vfs_caches_init(unsigned long mempages)
74612 mempages -= reserve;
74613
74614 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
74615- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
74616+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
74617+ SLAB_NO_SANITIZE, NULL);
74618
74619 dcache_init();
74620 inode_init();
74621diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
74622index 1275604..d2ca85b 100644
74623--- a/fs/debugfs/inode.c
74624+++ b/fs/debugfs/inode.c
74625@@ -407,6 +407,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
74626 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
74627 * returned.
74628 */
74629+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
74630+extern int grsec_enable_sysfs_restrict;
74631+#endif
74632+
74633 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
74634 {
74635 struct dentry *dentry = start_creating(name, parent);
74636@@ -419,7 +423,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
74637 if (unlikely(!inode))
74638 return failed_creating(dentry);
74639
74640- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
74641+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
74642+ if (grsec_enable_sysfs_restrict)
74643+ inode->i_mode = S_IFDIR | S_IRWXU;
74644+ else
74645+#endif
74646+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
74647 inode->i_op = &simple_dir_inode_operations;
74648 inode->i_fop = &simple_dir_operations;
74649
74650diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
74651index fc850b5..1677a2a 100644
74652--- a/fs/ecryptfs/inode.c
74653+++ b/fs/ecryptfs/inode.c
74654@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
74655 old_fs = get_fs();
74656 set_fs(get_ds());
74657 rc = d_inode(lower_dentry)->i_op->readlink(lower_dentry,
74658- (char __user *)lower_buf,
74659+ (char __force_user *)lower_buf,
74660 PATH_MAX);
74661 set_fs(old_fs);
74662 if (rc < 0)
74663diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
74664index e4141f2..d8263e8 100644
74665--- a/fs/ecryptfs/miscdev.c
74666+++ b/fs/ecryptfs/miscdev.c
74667@@ -304,7 +304,7 @@ check_list:
74668 goto out_unlock_msg_ctx;
74669 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
74670 if (msg_ctx->msg) {
74671- if (copy_to_user(&buf[i], packet_length, packet_length_size))
74672+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
74673 goto out_unlock_msg_ctx;
74674 i += packet_length_size;
74675 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
74676diff --git a/fs/exec.c b/fs/exec.c
74677index 1977c2a..40e7f8f 100644
74678--- a/fs/exec.c
74679+++ b/fs/exec.c
74680@@ -56,8 +56,20 @@
74681 #include <linux/pipe_fs_i.h>
74682 #include <linux/oom.h>
74683 #include <linux/compat.h>
74684+#include <linux/random.h>
74685+#include <linux/seq_file.h>
74686+#include <linux/coredump.h>
74687+#include <linux/mman.h>
74688+
74689+#ifdef CONFIG_PAX_REFCOUNT
74690+#include <linux/kallsyms.h>
74691+#include <linux/kdebug.h>
74692+#endif
74693+
74694+#include <trace/events/fs.h>
74695
74696 #include <asm/uaccess.h>
74697+#include <asm/sections.h>
74698 #include <asm/mmu_context.h>
74699 #include <asm/tlb.h>
74700
74701@@ -66,19 +78,34 @@
74702
74703 #include <trace/events/sched.h>
74704
74705+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
74706+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
74707+{
74708+ 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");
74709+}
74710+#endif
74711+
74712+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
74713+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
74714+EXPORT_SYMBOL(pax_set_initial_flags_func);
74715+#endif
74716+
74717 int suid_dumpable = 0;
74718
74719 static LIST_HEAD(formats);
74720 static DEFINE_RWLOCK(binfmt_lock);
74721
74722+extern int gr_process_kernel_exec_ban(void);
74723+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
74724+
74725 void __register_binfmt(struct linux_binfmt * fmt, int insert)
74726 {
74727 BUG_ON(!fmt);
74728 if (WARN_ON(!fmt->load_binary))
74729 return;
74730 write_lock(&binfmt_lock);
74731- insert ? list_add(&fmt->lh, &formats) :
74732- list_add_tail(&fmt->lh, &formats);
74733+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
74734+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
74735 write_unlock(&binfmt_lock);
74736 }
74737
74738@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
74739 void unregister_binfmt(struct linux_binfmt * fmt)
74740 {
74741 write_lock(&binfmt_lock);
74742- list_del(&fmt->lh);
74743+ pax_list_del((struct list_head *)&fmt->lh);
74744 write_unlock(&binfmt_lock);
74745 }
74746
74747@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
74748 int write)
74749 {
74750 struct page *page;
74751- int ret;
74752
74753-#ifdef CONFIG_STACK_GROWSUP
74754- if (write) {
74755- ret = expand_downwards(bprm->vma, pos);
74756- if (ret < 0)
74757- return NULL;
74758- }
74759-#endif
74760- ret = get_user_pages(current, bprm->mm, pos,
74761- 1, write, 1, &page, NULL);
74762- if (ret <= 0)
74763+ if (0 > expand_downwards(bprm->vma, pos))
74764+ return NULL;
74765+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
74766 return NULL;
74767
74768 if (write) {
74769@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
74770 if (size <= ARG_MAX)
74771 return page;
74772
74773+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
74774+ // only allow 512KB for argv+env on suid/sgid binaries
74775+ // to prevent easy ASLR exhaustion
74776+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
74777+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
74778+ (size > (512 * 1024))) {
74779+ put_page(page);
74780+ return NULL;
74781+ }
74782+#endif
74783+
74784 /*
74785 * Limit to 1/4-th the stack size for the argv+env strings.
74786 * This ensures that:
74787@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
74788 vma->vm_end = STACK_TOP_MAX;
74789 vma->vm_start = vma->vm_end - PAGE_SIZE;
74790 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
74791+
74792+#ifdef CONFIG_PAX_SEGMEXEC
74793+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
74794+#endif
74795+
74796 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
74797 INIT_LIST_HEAD(&vma->anon_vma_chain);
74798
74799@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
74800 arch_bprm_mm_init(mm, vma);
74801 up_write(&mm->mmap_sem);
74802 bprm->p = vma->vm_end - sizeof(void *);
74803+
74804+#ifdef CONFIG_PAX_RANDUSTACK
74805+ if (randomize_va_space)
74806+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
74807+#endif
74808+
74809 return 0;
74810 err:
74811 up_write(&mm->mmap_sem);
74812@@ -396,7 +437,7 @@ struct user_arg_ptr {
74813 } ptr;
74814 };
74815
74816-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74817+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74818 {
74819 const char __user *native;
74820
74821@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
74822 compat_uptr_t compat;
74823
74824 if (get_user(compat, argv.ptr.compat + nr))
74825- return ERR_PTR(-EFAULT);
74826+ return (const char __force_user *)ERR_PTR(-EFAULT);
74827
74828 return compat_ptr(compat);
74829 }
74830 #endif
74831
74832 if (get_user(native, argv.ptr.native + nr))
74833- return ERR_PTR(-EFAULT);
74834+ return (const char __force_user *)ERR_PTR(-EFAULT);
74835
74836 return native;
74837 }
74838@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
74839 if (!p)
74840 break;
74841
74842- if (IS_ERR(p))
74843+ if (IS_ERR((const char __force_kernel *)p))
74844 return -EFAULT;
74845
74846 if (i >= max)
74847@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
74848
74849 ret = -EFAULT;
74850 str = get_user_arg_ptr(argv, argc);
74851- if (IS_ERR(str))
74852+ if (IS_ERR((const char __force_kernel *)str))
74853 goto out;
74854
74855 len = strnlen_user(str, MAX_ARG_STRLEN);
74856@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
74857 int r;
74858 mm_segment_t oldfs = get_fs();
74859 struct user_arg_ptr argv = {
74860- .ptr.native = (const char __user *const __user *)__argv,
74861+ .ptr.native = (const char __user * const __force_user *)__argv,
74862 };
74863
74864 set_fs(KERNEL_DS);
74865@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
74866 unsigned long new_end = old_end - shift;
74867 struct mmu_gather tlb;
74868
74869- BUG_ON(new_start > new_end);
74870+ if (new_start >= new_end || new_start < mmap_min_addr)
74871+ return -ENOMEM;
74872
74873 /*
74874 * ensure there are no vmas between where we want to go
74875@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
74876 if (vma != find_vma(mm, new_start))
74877 return -EFAULT;
74878
74879+#ifdef CONFIG_PAX_SEGMEXEC
74880+ BUG_ON(pax_find_mirror_vma(vma));
74881+#endif
74882+
74883 /*
74884 * cover the whole range: [new_start, old_end)
74885 */
74886@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
74887 stack_top = arch_align_stack(stack_top);
74888 stack_top = PAGE_ALIGN(stack_top);
74889
74890- if (unlikely(stack_top < mmap_min_addr) ||
74891- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
74892- return -ENOMEM;
74893-
74894 stack_shift = vma->vm_end - stack_top;
74895
74896 bprm->p -= stack_shift;
74897@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
74898 bprm->exec -= stack_shift;
74899
74900 down_write(&mm->mmap_sem);
74901+
74902+ /* Move stack pages down in memory. */
74903+ if (stack_shift) {
74904+ ret = shift_arg_pages(vma, stack_shift);
74905+ if (ret)
74906+ goto out_unlock;
74907+ }
74908+
74909 vm_flags = VM_STACK_FLAGS;
74910
74911+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
74912+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
74913+ vm_flags &= ~VM_EXEC;
74914+
74915+#ifdef CONFIG_PAX_MPROTECT
74916+ if (mm->pax_flags & MF_PAX_MPROTECT)
74917+ vm_flags &= ~VM_MAYEXEC;
74918+#endif
74919+
74920+ }
74921+#endif
74922+
74923 /*
74924 * Adjust stack execute permissions; explicitly enable for
74925 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
74926@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
74927 goto out_unlock;
74928 BUG_ON(prev != vma);
74929
74930- /* Move stack pages down in memory. */
74931- if (stack_shift) {
74932- ret = shift_arg_pages(vma, stack_shift);
74933- if (ret)
74934- goto out_unlock;
74935- }
74936-
74937 /* mprotect_fixup is overkill to remove the temporary stack flags */
74938 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
74939
74940@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
74941 #endif
74942 current->mm->start_stack = bprm->p;
74943 ret = expand_stack(vma, stack_base);
74944+
74945+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
74946+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
74947+ unsigned long size;
74948+ vm_flags_t vm_flags;
74949+
74950+ size = STACK_TOP - vma->vm_end;
74951+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
74952+
74953+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
74954+
74955+#ifdef CONFIG_X86
74956+ if (!ret) {
74957+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
74958+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
74959+ }
74960+#endif
74961+
74962+ }
74963+#endif
74964+
74965 if (ret)
74966 ret = -EFAULT;
74967
74968@@ -784,8 +860,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
74969 if (err)
74970 goto exit;
74971
74972- if (name->name[0] != '\0')
74973+ if (name->name[0] != '\0') {
74974 fsnotify_open(file);
74975+ trace_open_exec(name->name);
74976+ }
74977
74978 out:
74979 return file;
74980@@ -818,7 +896,7 @@ int kernel_read(struct file *file, loff_t offset,
74981 old_fs = get_fs();
74982 set_fs(get_ds());
74983 /* The cast to a user pointer is valid due to the set_fs() */
74984- result = vfs_read(file, (void __user *)addr, count, &pos);
74985+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
74986 set_fs(old_fs);
74987 return result;
74988 }
74989@@ -863,6 +941,7 @@ static int exec_mmap(struct mm_struct *mm)
74990 tsk->mm = mm;
74991 tsk->active_mm = mm;
74992 activate_mm(active_mm, mm);
74993+ populate_stack();
74994 tsk->mm->vmacache_seqnum = 0;
74995 vmacache_flush(tsk);
74996 task_unlock(tsk);
74997@@ -1271,7 +1350,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
74998 }
74999 rcu_read_unlock();
75000
75001- if (p->fs->users > n_fs)
75002+ if (atomic_read(&p->fs->users) > n_fs)
75003 bprm->unsafe |= LSM_UNSAFE_SHARE;
75004 else
75005 p->fs->in_exec = 1;
75006@@ -1472,6 +1551,31 @@ static int exec_binprm(struct linux_binprm *bprm)
75007 return ret;
75008 }
75009
75010+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75011+static DEFINE_PER_CPU(u64, exec_counter);
75012+static int __init init_exec_counters(void)
75013+{
75014+ unsigned int cpu;
75015+
75016+ for_each_possible_cpu(cpu) {
75017+ per_cpu(exec_counter, cpu) = (u64)cpu;
75018+ }
75019+
75020+ return 0;
75021+}
75022+early_initcall(init_exec_counters);
75023+static inline void increment_exec_counter(void)
75024+{
75025+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
75026+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
75027+}
75028+#else
75029+static inline void increment_exec_counter(void) {}
75030+#endif
75031+
75032+extern void gr_handle_exec_args(struct linux_binprm *bprm,
75033+ struct user_arg_ptr argv);
75034+
75035 /*
75036 * sys_execve() executes a new program.
75037 */
75038@@ -1480,6 +1584,11 @@ static int do_execveat_common(int fd, struct filename *filename,
75039 struct user_arg_ptr envp,
75040 int flags)
75041 {
75042+#ifdef CONFIG_GRKERNSEC
75043+ struct file *old_exec_file;
75044+ struct acl_subject_label *old_acl;
75045+ struct rlimit old_rlim[RLIM_NLIMITS];
75046+#endif
75047 char *pathbuf = NULL;
75048 struct linux_binprm *bprm;
75049 struct file *file;
75050@@ -1489,6 +1598,8 @@ static int do_execveat_common(int fd, struct filename *filename,
75051 if (IS_ERR(filename))
75052 return PTR_ERR(filename);
75053
75054+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
75055+
75056 /*
75057 * We move the actual failure in case of RLIMIT_NPROC excess from
75058 * set*uid() to execve() because too many poorly written programs
75059@@ -1526,6 +1637,11 @@ static int do_execveat_common(int fd, struct filename *filename,
75060 if (IS_ERR(file))
75061 goto out_unmark;
75062
75063+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
75064+ retval = -EPERM;
75065+ goto out_unmark;
75066+ }
75067+
75068 sched_exec();
75069
75070 bprm->file = file;
75071@@ -1552,6 +1668,11 @@ static int do_execveat_common(int fd, struct filename *filename,
75072 }
75073 bprm->interp = bprm->filename;
75074
75075+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
75076+ retval = -EACCES;
75077+ goto out_unmark;
75078+ }
75079+
75080 retval = bprm_mm_init(bprm);
75081 if (retval)
75082 goto out_unmark;
75083@@ -1568,24 +1689,70 @@ static int do_execveat_common(int fd, struct filename *filename,
75084 if (retval < 0)
75085 goto out;
75086
75087+#ifdef CONFIG_GRKERNSEC
75088+ old_acl = current->acl;
75089+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
75090+ old_exec_file = current->exec_file;
75091+ get_file(file);
75092+ current->exec_file = file;
75093+#endif
75094+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
75095+ /* limit suid stack to 8MB
75096+ * we saved the old limits above and will restore them if this exec fails
75097+ */
75098+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
75099+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
75100+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
75101+#endif
75102+
75103+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
75104+ retval = -EPERM;
75105+ goto out_fail;
75106+ }
75107+
75108+ if (!gr_tpe_allow(file)) {
75109+ retval = -EACCES;
75110+ goto out_fail;
75111+ }
75112+
75113+ if (gr_check_crash_exec(file)) {
75114+ retval = -EACCES;
75115+ goto out_fail;
75116+ }
75117+
75118+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
75119+ bprm->unsafe);
75120+ if (retval < 0)
75121+ goto out_fail;
75122+
75123 retval = copy_strings_kernel(1, &bprm->filename, bprm);
75124 if (retval < 0)
75125- goto out;
75126+ goto out_fail;
75127
75128 bprm->exec = bprm->p;
75129 retval = copy_strings(bprm->envc, envp, bprm);
75130 if (retval < 0)
75131- goto out;
75132+ goto out_fail;
75133
75134 retval = copy_strings(bprm->argc, argv, bprm);
75135 if (retval < 0)
75136- goto out;
75137+ goto out_fail;
75138+
75139+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
75140+
75141+ gr_handle_exec_args(bprm, argv);
75142
75143 retval = exec_binprm(bprm);
75144 if (retval < 0)
75145- goto out;
75146+ goto out_fail;
75147+#ifdef CONFIG_GRKERNSEC
75148+ if (old_exec_file)
75149+ fput(old_exec_file);
75150+#endif
75151
75152 /* execve succeeded */
75153+
75154+ increment_exec_counter();
75155 current->fs->in_exec = 0;
75156 current->in_execve = 0;
75157 acct_update_integrals(current);
75158@@ -1597,6 +1764,14 @@ static int do_execveat_common(int fd, struct filename *filename,
75159 put_files_struct(displaced);
75160 return retval;
75161
75162+out_fail:
75163+#ifdef CONFIG_GRKERNSEC
75164+ current->acl = old_acl;
75165+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
75166+ fput(current->exec_file);
75167+ current->exec_file = old_exec_file;
75168+#endif
75169+
75170 out:
75171 if (bprm->mm) {
75172 acct_arg_size(bprm, 0);
75173@@ -1743,3 +1918,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
75174 argv, envp, flags);
75175 }
75176 #endif
75177+
75178+int pax_check_flags(unsigned long *flags)
75179+{
75180+ int retval = 0;
75181+
75182+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
75183+ if (*flags & MF_PAX_SEGMEXEC)
75184+ {
75185+ *flags &= ~MF_PAX_SEGMEXEC;
75186+ retval = -EINVAL;
75187+ }
75188+#endif
75189+
75190+ if ((*flags & MF_PAX_PAGEEXEC)
75191+
75192+#ifdef CONFIG_PAX_PAGEEXEC
75193+ && (*flags & MF_PAX_SEGMEXEC)
75194+#endif
75195+
75196+ )
75197+ {
75198+ *flags &= ~MF_PAX_PAGEEXEC;
75199+ retval = -EINVAL;
75200+ }
75201+
75202+ if ((*flags & MF_PAX_MPROTECT)
75203+
75204+#ifdef CONFIG_PAX_MPROTECT
75205+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
75206+#endif
75207+
75208+ )
75209+ {
75210+ *flags &= ~MF_PAX_MPROTECT;
75211+ retval = -EINVAL;
75212+ }
75213+
75214+ if ((*flags & MF_PAX_EMUTRAMP)
75215+
75216+#ifdef CONFIG_PAX_EMUTRAMP
75217+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
75218+#endif
75219+
75220+ )
75221+ {
75222+ *flags &= ~MF_PAX_EMUTRAMP;
75223+ retval = -EINVAL;
75224+ }
75225+
75226+ return retval;
75227+}
75228+
75229+EXPORT_SYMBOL(pax_check_flags);
75230+
75231+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
75232+char *pax_get_path(const struct path *path, char *buf, int buflen)
75233+{
75234+ char *pathname = d_path(path, buf, buflen);
75235+
75236+ if (IS_ERR(pathname))
75237+ goto toolong;
75238+
75239+ pathname = mangle_path(buf, pathname, "\t\n\\");
75240+ if (!pathname)
75241+ goto toolong;
75242+
75243+ *pathname = 0;
75244+ return buf;
75245+
75246+toolong:
75247+ return "<path too long>";
75248+}
75249+EXPORT_SYMBOL(pax_get_path);
75250+
75251+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
75252+{
75253+ struct task_struct *tsk = current;
75254+ struct mm_struct *mm = current->mm;
75255+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
75256+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
75257+ char *path_exec = NULL;
75258+ char *path_fault = NULL;
75259+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
75260+ siginfo_t info = { };
75261+
75262+ if (buffer_exec && buffer_fault) {
75263+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
75264+
75265+ down_read(&mm->mmap_sem);
75266+ vma = mm->mmap;
75267+ while (vma && (!vma_exec || !vma_fault)) {
75268+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
75269+ vma_exec = vma;
75270+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
75271+ vma_fault = vma;
75272+ vma = vma->vm_next;
75273+ }
75274+ if (vma_exec)
75275+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
75276+ if (vma_fault) {
75277+ start = vma_fault->vm_start;
75278+ end = vma_fault->vm_end;
75279+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
75280+ if (vma_fault->vm_file)
75281+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
75282+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
75283+ path_fault = "<heap>";
75284+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
75285+ path_fault = "<stack>";
75286+ else
75287+ path_fault = "<anonymous mapping>";
75288+ }
75289+ up_read(&mm->mmap_sem);
75290+ }
75291+ if (tsk->signal->curr_ip)
75292+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
75293+ else
75294+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
75295+ 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),
75296+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
75297+ free_page((unsigned long)buffer_exec);
75298+ free_page((unsigned long)buffer_fault);
75299+ pax_report_insns(regs, pc, sp);
75300+ info.si_signo = SIGKILL;
75301+ info.si_errno = 0;
75302+ info.si_code = SI_KERNEL;
75303+ info.si_pid = 0;
75304+ info.si_uid = 0;
75305+ do_coredump(&info);
75306+}
75307+#endif
75308+
75309+#ifdef CONFIG_PAX_REFCOUNT
75310+void pax_report_refcount_overflow(struct pt_regs *regs)
75311+{
75312+ if (current->signal->curr_ip)
75313+ printk(KERN_EMERG "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
75314+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
75315+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
75316+ else
75317+ printk(KERN_EMERG "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
75318+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
75319+ print_symbol(KERN_EMERG "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
75320+ preempt_disable();
75321+ show_regs(regs);
75322+ preempt_enable();
75323+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
75324+}
75325+#endif
75326+
75327+#ifdef CONFIG_PAX_USERCOPY
75328+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
75329+static noinline int check_stack_object(const void *obj, unsigned long len)
75330+{
75331+ const void * const stack = task_stack_page(current);
75332+ const void * const stackend = stack + THREAD_SIZE;
75333+
75334+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
75335+ const void *frame = NULL;
75336+ const void *oldframe;
75337+#endif
75338+
75339+ if (obj + len < obj)
75340+ return -1;
75341+
75342+ if (obj + len <= stack || stackend <= obj)
75343+ return 0;
75344+
75345+ if (obj < stack || stackend < obj + len)
75346+ return -1;
75347+
75348+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
75349+ oldframe = __builtin_frame_address(1);
75350+ if (oldframe)
75351+ frame = __builtin_frame_address(2);
75352+ /*
75353+ low ----------------------------------------------> high
75354+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
75355+ ^----------------^
75356+ allow copies only within here
75357+ */
75358+ while (stack <= frame && frame < stackend) {
75359+ /* if obj + len extends past the last frame, this
75360+ check won't pass and the next frame will be 0,
75361+ causing us to bail out and correctly report
75362+ the copy as invalid
75363+ */
75364+ if (obj + len <= frame)
75365+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
75366+ oldframe = frame;
75367+ frame = *(const void * const *)frame;
75368+ }
75369+ return -1;
75370+#else
75371+ return 1;
75372+#endif
75373+}
75374+
75375+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
75376+{
75377+ if (current->signal->curr_ip)
75378+ printk(KERN_EMERG "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
75379+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
75380+ else
75381+ printk(KERN_EMERG "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
75382+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
75383+ dump_stack();
75384+ gr_handle_kernel_exploit();
75385+ do_group_exit(SIGKILL);
75386+}
75387+#endif
75388+
75389+#ifdef CONFIG_PAX_USERCOPY
75390+
75391+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
75392+{
75393+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
75394+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
75395+#ifdef CONFIG_MODULES
75396+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
75397+#else
75398+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
75399+#endif
75400+
75401+#else
75402+ unsigned long textlow = (unsigned long)_stext;
75403+ unsigned long texthigh = (unsigned long)_etext;
75404+
75405+#ifdef CONFIG_X86_64
75406+ /* check against linear mapping as well */
75407+ if (high > (unsigned long)__va(__pa(textlow)) &&
75408+ low < (unsigned long)__va(__pa(texthigh)))
75409+ return true;
75410+#endif
75411+
75412+#endif
75413+
75414+ if (high <= textlow || low >= texthigh)
75415+ return false;
75416+ else
75417+ return true;
75418+}
75419+#endif
75420+
75421+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
75422+{
75423+#ifdef CONFIG_PAX_USERCOPY
75424+ const char *type;
75425+#endif
75426+
75427+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
75428+ unsigned long stackstart = (unsigned long)task_stack_page(current);
75429+ unsigned long currentsp = (unsigned long)&stackstart;
75430+ if (unlikely((currentsp < stackstart + 512 ||
75431+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
75432+ BUG();
75433+#endif
75434+
75435+#ifndef CONFIG_PAX_USERCOPY_DEBUG
75436+ if (const_size)
75437+ return;
75438+#endif
75439+
75440+#ifdef CONFIG_PAX_USERCOPY
75441+ if (!n)
75442+ return;
75443+
75444+ type = check_heap_object(ptr, n);
75445+ if (!type) {
75446+ int ret = check_stack_object(ptr, n);
75447+ if (ret == 1 || ret == 2)
75448+ return;
75449+ if (ret == 0) {
75450+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
75451+ type = "<kernel text>";
75452+ else
75453+ return;
75454+ } else
75455+ type = "<process stack>";
75456+ }
75457+
75458+ pax_report_usercopy(ptr, n, to_user, type);
75459+#endif
75460+
75461+}
75462+EXPORT_SYMBOL(__check_object_size);
75463+
75464+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
75465+void __used pax_track_stack(void)
75466+{
75467+ unsigned long sp = (unsigned long)&sp;
75468+ if (sp < current_thread_info()->lowest_stack &&
75469+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
75470+ current_thread_info()->lowest_stack = sp;
75471+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
75472+ BUG();
75473+}
75474+EXPORT_SYMBOL(pax_track_stack);
75475+#endif
75476+
75477+#ifdef CONFIG_PAX_SIZE_OVERFLOW
75478+void __nocapture(1, 3, 4) __used report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
75479+{
75480+ printk(KERN_EMERG "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
75481+ dump_stack();
75482+ do_group_exit(SIGKILL);
75483+}
75484+EXPORT_SYMBOL(report_size_overflow);
75485+#endif
75486diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
75487index 9f9992b..8b59411 100644
75488--- a/fs/ext2/balloc.c
75489+++ b/fs/ext2/balloc.c
75490@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
75491
75492 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
75493 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
75494- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
75495+ if (free_blocks < root_blocks + 1 &&
75496 !uid_eq(sbi->s_resuid, current_fsuid()) &&
75497 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
75498- !in_group_p (sbi->s_resgid))) {
75499+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
75500 return 0;
75501 }
75502 return 1;
75503diff --git a/fs/ext2/super.c b/fs/ext2/super.c
75504index d0e746e..82e06f0 100644
75505--- a/fs/ext2/super.c
75506+++ b/fs/ext2/super.c
75507@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
75508 #ifdef CONFIG_EXT2_FS_XATTR
75509 if (test_opt(sb, XATTR_USER))
75510 seq_puts(seq, ",user_xattr");
75511- if (!test_opt(sb, XATTR_USER) &&
75512- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
75513+ if (!test_opt(sb, XATTR_USER))
75514 seq_puts(seq, ",nouser_xattr");
75515- }
75516 #endif
75517
75518 #ifdef CONFIG_EXT2_FS_POSIX_ACL
75519@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
75520 if (def_mount_opts & EXT2_DEFM_UID16)
75521 set_opt(sbi->s_mount_opt, NO_UID32);
75522 #ifdef CONFIG_EXT2_FS_XATTR
75523- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
75524- set_opt(sbi->s_mount_opt, XATTR_USER);
75525+ /* always enable user xattrs */
75526+ set_opt(sbi->s_mount_opt, XATTR_USER);
75527 #endif
75528 #ifdef CONFIG_EXT2_FS_POSIX_ACL
75529 if (def_mount_opts & EXT2_DEFM_ACL)
75530diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
75531index 0b6bfd3..93a2964 100644
75532--- a/fs/ext2/xattr.c
75533+++ b/fs/ext2/xattr.c
75534@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
75535 struct buffer_head *bh = NULL;
75536 struct ext2_xattr_entry *entry;
75537 char *end;
75538- size_t rest = buffer_size;
75539+ size_t rest = buffer_size, total_size = 0;
75540 int error;
75541
75542 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
75543@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
75544 buffer += size;
75545 }
75546 rest -= size;
75547+ total_size += size;
75548 }
75549 }
75550- error = buffer_size - rest; /* total size */
75551+ error = total_size;
75552
75553 cleanup:
75554 brelse(bh);
75555diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
75556index 158b5d4..2432610 100644
75557--- a/fs/ext3/balloc.c
75558+++ b/fs/ext3/balloc.c
75559@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
75560
75561 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
75562 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
75563- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
75564+ if (free_blocks < root_blocks + 1 &&
75565 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
75566 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
75567- !in_group_p (sbi->s_resgid))) {
75568+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
75569 return 0;
75570 }
75571 return 1;
75572diff --git a/fs/ext3/super.c b/fs/ext3/super.c
75573index a9312f0..e3a11ec 100644
75574--- a/fs/ext3/super.c
75575+++ b/fs/ext3/super.c
75576@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
75577 #ifdef CONFIG_EXT3_FS_XATTR
75578 if (test_opt(sb, XATTR_USER))
75579 seq_puts(seq, ",user_xattr");
75580- if (!test_opt(sb, XATTR_USER) &&
75581- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
75582+ if (!test_opt(sb, XATTR_USER))
75583 seq_puts(seq, ",nouser_xattr");
75584- }
75585 #endif
75586 #ifdef CONFIG_EXT3_FS_POSIX_ACL
75587 if (test_opt(sb, POSIX_ACL))
75588@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
75589 if (def_mount_opts & EXT3_DEFM_UID16)
75590 set_opt(sbi->s_mount_opt, NO_UID32);
75591 #ifdef CONFIG_EXT3_FS_XATTR
75592- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
75593- set_opt(sbi->s_mount_opt, XATTR_USER);
75594+ /* always enable user xattrs */
75595+ set_opt(sbi->s_mount_opt, XATTR_USER);
75596 #endif
75597 #ifdef CONFIG_EXT3_FS_POSIX_ACL
75598 if (def_mount_opts & EXT3_DEFM_ACL)
75599diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
75600index 7cf3650..e3f4a51 100644
75601--- a/fs/ext3/xattr.c
75602+++ b/fs/ext3/xattr.c
75603@@ -330,7 +330,7 @@ static int
75604 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
75605 char *buffer, size_t buffer_size)
75606 {
75607- size_t rest = buffer_size;
75608+ size_t rest = buffer_size, total_size = 0;
75609
75610 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
75611 const struct xattr_handler *handler =
75612@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
75613 buffer += size;
75614 }
75615 rest -= size;
75616+ total_size += size;
75617 }
75618 }
75619- return buffer_size - rest;
75620+ return total_size;
75621 }
75622
75623 static int
75624diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
75625index 955bf49a..44ee359 100644
75626--- a/fs/ext4/balloc.c
75627+++ b/fs/ext4/balloc.c
75628@@ -556,8 +556,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
75629 /* Hm, nope. Are (enough) root reserved clusters available? */
75630 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
75631 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
75632- capable(CAP_SYS_RESOURCE) ||
75633- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
75634+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
75635+ capable_nolog(CAP_SYS_RESOURCE)) {
75636
75637 if (free_clusters >= (nclusters + dirty_clusters +
75638 resv_clusters))
75639diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
75640index 9a83f14..1dd1b38 100644
75641--- a/fs/ext4/ext4.h
75642+++ b/fs/ext4/ext4.h
75643@@ -1310,19 +1310,19 @@ struct ext4_sb_info {
75644 unsigned long s_mb_last_start;
75645
75646 /* stats for buddy allocator */
75647- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
75648- atomic_t s_bal_success; /* we found long enough chunks */
75649- atomic_t s_bal_allocated; /* in blocks */
75650- atomic_t s_bal_ex_scanned; /* total extents scanned */
75651- atomic_t s_bal_goals; /* goal hits */
75652- atomic_t s_bal_breaks; /* too long searches */
75653- atomic_t s_bal_2orders; /* 2^order hits */
75654+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
75655+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
75656+ atomic_unchecked_t s_bal_allocated; /* in blocks */
75657+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
75658+ atomic_unchecked_t s_bal_goals; /* goal hits */
75659+ atomic_unchecked_t s_bal_breaks; /* too long searches */
75660+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
75661 spinlock_t s_bal_lock;
75662 unsigned long s_mb_buddies_generated;
75663 unsigned long long s_mb_generation_time;
75664- atomic_t s_mb_lost_chunks;
75665- atomic_t s_mb_preallocated;
75666- atomic_t s_mb_discarded;
75667+ atomic_unchecked_t s_mb_lost_chunks;
75668+ atomic_unchecked_t s_mb_preallocated;
75669+ atomic_unchecked_t s_mb_discarded;
75670 atomic_t s_lock_busy;
75671
75672 /* locality groups */
75673diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
75674index 4126048..3788867 100644
75675--- a/fs/ext4/mballoc.c
75676+++ b/fs/ext4/mballoc.c
75677@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
75678 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
75679
75680 if (EXT4_SB(sb)->s_mb_stats)
75681- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
75682+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
75683
75684 break;
75685 }
75686@@ -2211,7 +2211,7 @@ repeat:
75687 ac->ac_status = AC_STATUS_CONTINUE;
75688 ac->ac_flags |= EXT4_MB_HINT_FIRST;
75689 cr = 3;
75690- atomic_inc(&sbi->s_mb_lost_chunks);
75691+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
75692 goto repeat;
75693 }
75694 }
75695@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
75696 if (sbi->s_mb_stats) {
75697 ext4_msg(sb, KERN_INFO,
75698 "mballoc: %u blocks %u reqs (%u success)",
75699- atomic_read(&sbi->s_bal_allocated),
75700- atomic_read(&sbi->s_bal_reqs),
75701- atomic_read(&sbi->s_bal_success));
75702+ atomic_read_unchecked(&sbi->s_bal_allocated),
75703+ atomic_read_unchecked(&sbi->s_bal_reqs),
75704+ atomic_read_unchecked(&sbi->s_bal_success));
75705 ext4_msg(sb, KERN_INFO,
75706 "mballoc: %u extents scanned, %u goal hits, "
75707 "%u 2^N hits, %u breaks, %u lost",
75708- atomic_read(&sbi->s_bal_ex_scanned),
75709- atomic_read(&sbi->s_bal_goals),
75710- atomic_read(&sbi->s_bal_2orders),
75711- atomic_read(&sbi->s_bal_breaks),
75712- atomic_read(&sbi->s_mb_lost_chunks));
75713+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
75714+ atomic_read_unchecked(&sbi->s_bal_goals),
75715+ atomic_read_unchecked(&sbi->s_bal_2orders),
75716+ atomic_read_unchecked(&sbi->s_bal_breaks),
75717+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
75718 ext4_msg(sb, KERN_INFO,
75719 "mballoc: %lu generated and it took %Lu",
75720 sbi->s_mb_buddies_generated,
75721 sbi->s_mb_generation_time);
75722 ext4_msg(sb, KERN_INFO,
75723 "mballoc: %u preallocated, %u discarded",
75724- atomic_read(&sbi->s_mb_preallocated),
75725- atomic_read(&sbi->s_mb_discarded));
75726+ atomic_read_unchecked(&sbi->s_mb_preallocated),
75727+ atomic_read_unchecked(&sbi->s_mb_discarded));
75728 }
75729
75730 free_percpu(sbi->s_locality_groups);
75731@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
75732 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
75733
75734 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
75735- atomic_inc(&sbi->s_bal_reqs);
75736- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
75737+ atomic_inc_unchecked(&sbi->s_bal_reqs);
75738+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
75739 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
75740- atomic_inc(&sbi->s_bal_success);
75741- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
75742+ atomic_inc_unchecked(&sbi->s_bal_success);
75743+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
75744 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
75745 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
75746- atomic_inc(&sbi->s_bal_goals);
75747+ atomic_inc_unchecked(&sbi->s_bal_goals);
75748 if (ac->ac_found > sbi->s_mb_max_to_scan)
75749- atomic_inc(&sbi->s_bal_breaks);
75750+ atomic_inc_unchecked(&sbi->s_bal_breaks);
75751 }
75752
75753 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
75754@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
75755 trace_ext4_mb_new_inode_pa(ac, pa);
75756
75757 ext4_mb_use_inode_pa(ac, pa);
75758- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
75759+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
75760
75761 ei = EXT4_I(ac->ac_inode);
75762 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
75763@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
75764 trace_ext4_mb_new_group_pa(ac, pa);
75765
75766 ext4_mb_use_group_pa(ac, pa);
75767- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
75768+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
75769
75770 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
75771 lg = ac->ac_lg;
75772@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
75773 * from the bitmap and continue.
75774 */
75775 }
75776- atomic_add(free, &sbi->s_mb_discarded);
75777+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
75778
75779 return err;
75780 }
75781@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
75782 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
75783 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
75784 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
75785- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
75786+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
75787 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
75788
75789 return 0;
75790diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
75791index 8313ca3..8a37d08 100644
75792--- a/fs/ext4/mmp.c
75793+++ b/fs/ext4/mmp.c
75794@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
75795 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
75796 const char *function, unsigned int line, const char *msg)
75797 {
75798- __ext4_warning(sb, function, line, msg);
75799+ __ext4_warning(sb, function, line, "%s", msg);
75800 __ext4_warning(sb, function, line,
75801 "MMP failure info: last update time: %llu, last update "
75802 "node: %s, last update device: %s\n",
75803diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
75804index cf0c472..ddf284d 100644
75805--- a/fs/ext4/resize.c
75806+++ b/fs/ext4/resize.c
75807@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75808
75809 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
75810 for (count2 = count; count > 0; count -= count2, block += count2) {
75811- ext4_fsblk_t start;
75812+ ext4_fsblk_t start, diff;
75813 struct buffer_head *bh;
75814 ext4_group_t group;
75815 int err;
75816@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75817 start = ext4_group_first_block_no(sb, group);
75818 group -= flex_gd->groups[0].group;
75819
75820- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
75821- if (count2 > count)
75822- count2 = count;
75823-
75824 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
75825 BUG_ON(flex_gd->count > 1);
75826 continue;
75827@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
75828 err = ext4_journal_get_write_access(handle, bh);
75829 if (err)
75830 return err;
75831+
75832+ diff = block - start;
75833+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
75834+ if (count2 > count)
75835+ count2 = count;
75836+
75837 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
75838- block - start, count2);
75839- ext4_set_bits(bh->b_data, block - start, count2);
75840+ diff, count2);
75841+ ext4_set_bits(bh->b_data, diff, count2);
75842
75843 err = ext4_handle_dirty_metadata(handle, NULL, bh);
75844 if (unlikely(err))
75845diff --git a/fs/ext4/super.c b/fs/ext4/super.c
75846index ca12affd..18b4b75 100644
75847--- a/fs/ext4/super.c
75848+++ b/fs/ext4/super.c
75849@@ -1233,7 +1233,7 @@ static ext4_fsblk_t get_sb_block(void **data)
75850 }
75851
75852 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
75853-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
75854+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
75855 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
75856
75857 #ifdef CONFIG_QUOTA
75858@@ -2443,7 +2443,7 @@ struct ext4_attr {
75859 int offset;
75860 int deprecated_val;
75861 } u;
75862-};
75863+} __do_const;
75864
75865 static int parse_strtoull(const char *buf,
75866 unsigned long long max, unsigned long long *value)
75867diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
75868index 16e28c0..728c282 100644
75869--- a/fs/ext4/xattr.c
75870+++ b/fs/ext4/xattr.c
75871@@ -398,7 +398,7 @@ static int
75872 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
75873 char *buffer, size_t buffer_size)
75874 {
75875- size_t rest = buffer_size;
75876+ size_t rest = buffer_size, total_size = 0;
75877
75878 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
75879 const struct xattr_handler *handler =
75880@@ -415,9 +415,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
75881 buffer += size;
75882 }
75883 rest -= size;
75884+ total_size += size;
75885 }
75886 }
75887- return buffer_size - rest;
75888+ return total_size;
75889 }
75890
75891 static int
75892diff --git a/fs/fcntl.c b/fs/fcntl.c
75893index ee85cd4..9dd0d20 100644
75894--- a/fs/fcntl.c
75895+++ b/fs/fcntl.c
75896@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
75897 int force)
75898 {
75899 security_file_set_fowner(filp);
75900+ if (gr_handle_chroot_fowner(pid, type))
75901+ return;
75902+ if (gr_check_protected_task_fowner(pid, type))
75903+ return;
75904 f_modown(filp, pid, type, force);
75905 }
75906 EXPORT_SYMBOL(__f_setown);
75907diff --git a/fs/fhandle.c b/fs/fhandle.c
75908index d59712d..2281df9 100644
75909--- a/fs/fhandle.c
75910+++ b/fs/fhandle.c
75911@@ -8,6 +8,7 @@
75912 #include <linux/fs_struct.h>
75913 #include <linux/fsnotify.h>
75914 #include <linux/personality.h>
75915+#include <linux/grsecurity.h>
75916 #include <asm/uaccess.h>
75917 #include "internal.h"
75918 #include "mount.h"
75919@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
75920 } else
75921 retval = 0;
75922 /* copy the mount id */
75923- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
75924- sizeof(*mnt_id)) ||
75925+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
75926 copy_to_user(ufh, handle,
75927 sizeof(struct file_handle) + handle_bytes))
75928 retval = -EFAULT;
75929@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
75930 * the directory. Ideally we would like CAP_DAC_SEARCH.
75931 * But we don't have that
75932 */
75933- if (!capable(CAP_DAC_READ_SEARCH)) {
75934+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
75935 retval = -EPERM;
75936 goto out_err;
75937 }
75938diff --git a/fs/file.c b/fs/file.c
75939index 93c5f89..ed75817 100644
75940--- a/fs/file.c
75941+++ b/fs/file.c
75942@@ -16,6 +16,7 @@
75943 #include <linux/slab.h>
75944 #include <linux/vmalloc.h>
75945 #include <linux/file.h>
75946+#include <linux/security.h>
75947 #include <linux/fdtable.h>
75948 #include <linux/bitops.h>
75949 #include <linux/interrupt.h>
75950@@ -139,7 +140,7 @@ out:
75951 * Return <0 error code on error; 1 on successful completion.
75952 * The files->file_lock should be held on entry, and will be held on exit.
75953 */
75954-static int expand_fdtable(struct files_struct *files, int nr)
75955+static int expand_fdtable(struct files_struct *files, unsigned int nr)
75956 __releases(files->file_lock)
75957 __acquires(files->file_lock)
75958 {
75959@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
75960 * expanded and execution may have blocked.
75961 * The files->file_lock should be held on entry, and will be held on exit.
75962 */
75963-static int expand_files(struct files_struct *files, int nr)
75964+static int expand_files(struct files_struct *files, unsigned int nr)
75965 {
75966 struct fdtable *fdt;
75967
75968@@ -799,6 +800,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
75969 if (!file)
75970 return __close_fd(files, fd);
75971
75972+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
75973 if (fd >= rlimit(RLIMIT_NOFILE))
75974 return -EBADF;
75975
75976@@ -825,6 +827,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
75977 if (unlikely(oldfd == newfd))
75978 return -EINVAL;
75979
75980+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
75981 if (newfd >= rlimit(RLIMIT_NOFILE))
75982 return -EBADF;
75983
75984@@ -880,6 +883,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
75985 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
75986 {
75987 int err;
75988+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
75989 if (from >= rlimit(RLIMIT_NOFILE))
75990 return -EINVAL;
75991 err = alloc_fd(from, flags);
75992diff --git a/fs/filesystems.c b/fs/filesystems.c
75993index 5797d45..7d7d79a 100644
75994--- a/fs/filesystems.c
75995+++ b/fs/filesystems.c
75996@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
75997 int len = dot ? dot - name : strlen(name);
75998
75999 fs = __get_fs_type(name, len);
76000+#ifdef CONFIG_GRKERNSEC_MODHARDEN
76001+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
76002+#else
76003 if (!fs && (request_module("fs-%.*s", len, name) == 0))
76004+#endif
76005 fs = __get_fs_type(name, len);
76006
76007 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
76008diff --git a/fs/fs_struct.c b/fs/fs_struct.c
76009index 7dca743..1ff87ae 100644
76010--- a/fs/fs_struct.c
76011+++ b/fs/fs_struct.c
76012@@ -4,6 +4,7 @@
76013 #include <linux/path.h>
76014 #include <linux/slab.h>
76015 #include <linux/fs_struct.h>
76016+#include <linux/grsecurity.h>
76017 #include "internal.h"
76018
76019 /*
76020@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
76021 struct path old_root;
76022
76023 path_get(path);
76024+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
76025 spin_lock(&fs->lock);
76026 write_seqcount_begin(&fs->seq);
76027 old_root = fs->root;
76028 fs->root = *path;
76029+ gr_set_chroot_entries(current, path);
76030 write_seqcount_end(&fs->seq);
76031 spin_unlock(&fs->lock);
76032- if (old_root.dentry)
76033+ if (old_root.dentry) {
76034+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
76035 path_put(&old_root);
76036+ }
76037 }
76038
76039 /*
76040@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
76041 int hits = 0;
76042 spin_lock(&fs->lock);
76043 write_seqcount_begin(&fs->seq);
76044+ /* this root replacement is only done by pivot_root,
76045+ leave grsec's chroot tagging alone for this task
76046+ so that a pivoted root isn't treated as a chroot
76047+ */
76048 hits += replace_path(&fs->root, old_root, new_root);
76049 hits += replace_path(&fs->pwd, old_root, new_root);
76050 write_seqcount_end(&fs->seq);
76051@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
76052
76053 void free_fs_struct(struct fs_struct *fs)
76054 {
76055+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
76056 path_put(&fs->root);
76057 path_put(&fs->pwd);
76058 kmem_cache_free(fs_cachep, fs);
76059@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
76060 task_lock(tsk);
76061 spin_lock(&fs->lock);
76062 tsk->fs = NULL;
76063- kill = !--fs->users;
76064+ gr_clear_chroot_entries(tsk);
76065+ kill = !atomic_dec_return(&fs->users);
76066 spin_unlock(&fs->lock);
76067 task_unlock(tsk);
76068 if (kill)
76069@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
76070 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
76071 /* We don't need to lock fs - think why ;-) */
76072 if (fs) {
76073- fs->users = 1;
76074+ atomic_set(&fs->users, 1);
76075 fs->in_exec = 0;
76076 spin_lock_init(&fs->lock);
76077 seqcount_init(&fs->seq);
76078@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
76079 spin_lock(&old->lock);
76080 fs->root = old->root;
76081 path_get(&fs->root);
76082+ /* instead of calling gr_set_chroot_entries here,
76083+ we call it from every caller of this function
76084+ */
76085 fs->pwd = old->pwd;
76086 path_get(&fs->pwd);
76087 spin_unlock(&old->lock);
76088+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
76089 }
76090 return fs;
76091 }
76092@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
76093
76094 task_lock(current);
76095 spin_lock(&fs->lock);
76096- kill = !--fs->users;
76097+ kill = !atomic_dec_return(&fs->users);
76098 current->fs = new_fs;
76099+ gr_set_chroot_entries(current, &new_fs->root);
76100 spin_unlock(&fs->lock);
76101 task_unlock(current);
76102
76103@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
76104
76105 int current_umask(void)
76106 {
76107- return current->fs->umask;
76108+ return current->fs->umask | gr_acl_umask();
76109 }
76110 EXPORT_SYMBOL(current_umask);
76111
76112 /* to be mentioned only in INIT_TASK */
76113 struct fs_struct init_fs = {
76114- .users = 1,
76115+ .users = ATOMIC_INIT(1),
76116 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
76117 .seq = SEQCNT_ZERO(init_fs.seq),
76118 .umask = 0022,
76119diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
76120index 89acec7..a575262 100644
76121--- a/fs/fscache/cookie.c
76122+++ b/fs/fscache/cookie.c
76123@@ -19,7 +19,7 @@
76124
76125 struct kmem_cache *fscache_cookie_jar;
76126
76127-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
76128+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
76129
76130 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
76131 static int fscache_alloc_object(struct fscache_cache *cache,
76132@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
76133 parent ? (char *) parent->def->name : "<no-parent>",
76134 def->name, netfs_data, enable);
76135
76136- fscache_stat(&fscache_n_acquires);
76137+ fscache_stat_unchecked(&fscache_n_acquires);
76138
76139 /* if there's no parent cookie, then we don't create one here either */
76140 if (!parent) {
76141- fscache_stat(&fscache_n_acquires_null);
76142+ fscache_stat_unchecked(&fscache_n_acquires_null);
76143 _leave(" [no parent]");
76144 return NULL;
76145 }
76146@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76147 /* allocate and initialise a cookie */
76148 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
76149 if (!cookie) {
76150- fscache_stat(&fscache_n_acquires_oom);
76151+ fscache_stat_unchecked(&fscache_n_acquires_oom);
76152 _leave(" [ENOMEM]");
76153 return NULL;
76154 }
76155@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
76156
76157 switch (cookie->def->type) {
76158 case FSCACHE_COOKIE_TYPE_INDEX:
76159- fscache_stat(&fscache_n_cookie_index);
76160+ fscache_stat_unchecked(&fscache_n_cookie_index);
76161 break;
76162 case FSCACHE_COOKIE_TYPE_DATAFILE:
76163- fscache_stat(&fscache_n_cookie_data);
76164+ fscache_stat_unchecked(&fscache_n_cookie_data);
76165 break;
76166 default:
76167- fscache_stat(&fscache_n_cookie_special);
76168+ fscache_stat_unchecked(&fscache_n_cookie_special);
76169 break;
76170 }
76171
76172@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76173 } else {
76174 atomic_dec(&parent->n_children);
76175 __fscache_cookie_put(cookie);
76176- fscache_stat(&fscache_n_acquires_nobufs);
76177+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
76178 _leave(" = NULL");
76179 return NULL;
76180 }
76181@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
76182 }
76183 }
76184
76185- fscache_stat(&fscache_n_acquires_ok);
76186+ fscache_stat_unchecked(&fscache_n_acquires_ok);
76187 _leave(" = %p", cookie);
76188 return cookie;
76189 }
76190@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
76191 cache = fscache_select_cache_for_object(cookie->parent);
76192 if (!cache) {
76193 up_read(&fscache_addremove_sem);
76194- fscache_stat(&fscache_n_acquires_no_cache);
76195+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
76196 _leave(" = -ENOMEDIUM [no cache]");
76197 return -ENOMEDIUM;
76198 }
76199@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
76200 object = cache->ops->alloc_object(cache, cookie);
76201 fscache_stat_d(&fscache_n_cop_alloc_object);
76202 if (IS_ERR(object)) {
76203- fscache_stat(&fscache_n_object_no_alloc);
76204+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
76205 ret = PTR_ERR(object);
76206 goto error;
76207 }
76208
76209- fscache_stat(&fscache_n_object_alloc);
76210+ fscache_stat_unchecked(&fscache_n_object_alloc);
76211
76212- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
76213+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
76214
76215 _debug("ALLOC OBJ%x: %s {%lx}",
76216 object->debug_id, cookie->def->name, object->events);
76217@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
76218
76219 _enter("{%s}", cookie->def->name);
76220
76221- fscache_stat(&fscache_n_invalidates);
76222+ fscache_stat_unchecked(&fscache_n_invalidates);
76223
76224 /* Only permit invalidation of data files. Invalidating an index will
76225 * require the caller to release all its attachments to the tree rooted
76226@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
76227 {
76228 struct fscache_object *object;
76229
76230- fscache_stat(&fscache_n_updates);
76231+ fscache_stat_unchecked(&fscache_n_updates);
76232
76233 if (!cookie) {
76234- fscache_stat(&fscache_n_updates_null);
76235+ fscache_stat_unchecked(&fscache_n_updates_null);
76236 _leave(" [no cookie]");
76237 return;
76238 }
76239@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
76240 */
76241 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
76242 {
76243- fscache_stat(&fscache_n_relinquishes);
76244+ fscache_stat_unchecked(&fscache_n_relinquishes);
76245 if (retire)
76246- fscache_stat(&fscache_n_relinquishes_retire);
76247+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
76248
76249 if (!cookie) {
76250- fscache_stat(&fscache_n_relinquishes_null);
76251+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
76252 _leave(" [no cookie]");
76253 return;
76254 }
76255@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
76256 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
76257 goto inconsistent;
76258
76259- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
76260+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
76261
76262 __fscache_use_cookie(cookie);
76263 if (fscache_submit_op(object, op) < 0)
76264diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
76265index 7872a62..d91b19f 100644
76266--- a/fs/fscache/internal.h
76267+++ b/fs/fscache/internal.h
76268@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
76269 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
76270 extern int fscache_wait_for_operation_activation(struct fscache_object *,
76271 struct fscache_operation *,
76272- atomic_t *,
76273- atomic_t *,
76274+ atomic_unchecked_t *,
76275+ atomic_unchecked_t *,
76276 void (*)(struct fscache_operation *));
76277 extern void fscache_invalidate_writes(struct fscache_cookie *);
76278
76279@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
76280 * stats.c
76281 */
76282 #ifdef CONFIG_FSCACHE_STATS
76283-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
76284-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
76285+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
76286+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
76287
76288-extern atomic_t fscache_n_op_pend;
76289-extern atomic_t fscache_n_op_run;
76290-extern atomic_t fscache_n_op_enqueue;
76291-extern atomic_t fscache_n_op_deferred_release;
76292-extern atomic_t fscache_n_op_release;
76293-extern atomic_t fscache_n_op_gc;
76294-extern atomic_t fscache_n_op_cancelled;
76295-extern atomic_t fscache_n_op_rejected;
76296+extern atomic_unchecked_t fscache_n_op_pend;
76297+extern atomic_unchecked_t fscache_n_op_run;
76298+extern atomic_unchecked_t fscache_n_op_enqueue;
76299+extern atomic_unchecked_t fscache_n_op_deferred_release;
76300+extern atomic_unchecked_t fscache_n_op_release;
76301+extern atomic_unchecked_t fscache_n_op_gc;
76302+extern atomic_unchecked_t fscache_n_op_cancelled;
76303+extern atomic_unchecked_t fscache_n_op_rejected;
76304
76305-extern atomic_t fscache_n_attr_changed;
76306-extern atomic_t fscache_n_attr_changed_ok;
76307-extern atomic_t fscache_n_attr_changed_nobufs;
76308-extern atomic_t fscache_n_attr_changed_nomem;
76309-extern atomic_t fscache_n_attr_changed_calls;
76310+extern atomic_unchecked_t fscache_n_attr_changed;
76311+extern atomic_unchecked_t fscache_n_attr_changed_ok;
76312+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
76313+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
76314+extern atomic_unchecked_t fscache_n_attr_changed_calls;
76315
76316-extern atomic_t fscache_n_allocs;
76317-extern atomic_t fscache_n_allocs_ok;
76318-extern atomic_t fscache_n_allocs_wait;
76319-extern atomic_t fscache_n_allocs_nobufs;
76320-extern atomic_t fscache_n_allocs_intr;
76321-extern atomic_t fscache_n_allocs_object_dead;
76322-extern atomic_t fscache_n_alloc_ops;
76323-extern atomic_t fscache_n_alloc_op_waits;
76324+extern atomic_unchecked_t fscache_n_allocs;
76325+extern atomic_unchecked_t fscache_n_allocs_ok;
76326+extern atomic_unchecked_t fscache_n_allocs_wait;
76327+extern atomic_unchecked_t fscache_n_allocs_nobufs;
76328+extern atomic_unchecked_t fscache_n_allocs_intr;
76329+extern atomic_unchecked_t fscache_n_allocs_object_dead;
76330+extern atomic_unchecked_t fscache_n_alloc_ops;
76331+extern atomic_unchecked_t fscache_n_alloc_op_waits;
76332
76333-extern atomic_t fscache_n_retrievals;
76334-extern atomic_t fscache_n_retrievals_ok;
76335-extern atomic_t fscache_n_retrievals_wait;
76336-extern atomic_t fscache_n_retrievals_nodata;
76337-extern atomic_t fscache_n_retrievals_nobufs;
76338-extern atomic_t fscache_n_retrievals_intr;
76339-extern atomic_t fscache_n_retrievals_nomem;
76340-extern atomic_t fscache_n_retrievals_object_dead;
76341-extern atomic_t fscache_n_retrieval_ops;
76342-extern atomic_t fscache_n_retrieval_op_waits;
76343+extern atomic_unchecked_t fscache_n_retrievals;
76344+extern atomic_unchecked_t fscache_n_retrievals_ok;
76345+extern atomic_unchecked_t fscache_n_retrievals_wait;
76346+extern atomic_unchecked_t fscache_n_retrievals_nodata;
76347+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
76348+extern atomic_unchecked_t fscache_n_retrievals_intr;
76349+extern atomic_unchecked_t fscache_n_retrievals_nomem;
76350+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
76351+extern atomic_unchecked_t fscache_n_retrieval_ops;
76352+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
76353
76354-extern atomic_t fscache_n_stores;
76355-extern atomic_t fscache_n_stores_ok;
76356-extern atomic_t fscache_n_stores_again;
76357-extern atomic_t fscache_n_stores_nobufs;
76358-extern atomic_t fscache_n_stores_oom;
76359-extern atomic_t fscache_n_store_ops;
76360-extern atomic_t fscache_n_store_calls;
76361-extern atomic_t fscache_n_store_pages;
76362-extern atomic_t fscache_n_store_radix_deletes;
76363-extern atomic_t fscache_n_store_pages_over_limit;
76364+extern atomic_unchecked_t fscache_n_stores;
76365+extern atomic_unchecked_t fscache_n_stores_ok;
76366+extern atomic_unchecked_t fscache_n_stores_again;
76367+extern atomic_unchecked_t fscache_n_stores_nobufs;
76368+extern atomic_unchecked_t fscache_n_stores_oom;
76369+extern atomic_unchecked_t fscache_n_store_ops;
76370+extern atomic_unchecked_t fscache_n_store_calls;
76371+extern atomic_unchecked_t fscache_n_store_pages;
76372+extern atomic_unchecked_t fscache_n_store_radix_deletes;
76373+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
76374
76375-extern atomic_t fscache_n_store_vmscan_not_storing;
76376-extern atomic_t fscache_n_store_vmscan_gone;
76377-extern atomic_t fscache_n_store_vmscan_busy;
76378-extern atomic_t fscache_n_store_vmscan_cancelled;
76379-extern atomic_t fscache_n_store_vmscan_wait;
76380+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
76381+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
76382+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
76383+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
76384+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
76385
76386-extern atomic_t fscache_n_marks;
76387-extern atomic_t fscache_n_uncaches;
76388+extern atomic_unchecked_t fscache_n_marks;
76389+extern atomic_unchecked_t fscache_n_uncaches;
76390
76391-extern atomic_t fscache_n_acquires;
76392-extern atomic_t fscache_n_acquires_null;
76393-extern atomic_t fscache_n_acquires_no_cache;
76394-extern atomic_t fscache_n_acquires_ok;
76395-extern atomic_t fscache_n_acquires_nobufs;
76396-extern atomic_t fscache_n_acquires_oom;
76397+extern atomic_unchecked_t fscache_n_acquires;
76398+extern atomic_unchecked_t fscache_n_acquires_null;
76399+extern atomic_unchecked_t fscache_n_acquires_no_cache;
76400+extern atomic_unchecked_t fscache_n_acquires_ok;
76401+extern atomic_unchecked_t fscache_n_acquires_nobufs;
76402+extern atomic_unchecked_t fscache_n_acquires_oom;
76403
76404-extern atomic_t fscache_n_invalidates;
76405-extern atomic_t fscache_n_invalidates_run;
76406+extern atomic_unchecked_t fscache_n_invalidates;
76407+extern atomic_unchecked_t fscache_n_invalidates_run;
76408
76409-extern atomic_t fscache_n_updates;
76410-extern atomic_t fscache_n_updates_null;
76411-extern atomic_t fscache_n_updates_run;
76412+extern atomic_unchecked_t fscache_n_updates;
76413+extern atomic_unchecked_t fscache_n_updates_null;
76414+extern atomic_unchecked_t fscache_n_updates_run;
76415
76416-extern atomic_t fscache_n_relinquishes;
76417-extern atomic_t fscache_n_relinquishes_null;
76418-extern atomic_t fscache_n_relinquishes_waitcrt;
76419-extern atomic_t fscache_n_relinquishes_retire;
76420+extern atomic_unchecked_t fscache_n_relinquishes;
76421+extern atomic_unchecked_t fscache_n_relinquishes_null;
76422+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
76423+extern atomic_unchecked_t fscache_n_relinquishes_retire;
76424
76425-extern atomic_t fscache_n_cookie_index;
76426-extern atomic_t fscache_n_cookie_data;
76427-extern atomic_t fscache_n_cookie_special;
76428+extern atomic_unchecked_t fscache_n_cookie_index;
76429+extern atomic_unchecked_t fscache_n_cookie_data;
76430+extern atomic_unchecked_t fscache_n_cookie_special;
76431
76432-extern atomic_t fscache_n_object_alloc;
76433-extern atomic_t fscache_n_object_no_alloc;
76434-extern atomic_t fscache_n_object_lookups;
76435-extern atomic_t fscache_n_object_lookups_negative;
76436-extern atomic_t fscache_n_object_lookups_positive;
76437-extern atomic_t fscache_n_object_lookups_timed_out;
76438-extern atomic_t fscache_n_object_created;
76439-extern atomic_t fscache_n_object_avail;
76440-extern atomic_t fscache_n_object_dead;
76441+extern atomic_unchecked_t fscache_n_object_alloc;
76442+extern atomic_unchecked_t fscache_n_object_no_alloc;
76443+extern atomic_unchecked_t fscache_n_object_lookups;
76444+extern atomic_unchecked_t fscache_n_object_lookups_negative;
76445+extern atomic_unchecked_t fscache_n_object_lookups_positive;
76446+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
76447+extern atomic_unchecked_t fscache_n_object_created;
76448+extern atomic_unchecked_t fscache_n_object_avail;
76449+extern atomic_unchecked_t fscache_n_object_dead;
76450
76451-extern atomic_t fscache_n_checkaux_none;
76452-extern atomic_t fscache_n_checkaux_okay;
76453-extern atomic_t fscache_n_checkaux_update;
76454-extern atomic_t fscache_n_checkaux_obsolete;
76455+extern atomic_unchecked_t fscache_n_checkaux_none;
76456+extern atomic_unchecked_t fscache_n_checkaux_okay;
76457+extern atomic_unchecked_t fscache_n_checkaux_update;
76458+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
76459
76460 extern atomic_t fscache_n_cop_alloc_object;
76461 extern atomic_t fscache_n_cop_lookup_object;
76462@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
76463 atomic_inc(stat);
76464 }
76465
76466+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
76467+{
76468+ atomic_inc_unchecked(stat);
76469+}
76470+
76471 static inline void fscache_stat_d(atomic_t *stat)
76472 {
76473 atomic_dec(stat);
76474@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
76475
76476 #define __fscache_stat(stat) (NULL)
76477 #define fscache_stat(stat) do {} while (0)
76478+#define fscache_stat_unchecked(stat) do {} while (0)
76479 #define fscache_stat_d(stat) do {} while (0)
76480 #endif
76481
76482diff --git a/fs/fscache/object.c b/fs/fscache/object.c
76483index da032da..0076ce7 100644
76484--- a/fs/fscache/object.c
76485+++ b/fs/fscache/object.c
76486@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
76487 _debug("LOOKUP \"%s\" in \"%s\"",
76488 cookie->def->name, object->cache->tag->name);
76489
76490- fscache_stat(&fscache_n_object_lookups);
76491+ fscache_stat_unchecked(&fscache_n_object_lookups);
76492 fscache_stat(&fscache_n_cop_lookup_object);
76493 ret = object->cache->ops->lookup_object(object);
76494 fscache_stat_d(&fscache_n_cop_lookup_object);
76495@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
76496 if (ret == -ETIMEDOUT) {
76497 /* probably stuck behind another object, so move this one to
76498 * the back of the queue */
76499- fscache_stat(&fscache_n_object_lookups_timed_out);
76500+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
76501 _leave(" [timeout]");
76502 return NO_TRANSIT;
76503 }
76504@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
76505 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
76506
76507 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
76508- fscache_stat(&fscache_n_object_lookups_negative);
76509+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
76510
76511 /* Allow write requests to begin stacking up and read requests to begin
76512 * returning ENODATA.
76513@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
76514 /* if we were still looking up, then we must have a positive lookup
76515 * result, in which case there may be data available */
76516 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
76517- fscache_stat(&fscache_n_object_lookups_positive);
76518+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
76519
76520 /* We do (presumably) have data */
76521 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
76522@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
76523 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
76524 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
76525 } else {
76526- fscache_stat(&fscache_n_object_created);
76527+ fscache_stat_unchecked(&fscache_n_object_created);
76528 }
76529
76530 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
76531@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
76532 fscache_stat_d(&fscache_n_cop_lookup_complete);
76533
76534 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
76535- fscache_stat(&fscache_n_object_avail);
76536+ fscache_stat_unchecked(&fscache_n_object_avail);
76537
76538 _leave("");
76539 return transit_to(JUMPSTART_DEPS);
76540@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
76541
76542 /* this just shifts the object release to the work processor */
76543 fscache_put_object(object);
76544- fscache_stat(&fscache_n_object_dead);
76545+ fscache_stat_unchecked(&fscache_n_object_dead);
76546
76547 _leave("");
76548 return transit_to(OBJECT_DEAD);
76549@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
76550 enum fscache_checkaux result;
76551
76552 if (!object->cookie->def->check_aux) {
76553- fscache_stat(&fscache_n_checkaux_none);
76554+ fscache_stat_unchecked(&fscache_n_checkaux_none);
76555 return FSCACHE_CHECKAUX_OKAY;
76556 }
76557
76558@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
76559 switch (result) {
76560 /* entry okay as is */
76561 case FSCACHE_CHECKAUX_OKAY:
76562- fscache_stat(&fscache_n_checkaux_okay);
76563+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
76564 break;
76565
76566 /* entry requires update */
76567 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
76568- fscache_stat(&fscache_n_checkaux_update);
76569+ fscache_stat_unchecked(&fscache_n_checkaux_update);
76570 break;
76571
76572 /* entry requires deletion */
76573 case FSCACHE_CHECKAUX_OBSOLETE:
76574- fscache_stat(&fscache_n_checkaux_obsolete);
76575+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
76576 break;
76577
76578 default:
76579@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
76580 {
76581 const struct fscache_state *s;
76582
76583- fscache_stat(&fscache_n_invalidates_run);
76584+ fscache_stat_unchecked(&fscache_n_invalidates_run);
76585 fscache_stat(&fscache_n_cop_invalidate_object);
76586 s = _fscache_invalidate_object(object, event);
76587 fscache_stat_d(&fscache_n_cop_invalidate_object);
76588@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
76589 {
76590 _enter("{OBJ%x},%d", object->debug_id, event);
76591
76592- fscache_stat(&fscache_n_updates_run);
76593+ fscache_stat_unchecked(&fscache_n_updates_run);
76594 fscache_stat(&fscache_n_cop_update_object);
76595 object->cache->ops->update_object(object);
76596 fscache_stat_d(&fscache_n_cop_update_object);
76597diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
76598index e7b87a0..a85d47a 100644
76599--- a/fs/fscache/operation.c
76600+++ b/fs/fscache/operation.c
76601@@ -17,7 +17,7 @@
76602 #include <linux/slab.h>
76603 #include "internal.h"
76604
76605-atomic_t fscache_op_debug_id;
76606+atomic_unchecked_t fscache_op_debug_id;
76607 EXPORT_SYMBOL(fscache_op_debug_id);
76608
76609 /**
76610@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
76611 ASSERTCMP(atomic_read(&op->usage), >, 0);
76612 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
76613
76614- fscache_stat(&fscache_n_op_enqueue);
76615+ fscache_stat_unchecked(&fscache_n_op_enqueue);
76616 switch (op->flags & FSCACHE_OP_TYPE) {
76617 case FSCACHE_OP_ASYNC:
76618 _debug("queue async");
76619@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
76620 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
76621 if (op->processor)
76622 fscache_enqueue_operation(op);
76623- fscache_stat(&fscache_n_op_run);
76624+ fscache_stat_unchecked(&fscache_n_op_run);
76625 }
76626
76627 /*
76628@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
76629 if (object->n_in_progress > 0) {
76630 atomic_inc(&op->usage);
76631 list_add_tail(&op->pend_link, &object->pending_ops);
76632- fscache_stat(&fscache_n_op_pend);
76633+ fscache_stat_unchecked(&fscache_n_op_pend);
76634 } else if (!list_empty(&object->pending_ops)) {
76635 atomic_inc(&op->usage);
76636 list_add_tail(&op->pend_link, &object->pending_ops);
76637- fscache_stat(&fscache_n_op_pend);
76638+ fscache_stat_unchecked(&fscache_n_op_pend);
76639 fscache_start_operations(object);
76640 } else {
76641 ASSERTCMP(object->n_in_progress, ==, 0);
76642@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
76643 object->n_exclusive++; /* reads and writes must wait */
76644 atomic_inc(&op->usage);
76645 list_add_tail(&op->pend_link, &object->pending_ops);
76646- fscache_stat(&fscache_n_op_pend);
76647+ fscache_stat_unchecked(&fscache_n_op_pend);
76648 ret = 0;
76649 } else {
76650 /* If we're in any other state, there must have been an I/O
76651@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
76652 if (object->n_exclusive > 0) {
76653 atomic_inc(&op->usage);
76654 list_add_tail(&op->pend_link, &object->pending_ops);
76655- fscache_stat(&fscache_n_op_pend);
76656+ fscache_stat_unchecked(&fscache_n_op_pend);
76657 } else if (!list_empty(&object->pending_ops)) {
76658 atomic_inc(&op->usage);
76659 list_add_tail(&op->pend_link, &object->pending_ops);
76660- fscache_stat(&fscache_n_op_pend);
76661+ fscache_stat_unchecked(&fscache_n_op_pend);
76662 fscache_start_operations(object);
76663 } else {
76664 ASSERTCMP(object->n_exclusive, ==, 0);
76665@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
76666 object->n_ops++;
76667 atomic_inc(&op->usage);
76668 list_add_tail(&op->pend_link, &object->pending_ops);
76669- fscache_stat(&fscache_n_op_pend);
76670+ fscache_stat_unchecked(&fscache_n_op_pend);
76671 ret = 0;
76672 } else if (fscache_object_is_dying(object)) {
76673- fscache_stat(&fscache_n_op_rejected);
76674+ fscache_stat_unchecked(&fscache_n_op_rejected);
76675 op->state = FSCACHE_OP_ST_CANCELLED;
76676 ret = -ENOBUFS;
76677 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
76678@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
76679 ret = -EBUSY;
76680 if (op->state == FSCACHE_OP_ST_PENDING) {
76681 ASSERT(!list_empty(&op->pend_link));
76682- fscache_stat(&fscache_n_op_cancelled);
76683+ fscache_stat_unchecked(&fscache_n_op_cancelled);
76684 list_del_init(&op->pend_link);
76685 if (do_cancel)
76686 do_cancel(op);
76687@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
76688 while (!list_empty(&object->pending_ops)) {
76689 op = list_entry(object->pending_ops.next,
76690 struct fscache_operation, pend_link);
76691- fscache_stat(&fscache_n_op_cancelled);
76692+ fscache_stat_unchecked(&fscache_n_op_cancelled);
76693 list_del_init(&op->pend_link);
76694
76695 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
76696@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
76697 op->state, ==, FSCACHE_OP_ST_CANCELLED);
76698 op->state = FSCACHE_OP_ST_DEAD;
76699
76700- fscache_stat(&fscache_n_op_release);
76701+ fscache_stat_unchecked(&fscache_n_op_release);
76702
76703 if (op->release) {
76704 op->release(op);
76705@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
76706 * lock, and defer it otherwise */
76707 if (!spin_trylock(&object->lock)) {
76708 _debug("defer put");
76709- fscache_stat(&fscache_n_op_deferred_release);
76710+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
76711
76712 cache = object->cache;
76713 spin_lock(&cache->op_gc_list_lock);
76714@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
76715
76716 _debug("GC DEFERRED REL OBJ%x OP%x",
76717 object->debug_id, op->debug_id);
76718- fscache_stat(&fscache_n_op_gc);
76719+ fscache_stat_unchecked(&fscache_n_op_gc);
76720
76721 ASSERTCMP(atomic_read(&op->usage), ==, 0);
76722 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
76723diff --git a/fs/fscache/page.c b/fs/fscache/page.c
76724index de33b3f..8be4d29 100644
76725--- a/fs/fscache/page.c
76726+++ b/fs/fscache/page.c
76727@@ -74,7 +74,7 @@ try_again:
76728 val = radix_tree_lookup(&cookie->stores, page->index);
76729 if (!val) {
76730 rcu_read_unlock();
76731- fscache_stat(&fscache_n_store_vmscan_not_storing);
76732+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
76733 __fscache_uncache_page(cookie, page);
76734 return true;
76735 }
76736@@ -104,11 +104,11 @@ try_again:
76737 spin_unlock(&cookie->stores_lock);
76738
76739 if (xpage) {
76740- fscache_stat(&fscache_n_store_vmscan_cancelled);
76741- fscache_stat(&fscache_n_store_radix_deletes);
76742+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
76743+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
76744 ASSERTCMP(xpage, ==, page);
76745 } else {
76746- fscache_stat(&fscache_n_store_vmscan_gone);
76747+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
76748 }
76749
76750 wake_up_bit(&cookie->flags, 0);
76751@@ -123,11 +123,11 @@ page_busy:
76752 * sleeping on memory allocation, so we may need to impose a timeout
76753 * too. */
76754 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
76755- fscache_stat(&fscache_n_store_vmscan_busy);
76756+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
76757 return false;
76758 }
76759
76760- fscache_stat(&fscache_n_store_vmscan_wait);
76761+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
76762 if (!release_page_wait_timeout(cookie, page))
76763 _debug("fscache writeout timeout page: %p{%lx}",
76764 page, page->index);
76765@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
76766 FSCACHE_COOKIE_STORING_TAG);
76767 if (!radix_tree_tag_get(&cookie->stores, page->index,
76768 FSCACHE_COOKIE_PENDING_TAG)) {
76769- fscache_stat(&fscache_n_store_radix_deletes);
76770+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
76771 xpage = radix_tree_delete(&cookie->stores, page->index);
76772 }
76773 spin_unlock(&cookie->stores_lock);
76774@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
76775
76776 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
76777
76778- fscache_stat(&fscache_n_attr_changed_calls);
76779+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
76780
76781 if (fscache_object_is_active(object)) {
76782 fscache_stat(&fscache_n_cop_attr_changed);
76783@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
76784
76785 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
76786
76787- fscache_stat(&fscache_n_attr_changed);
76788+ fscache_stat_unchecked(&fscache_n_attr_changed);
76789
76790 op = kzalloc(sizeof(*op), GFP_KERNEL);
76791 if (!op) {
76792- fscache_stat(&fscache_n_attr_changed_nomem);
76793+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
76794 _leave(" = -ENOMEM");
76795 return -ENOMEM;
76796 }
76797@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
76798 if (fscache_submit_exclusive_op(object, op) < 0)
76799 goto nobufs_dec;
76800 spin_unlock(&cookie->lock);
76801- fscache_stat(&fscache_n_attr_changed_ok);
76802+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
76803 fscache_put_operation(op);
76804 _leave(" = 0");
76805 return 0;
76806@@ -242,7 +242,7 @@ nobufs:
76807 kfree(op);
76808 if (wake_cookie)
76809 __fscache_wake_unused_cookie(cookie);
76810- fscache_stat(&fscache_n_attr_changed_nobufs);
76811+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
76812 _leave(" = %d", -ENOBUFS);
76813 return -ENOBUFS;
76814 }
76815@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
76816 /* allocate a retrieval operation and attempt to submit it */
76817 op = kzalloc(sizeof(*op), GFP_NOIO);
76818 if (!op) {
76819- fscache_stat(&fscache_n_retrievals_nomem);
76820+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
76821 return NULL;
76822 }
76823
76824@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
76825 return 0;
76826 }
76827
76828- fscache_stat(&fscache_n_retrievals_wait);
76829+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
76830
76831 jif = jiffies;
76832 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
76833 TASK_INTERRUPTIBLE) != 0) {
76834- fscache_stat(&fscache_n_retrievals_intr);
76835+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
76836 _leave(" = -ERESTARTSYS");
76837 return -ERESTARTSYS;
76838 }
76839@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
76840 */
76841 int fscache_wait_for_operation_activation(struct fscache_object *object,
76842 struct fscache_operation *op,
76843- atomic_t *stat_op_waits,
76844- atomic_t *stat_object_dead,
76845+ atomic_unchecked_t *stat_op_waits,
76846+ atomic_unchecked_t *stat_object_dead,
76847 void (*do_cancel)(struct fscache_operation *))
76848 {
76849 int ret;
76850@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
76851
76852 _debug(">>> WT");
76853 if (stat_op_waits)
76854- fscache_stat(stat_op_waits);
76855+ fscache_stat_unchecked(stat_op_waits);
76856 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
76857 TASK_INTERRUPTIBLE) != 0) {
76858 ret = fscache_cancel_op(op, do_cancel);
76859@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
76860 check_if_dead:
76861 if (op->state == FSCACHE_OP_ST_CANCELLED) {
76862 if (stat_object_dead)
76863- fscache_stat(stat_object_dead);
76864+ fscache_stat_unchecked(stat_object_dead);
76865 _leave(" = -ENOBUFS [cancelled]");
76866 return -ENOBUFS;
76867 }
76868@@ -381,7 +381,7 @@ check_if_dead:
76869 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
76870 fscache_cancel_op(op, do_cancel);
76871 if (stat_object_dead)
76872- fscache_stat(stat_object_dead);
76873+ fscache_stat_unchecked(stat_object_dead);
76874 return -ENOBUFS;
76875 }
76876 return 0;
76877@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
76878
76879 _enter("%p,%p,,,", cookie, page);
76880
76881- fscache_stat(&fscache_n_retrievals);
76882+ fscache_stat_unchecked(&fscache_n_retrievals);
76883
76884 if (hlist_empty(&cookie->backing_objects))
76885 goto nobufs;
76886@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
76887 goto nobufs_unlock_dec;
76888 spin_unlock(&cookie->lock);
76889
76890- fscache_stat(&fscache_n_retrieval_ops);
76891+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
76892
76893 /* pin the netfs read context in case we need to do the actual netfs
76894 * read because we've encountered a cache read failure */
76895@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
76896
76897 error:
76898 if (ret == -ENOMEM)
76899- fscache_stat(&fscache_n_retrievals_nomem);
76900+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
76901 else if (ret == -ERESTARTSYS)
76902- fscache_stat(&fscache_n_retrievals_intr);
76903+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
76904 else if (ret == -ENODATA)
76905- fscache_stat(&fscache_n_retrievals_nodata);
76906+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
76907 else if (ret < 0)
76908- fscache_stat(&fscache_n_retrievals_nobufs);
76909+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76910 else
76911- fscache_stat(&fscache_n_retrievals_ok);
76912+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
76913
76914 fscache_put_retrieval(op);
76915 _leave(" = %d", ret);
76916@@ -505,7 +505,7 @@ nobufs_unlock:
76917 __fscache_wake_unused_cookie(cookie);
76918 kfree(op);
76919 nobufs:
76920- fscache_stat(&fscache_n_retrievals_nobufs);
76921+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76922 _leave(" = -ENOBUFS");
76923 return -ENOBUFS;
76924 }
76925@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
76926
76927 _enter("%p,,%d,,,", cookie, *nr_pages);
76928
76929- fscache_stat(&fscache_n_retrievals);
76930+ fscache_stat_unchecked(&fscache_n_retrievals);
76931
76932 if (hlist_empty(&cookie->backing_objects))
76933 goto nobufs;
76934@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
76935 goto nobufs_unlock_dec;
76936 spin_unlock(&cookie->lock);
76937
76938- fscache_stat(&fscache_n_retrieval_ops);
76939+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
76940
76941 /* pin the netfs read context in case we need to do the actual netfs
76942 * read because we've encountered a cache read failure */
76943@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
76944
76945 error:
76946 if (ret == -ENOMEM)
76947- fscache_stat(&fscache_n_retrievals_nomem);
76948+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
76949 else if (ret == -ERESTARTSYS)
76950- fscache_stat(&fscache_n_retrievals_intr);
76951+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
76952 else if (ret == -ENODATA)
76953- fscache_stat(&fscache_n_retrievals_nodata);
76954+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
76955 else if (ret < 0)
76956- fscache_stat(&fscache_n_retrievals_nobufs);
76957+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76958 else
76959- fscache_stat(&fscache_n_retrievals_ok);
76960+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
76961
76962 fscache_put_retrieval(op);
76963 _leave(" = %d", ret);
76964@@ -636,7 +636,7 @@ nobufs_unlock:
76965 if (wake_cookie)
76966 __fscache_wake_unused_cookie(cookie);
76967 nobufs:
76968- fscache_stat(&fscache_n_retrievals_nobufs);
76969+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
76970 _leave(" = -ENOBUFS");
76971 return -ENOBUFS;
76972 }
76973@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
76974
76975 _enter("%p,%p,,,", cookie, page);
76976
76977- fscache_stat(&fscache_n_allocs);
76978+ fscache_stat_unchecked(&fscache_n_allocs);
76979
76980 if (hlist_empty(&cookie->backing_objects))
76981 goto nobufs;
76982@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
76983 goto nobufs_unlock_dec;
76984 spin_unlock(&cookie->lock);
76985
76986- fscache_stat(&fscache_n_alloc_ops);
76987+ fscache_stat_unchecked(&fscache_n_alloc_ops);
76988
76989 ret = fscache_wait_for_operation_activation(
76990 object, &op->op,
76991@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
76992
76993 error:
76994 if (ret == -ERESTARTSYS)
76995- fscache_stat(&fscache_n_allocs_intr);
76996+ fscache_stat_unchecked(&fscache_n_allocs_intr);
76997 else if (ret < 0)
76998- fscache_stat(&fscache_n_allocs_nobufs);
76999+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
77000 else
77001- fscache_stat(&fscache_n_allocs_ok);
77002+ fscache_stat_unchecked(&fscache_n_allocs_ok);
77003
77004 fscache_put_retrieval(op);
77005 _leave(" = %d", ret);
77006@@ -730,7 +730,7 @@ nobufs_unlock:
77007 if (wake_cookie)
77008 __fscache_wake_unused_cookie(cookie);
77009 nobufs:
77010- fscache_stat(&fscache_n_allocs_nobufs);
77011+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
77012 _leave(" = -ENOBUFS");
77013 return -ENOBUFS;
77014 }
77015@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
77016
77017 spin_lock(&cookie->stores_lock);
77018
77019- fscache_stat(&fscache_n_store_calls);
77020+ fscache_stat_unchecked(&fscache_n_store_calls);
77021
77022 /* find a page to store */
77023 page = NULL;
77024@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
77025 page = results[0];
77026 _debug("gang %d [%lx]", n, page->index);
77027 if (page->index > op->store_limit) {
77028- fscache_stat(&fscache_n_store_pages_over_limit);
77029+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
77030 goto superseded;
77031 }
77032
77033@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
77034 spin_unlock(&cookie->stores_lock);
77035 spin_unlock(&object->lock);
77036
77037- fscache_stat(&fscache_n_store_pages);
77038+ fscache_stat_unchecked(&fscache_n_store_pages);
77039 fscache_stat(&fscache_n_cop_write_page);
77040 ret = object->cache->ops->write_page(op, page);
77041 fscache_stat_d(&fscache_n_cop_write_page);
77042@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77043 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
77044 ASSERT(PageFsCache(page));
77045
77046- fscache_stat(&fscache_n_stores);
77047+ fscache_stat_unchecked(&fscache_n_stores);
77048
77049 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
77050 _leave(" = -ENOBUFS [invalidating]");
77051@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77052 spin_unlock(&cookie->stores_lock);
77053 spin_unlock(&object->lock);
77054
77055- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
77056+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
77057 op->store_limit = object->store_limit;
77058
77059 __fscache_use_cookie(cookie);
77060@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77061
77062 spin_unlock(&cookie->lock);
77063 radix_tree_preload_end();
77064- fscache_stat(&fscache_n_store_ops);
77065- fscache_stat(&fscache_n_stores_ok);
77066+ fscache_stat_unchecked(&fscache_n_store_ops);
77067+ fscache_stat_unchecked(&fscache_n_stores_ok);
77068
77069 /* the work queue now carries its own ref on the object */
77070 fscache_put_operation(&op->op);
77071@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
77072 return 0;
77073
77074 already_queued:
77075- fscache_stat(&fscache_n_stores_again);
77076+ fscache_stat_unchecked(&fscache_n_stores_again);
77077 already_pending:
77078 spin_unlock(&cookie->stores_lock);
77079 spin_unlock(&object->lock);
77080 spin_unlock(&cookie->lock);
77081 radix_tree_preload_end();
77082 kfree(op);
77083- fscache_stat(&fscache_n_stores_ok);
77084+ fscache_stat_unchecked(&fscache_n_stores_ok);
77085 _leave(" = 0");
77086 return 0;
77087
77088@@ -1039,14 +1039,14 @@ nobufs:
77089 kfree(op);
77090 if (wake_cookie)
77091 __fscache_wake_unused_cookie(cookie);
77092- fscache_stat(&fscache_n_stores_nobufs);
77093+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
77094 _leave(" = -ENOBUFS");
77095 return -ENOBUFS;
77096
77097 nomem_free:
77098 kfree(op);
77099 nomem:
77100- fscache_stat(&fscache_n_stores_oom);
77101+ fscache_stat_unchecked(&fscache_n_stores_oom);
77102 _leave(" = -ENOMEM");
77103 return -ENOMEM;
77104 }
77105@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
77106 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
77107 ASSERTCMP(page, !=, NULL);
77108
77109- fscache_stat(&fscache_n_uncaches);
77110+ fscache_stat_unchecked(&fscache_n_uncaches);
77111
77112 /* cache withdrawal may beat us to it */
77113 if (!PageFsCache(page))
77114@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
77115 struct fscache_cookie *cookie = op->op.object->cookie;
77116
77117 #ifdef CONFIG_FSCACHE_STATS
77118- atomic_inc(&fscache_n_marks);
77119+ atomic_inc_unchecked(&fscache_n_marks);
77120 #endif
77121
77122 _debug("- mark %p{%lx}", page, page->index);
77123diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
77124index 40d13c7..ddf52b9 100644
77125--- a/fs/fscache/stats.c
77126+++ b/fs/fscache/stats.c
77127@@ -18,99 +18,99 @@
77128 /*
77129 * operation counters
77130 */
77131-atomic_t fscache_n_op_pend;
77132-atomic_t fscache_n_op_run;
77133-atomic_t fscache_n_op_enqueue;
77134-atomic_t fscache_n_op_requeue;
77135-atomic_t fscache_n_op_deferred_release;
77136-atomic_t fscache_n_op_release;
77137-atomic_t fscache_n_op_gc;
77138-atomic_t fscache_n_op_cancelled;
77139-atomic_t fscache_n_op_rejected;
77140+atomic_unchecked_t fscache_n_op_pend;
77141+atomic_unchecked_t fscache_n_op_run;
77142+atomic_unchecked_t fscache_n_op_enqueue;
77143+atomic_unchecked_t fscache_n_op_requeue;
77144+atomic_unchecked_t fscache_n_op_deferred_release;
77145+atomic_unchecked_t fscache_n_op_release;
77146+atomic_unchecked_t fscache_n_op_gc;
77147+atomic_unchecked_t fscache_n_op_cancelled;
77148+atomic_unchecked_t fscache_n_op_rejected;
77149
77150-atomic_t fscache_n_attr_changed;
77151-atomic_t fscache_n_attr_changed_ok;
77152-atomic_t fscache_n_attr_changed_nobufs;
77153-atomic_t fscache_n_attr_changed_nomem;
77154-atomic_t fscache_n_attr_changed_calls;
77155+atomic_unchecked_t fscache_n_attr_changed;
77156+atomic_unchecked_t fscache_n_attr_changed_ok;
77157+atomic_unchecked_t fscache_n_attr_changed_nobufs;
77158+atomic_unchecked_t fscache_n_attr_changed_nomem;
77159+atomic_unchecked_t fscache_n_attr_changed_calls;
77160
77161-atomic_t fscache_n_allocs;
77162-atomic_t fscache_n_allocs_ok;
77163-atomic_t fscache_n_allocs_wait;
77164-atomic_t fscache_n_allocs_nobufs;
77165-atomic_t fscache_n_allocs_intr;
77166-atomic_t fscache_n_allocs_object_dead;
77167-atomic_t fscache_n_alloc_ops;
77168-atomic_t fscache_n_alloc_op_waits;
77169+atomic_unchecked_t fscache_n_allocs;
77170+atomic_unchecked_t fscache_n_allocs_ok;
77171+atomic_unchecked_t fscache_n_allocs_wait;
77172+atomic_unchecked_t fscache_n_allocs_nobufs;
77173+atomic_unchecked_t fscache_n_allocs_intr;
77174+atomic_unchecked_t fscache_n_allocs_object_dead;
77175+atomic_unchecked_t fscache_n_alloc_ops;
77176+atomic_unchecked_t fscache_n_alloc_op_waits;
77177
77178-atomic_t fscache_n_retrievals;
77179-atomic_t fscache_n_retrievals_ok;
77180-atomic_t fscache_n_retrievals_wait;
77181-atomic_t fscache_n_retrievals_nodata;
77182-atomic_t fscache_n_retrievals_nobufs;
77183-atomic_t fscache_n_retrievals_intr;
77184-atomic_t fscache_n_retrievals_nomem;
77185-atomic_t fscache_n_retrievals_object_dead;
77186-atomic_t fscache_n_retrieval_ops;
77187-atomic_t fscache_n_retrieval_op_waits;
77188+atomic_unchecked_t fscache_n_retrievals;
77189+atomic_unchecked_t fscache_n_retrievals_ok;
77190+atomic_unchecked_t fscache_n_retrievals_wait;
77191+atomic_unchecked_t fscache_n_retrievals_nodata;
77192+atomic_unchecked_t fscache_n_retrievals_nobufs;
77193+atomic_unchecked_t fscache_n_retrievals_intr;
77194+atomic_unchecked_t fscache_n_retrievals_nomem;
77195+atomic_unchecked_t fscache_n_retrievals_object_dead;
77196+atomic_unchecked_t fscache_n_retrieval_ops;
77197+atomic_unchecked_t fscache_n_retrieval_op_waits;
77198
77199-atomic_t fscache_n_stores;
77200-atomic_t fscache_n_stores_ok;
77201-atomic_t fscache_n_stores_again;
77202-atomic_t fscache_n_stores_nobufs;
77203-atomic_t fscache_n_stores_oom;
77204-atomic_t fscache_n_store_ops;
77205-atomic_t fscache_n_store_calls;
77206-atomic_t fscache_n_store_pages;
77207-atomic_t fscache_n_store_radix_deletes;
77208-atomic_t fscache_n_store_pages_over_limit;
77209+atomic_unchecked_t fscache_n_stores;
77210+atomic_unchecked_t fscache_n_stores_ok;
77211+atomic_unchecked_t fscache_n_stores_again;
77212+atomic_unchecked_t fscache_n_stores_nobufs;
77213+atomic_unchecked_t fscache_n_stores_oom;
77214+atomic_unchecked_t fscache_n_store_ops;
77215+atomic_unchecked_t fscache_n_store_calls;
77216+atomic_unchecked_t fscache_n_store_pages;
77217+atomic_unchecked_t fscache_n_store_radix_deletes;
77218+atomic_unchecked_t fscache_n_store_pages_over_limit;
77219
77220-atomic_t fscache_n_store_vmscan_not_storing;
77221-atomic_t fscache_n_store_vmscan_gone;
77222-atomic_t fscache_n_store_vmscan_busy;
77223-atomic_t fscache_n_store_vmscan_cancelled;
77224-atomic_t fscache_n_store_vmscan_wait;
77225+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
77226+atomic_unchecked_t fscache_n_store_vmscan_gone;
77227+atomic_unchecked_t fscache_n_store_vmscan_busy;
77228+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
77229+atomic_unchecked_t fscache_n_store_vmscan_wait;
77230
77231-atomic_t fscache_n_marks;
77232-atomic_t fscache_n_uncaches;
77233+atomic_unchecked_t fscache_n_marks;
77234+atomic_unchecked_t fscache_n_uncaches;
77235
77236-atomic_t fscache_n_acquires;
77237-atomic_t fscache_n_acquires_null;
77238-atomic_t fscache_n_acquires_no_cache;
77239-atomic_t fscache_n_acquires_ok;
77240-atomic_t fscache_n_acquires_nobufs;
77241-atomic_t fscache_n_acquires_oom;
77242+atomic_unchecked_t fscache_n_acquires;
77243+atomic_unchecked_t fscache_n_acquires_null;
77244+atomic_unchecked_t fscache_n_acquires_no_cache;
77245+atomic_unchecked_t fscache_n_acquires_ok;
77246+atomic_unchecked_t fscache_n_acquires_nobufs;
77247+atomic_unchecked_t fscache_n_acquires_oom;
77248
77249-atomic_t fscache_n_invalidates;
77250-atomic_t fscache_n_invalidates_run;
77251+atomic_unchecked_t fscache_n_invalidates;
77252+atomic_unchecked_t fscache_n_invalidates_run;
77253
77254-atomic_t fscache_n_updates;
77255-atomic_t fscache_n_updates_null;
77256-atomic_t fscache_n_updates_run;
77257+atomic_unchecked_t fscache_n_updates;
77258+atomic_unchecked_t fscache_n_updates_null;
77259+atomic_unchecked_t fscache_n_updates_run;
77260
77261-atomic_t fscache_n_relinquishes;
77262-atomic_t fscache_n_relinquishes_null;
77263-atomic_t fscache_n_relinquishes_waitcrt;
77264-atomic_t fscache_n_relinquishes_retire;
77265+atomic_unchecked_t fscache_n_relinquishes;
77266+atomic_unchecked_t fscache_n_relinquishes_null;
77267+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
77268+atomic_unchecked_t fscache_n_relinquishes_retire;
77269
77270-atomic_t fscache_n_cookie_index;
77271-atomic_t fscache_n_cookie_data;
77272-atomic_t fscache_n_cookie_special;
77273+atomic_unchecked_t fscache_n_cookie_index;
77274+atomic_unchecked_t fscache_n_cookie_data;
77275+atomic_unchecked_t fscache_n_cookie_special;
77276
77277-atomic_t fscache_n_object_alloc;
77278-atomic_t fscache_n_object_no_alloc;
77279-atomic_t fscache_n_object_lookups;
77280-atomic_t fscache_n_object_lookups_negative;
77281-atomic_t fscache_n_object_lookups_positive;
77282-atomic_t fscache_n_object_lookups_timed_out;
77283-atomic_t fscache_n_object_created;
77284-atomic_t fscache_n_object_avail;
77285-atomic_t fscache_n_object_dead;
77286+atomic_unchecked_t fscache_n_object_alloc;
77287+atomic_unchecked_t fscache_n_object_no_alloc;
77288+atomic_unchecked_t fscache_n_object_lookups;
77289+atomic_unchecked_t fscache_n_object_lookups_negative;
77290+atomic_unchecked_t fscache_n_object_lookups_positive;
77291+atomic_unchecked_t fscache_n_object_lookups_timed_out;
77292+atomic_unchecked_t fscache_n_object_created;
77293+atomic_unchecked_t fscache_n_object_avail;
77294+atomic_unchecked_t fscache_n_object_dead;
77295
77296-atomic_t fscache_n_checkaux_none;
77297-atomic_t fscache_n_checkaux_okay;
77298-atomic_t fscache_n_checkaux_update;
77299-atomic_t fscache_n_checkaux_obsolete;
77300+atomic_unchecked_t fscache_n_checkaux_none;
77301+atomic_unchecked_t fscache_n_checkaux_okay;
77302+atomic_unchecked_t fscache_n_checkaux_update;
77303+atomic_unchecked_t fscache_n_checkaux_obsolete;
77304
77305 atomic_t fscache_n_cop_alloc_object;
77306 atomic_t fscache_n_cop_lookup_object;
77307@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
77308 seq_puts(m, "FS-Cache statistics\n");
77309
77310 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
77311- atomic_read(&fscache_n_cookie_index),
77312- atomic_read(&fscache_n_cookie_data),
77313- atomic_read(&fscache_n_cookie_special));
77314+ atomic_read_unchecked(&fscache_n_cookie_index),
77315+ atomic_read_unchecked(&fscache_n_cookie_data),
77316+ atomic_read_unchecked(&fscache_n_cookie_special));
77317
77318 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
77319- atomic_read(&fscache_n_object_alloc),
77320- atomic_read(&fscache_n_object_no_alloc),
77321- atomic_read(&fscache_n_object_avail),
77322- atomic_read(&fscache_n_object_dead));
77323+ atomic_read_unchecked(&fscache_n_object_alloc),
77324+ atomic_read_unchecked(&fscache_n_object_no_alloc),
77325+ atomic_read_unchecked(&fscache_n_object_avail),
77326+ atomic_read_unchecked(&fscache_n_object_dead));
77327 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
77328- atomic_read(&fscache_n_checkaux_none),
77329- atomic_read(&fscache_n_checkaux_okay),
77330- atomic_read(&fscache_n_checkaux_update),
77331- atomic_read(&fscache_n_checkaux_obsolete));
77332+ atomic_read_unchecked(&fscache_n_checkaux_none),
77333+ atomic_read_unchecked(&fscache_n_checkaux_okay),
77334+ atomic_read_unchecked(&fscache_n_checkaux_update),
77335+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
77336
77337 seq_printf(m, "Pages : mrk=%u unc=%u\n",
77338- atomic_read(&fscache_n_marks),
77339- atomic_read(&fscache_n_uncaches));
77340+ atomic_read_unchecked(&fscache_n_marks),
77341+ atomic_read_unchecked(&fscache_n_uncaches));
77342
77343 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
77344 " oom=%u\n",
77345- atomic_read(&fscache_n_acquires),
77346- atomic_read(&fscache_n_acquires_null),
77347- atomic_read(&fscache_n_acquires_no_cache),
77348- atomic_read(&fscache_n_acquires_ok),
77349- atomic_read(&fscache_n_acquires_nobufs),
77350- atomic_read(&fscache_n_acquires_oom));
77351+ atomic_read_unchecked(&fscache_n_acquires),
77352+ atomic_read_unchecked(&fscache_n_acquires_null),
77353+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
77354+ atomic_read_unchecked(&fscache_n_acquires_ok),
77355+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
77356+ atomic_read_unchecked(&fscache_n_acquires_oom));
77357
77358 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
77359- atomic_read(&fscache_n_object_lookups),
77360- atomic_read(&fscache_n_object_lookups_negative),
77361- atomic_read(&fscache_n_object_lookups_positive),
77362- atomic_read(&fscache_n_object_created),
77363- atomic_read(&fscache_n_object_lookups_timed_out));
77364+ atomic_read_unchecked(&fscache_n_object_lookups),
77365+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
77366+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
77367+ atomic_read_unchecked(&fscache_n_object_created),
77368+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
77369
77370 seq_printf(m, "Invals : n=%u run=%u\n",
77371- atomic_read(&fscache_n_invalidates),
77372- atomic_read(&fscache_n_invalidates_run));
77373+ atomic_read_unchecked(&fscache_n_invalidates),
77374+ atomic_read_unchecked(&fscache_n_invalidates_run));
77375
77376 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
77377- atomic_read(&fscache_n_updates),
77378- atomic_read(&fscache_n_updates_null),
77379- atomic_read(&fscache_n_updates_run));
77380+ atomic_read_unchecked(&fscache_n_updates),
77381+ atomic_read_unchecked(&fscache_n_updates_null),
77382+ atomic_read_unchecked(&fscache_n_updates_run));
77383
77384 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
77385- atomic_read(&fscache_n_relinquishes),
77386- atomic_read(&fscache_n_relinquishes_null),
77387- atomic_read(&fscache_n_relinquishes_waitcrt),
77388- atomic_read(&fscache_n_relinquishes_retire));
77389+ atomic_read_unchecked(&fscache_n_relinquishes),
77390+ atomic_read_unchecked(&fscache_n_relinquishes_null),
77391+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
77392+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
77393
77394 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
77395- atomic_read(&fscache_n_attr_changed),
77396- atomic_read(&fscache_n_attr_changed_ok),
77397- atomic_read(&fscache_n_attr_changed_nobufs),
77398- atomic_read(&fscache_n_attr_changed_nomem),
77399- atomic_read(&fscache_n_attr_changed_calls));
77400+ atomic_read_unchecked(&fscache_n_attr_changed),
77401+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
77402+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
77403+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
77404+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
77405
77406 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
77407- atomic_read(&fscache_n_allocs),
77408- atomic_read(&fscache_n_allocs_ok),
77409- atomic_read(&fscache_n_allocs_wait),
77410- atomic_read(&fscache_n_allocs_nobufs),
77411- atomic_read(&fscache_n_allocs_intr));
77412+ atomic_read_unchecked(&fscache_n_allocs),
77413+ atomic_read_unchecked(&fscache_n_allocs_ok),
77414+ atomic_read_unchecked(&fscache_n_allocs_wait),
77415+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
77416+ atomic_read_unchecked(&fscache_n_allocs_intr));
77417 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
77418- atomic_read(&fscache_n_alloc_ops),
77419- atomic_read(&fscache_n_alloc_op_waits),
77420- atomic_read(&fscache_n_allocs_object_dead));
77421+ atomic_read_unchecked(&fscache_n_alloc_ops),
77422+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
77423+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
77424
77425 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
77426 " int=%u oom=%u\n",
77427- atomic_read(&fscache_n_retrievals),
77428- atomic_read(&fscache_n_retrievals_ok),
77429- atomic_read(&fscache_n_retrievals_wait),
77430- atomic_read(&fscache_n_retrievals_nodata),
77431- atomic_read(&fscache_n_retrievals_nobufs),
77432- atomic_read(&fscache_n_retrievals_intr),
77433- atomic_read(&fscache_n_retrievals_nomem));
77434+ atomic_read_unchecked(&fscache_n_retrievals),
77435+ atomic_read_unchecked(&fscache_n_retrievals_ok),
77436+ atomic_read_unchecked(&fscache_n_retrievals_wait),
77437+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
77438+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
77439+ atomic_read_unchecked(&fscache_n_retrievals_intr),
77440+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
77441 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
77442- atomic_read(&fscache_n_retrieval_ops),
77443- atomic_read(&fscache_n_retrieval_op_waits),
77444- atomic_read(&fscache_n_retrievals_object_dead));
77445+ atomic_read_unchecked(&fscache_n_retrieval_ops),
77446+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
77447+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
77448
77449 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
77450- atomic_read(&fscache_n_stores),
77451- atomic_read(&fscache_n_stores_ok),
77452- atomic_read(&fscache_n_stores_again),
77453- atomic_read(&fscache_n_stores_nobufs),
77454- atomic_read(&fscache_n_stores_oom));
77455+ atomic_read_unchecked(&fscache_n_stores),
77456+ atomic_read_unchecked(&fscache_n_stores_ok),
77457+ atomic_read_unchecked(&fscache_n_stores_again),
77458+ atomic_read_unchecked(&fscache_n_stores_nobufs),
77459+ atomic_read_unchecked(&fscache_n_stores_oom));
77460 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
77461- atomic_read(&fscache_n_store_ops),
77462- atomic_read(&fscache_n_store_calls),
77463- atomic_read(&fscache_n_store_pages),
77464- atomic_read(&fscache_n_store_radix_deletes),
77465- atomic_read(&fscache_n_store_pages_over_limit));
77466+ atomic_read_unchecked(&fscache_n_store_ops),
77467+ atomic_read_unchecked(&fscache_n_store_calls),
77468+ atomic_read_unchecked(&fscache_n_store_pages),
77469+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
77470+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
77471
77472 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
77473- atomic_read(&fscache_n_store_vmscan_not_storing),
77474- atomic_read(&fscache_n_store_vmscan_gone),
77475- atomic_read(&fscache_n_store_vmscan_busy),
77476- atomic_read(&fscache_n_store_vmscan_cancelled),
77477- atomic_read(&fscache_n_store_vmscan_wait));
77478+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
77479+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
77480+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
77481+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
77482+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
77483
77484 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
77485- atomic_read(&fscache_n_op_pend),
77486- atomic_read(&fscache_n_op_run),
77487- atomic_read(&fscache_n_op_enqueue),
77488- atomic_read(&fscache_n_op_cancelled),
77489- atomic_read(&fscache_n_op_rejected));
77490+ atomic_read_unchecked(&fscache_n_op_pend),
77491+ atomic_read_unchecked(&fscache_n_op_run),
77492+ atomic_read_unchecked(&fscache_n_op_enqueue),
77493+ atomic_read_unchecked(&fscache_n_op_cancelled),
77494+ atomic_read_unchecked(&fscache_n_op_rejected));
77495 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
77496- atomic_read(&fscache_n_op_deferred_release),
77497- atomic_read(&fscache_n_op_release),
77498- atomic_read(&fscache_n_op_gc));
77499+ atomic_read_unchecked(&fscache_n_op_deferred_release),
77500+ atomic_read_unchecked(&fscache_n_op_release),
77501+ atomic_read_unchecked(&fscache_n_op_gc));
77502
77503 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
77504 atomic_read(&fscache_n_cop_alloc_object),
77505diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
77506index e5bbf74..9bfdaf3 100644
77507--- a/fs/fuse/cuse.c
77508+++ b/fs/fuse/cuse.c
77509@@ -602,10 +602,12 @@ static int __init cuse_init(void)
77510 INIT_LIST_HEAD(&cuse_conntbl[i]);
77511
77512 /* inherit and extend fuse_dev_operations */
77513- cuse_channel_fops = fuse_dev_operations;
77514- cuse_channel_fops.owner = THIS_MODULE;
77515- cuse_channel_fops.open = cuse_channel_open;
77516- cuse_channel_fops.release = cuse_channel_release;
77517+ pax_open_kernel();
77518+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
77519+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
77520+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
77521+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
77522+ pax_close_kernel();
77523
77524 cuse_class = class_create(THIS_MODULE, "cuse");
77525 if (IS_ERR(cuse_class))
77526diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
77527index c8b68ab..97190db 100644
77528--- a/fs/fuse/dev.c
77529+++ b/fs/fuse/dev.c
77530@@ -1398,7 +1398,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
77531 ret = 0;
77532 pipe_lock(pipe);
77533
77534- if (!pipe->readers) {
77535+ if (!atomic_read(&pipe->readers)) {
77536 send_sig(SIGPIPE, current, 0);
77537 if (!ret)
77538 ret = -EPIPE;
77539@@ -1427,7 +1427,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
77540 page_nr++;
77541 ret += buf->len;
77542
77543- if (pipe->files)
77544+ if (atomic_read(&pipe->files))
77545 do_wakeup = 1;
77546 }
77547
77548diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
77549index 0572bca..cb9c3fa 100644
77550--- a/fs/fuse/dir.c
77551+++ b/fs/fuse/dir.c
77552@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
77553 return link;
77554 }
77555
77556-static void free_link(char *link)
77557+static void free_link(const char *link)
77558 {
77559 if (!IS_ERR(link))
77560 free_page((unsigned long) link);
77561diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
77562index 0fa8062..755b198 100644
77563--- a/fs/gfs2/glock.c
77564+++ b/fs/gfs2/glock.c
77565@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
77566 if (held1 != held2) {
77567 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
77568 if (held2)
77569- gl->gl_lockref.count++;
77570+ __lockref_inc(&gl->gl_lockref);
77571 else
77572- gl->gl_lockref.count--;
77573+ __lockref_dec(&gl->gl_lockref);
77574 }
77575 if (held1 && held2 && list_empty(&gl->gl_holders))
77576 clear_bit(GLF_QUEUED, &gl->gl_flags);
77577@@ -614,9 +614,9 @@ out:
77578 out_sched:
77579 clear_bit(GLF_LOCK, &gl->gl_flags);
77580 smp_mb__after_atomic();
77581- gl->gl_lockref.count++;
77582+ __lockref_inc(&gl->gl_lockref);
77583 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77584- gl->gl_lockref.count--;
77585+ __lockref_dec(&gl->gl_lockref);
77586 return;
77587
77588 out_unlock:
77589@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
77590 gl->gl_sbd = sdp;
77591 gl->gl_flags = 0;
77592 gl->gl_name = name;
77593- gl->gl_lockref.count = 1;
77594+ __lockref_set(&gl->gl_lockref, 1);
77595 gl->gl_state = LM_ST_UNLOCKED;
77596 gl->gl_target = LM_ST_UNLOCKED;
77597 gl->gl_demote_state = LM_ST_EXCLUSIVE;
77598@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
77599 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
77600 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
77601 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
77602- gl->gl_lockref.count++;
77603+ __lockref_inc(&gl->gl_lockref);
77604 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77605- gl->gl_lockref.count--;
77606+ __lockref_dec(&gl->gl_lockref);
77607 }
77608 run_queue(gl, 1);
77609 spin_unlock(&gl->gl_spin);
77610@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
77611 }
77612 }
77613
77614- gl->gl_lockref.count++;
77615+ __lockref_inc(&gl->gl_lockref);
77616 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
77617 spin_unlock(&gl->gl_spin);
77618
77619@@ -1384,12 +1384,12 @@ add_back_to_lru:
77620 goto add_back_to_lru;
77621 }
77622 clear_bit(GLF_LRU, &gl->gl_flags);
77623- gl->gl_lockref.count++;
77624+ __lockref_inc(&gl->gl_lockref);
77625 if (demote_ok(gl))
77626 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
77627 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
77628 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
77629- gl->gl_lockref.count--;
77630+ __lockref_dec(&gl->gl_lockref);
77631 spin_unlock(&gl->gl_spin);
77632 cond_resched_lock(&lru_lock);
77633 }
77634@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
77635 state2str(gl->gl_demote_state), dtime,
77636 atomic_read(&gl->gl_ail_count),
77637 atomic_read(&gl->gl_revokes),
77638- (int)gl->gl_lockref.count, gl->gl_hold_time);
77639+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
77640
77641 list_for_each_entry(gh, &gl->gl_holders, gh_list)
77642 dump_holder(seq, gh);
77643diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
77644index fe91951..ce38a6e 100644
77645--- a/fs/gfs2/glops.c
77646+++ b/fs/gfs2/glops.c
77647@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
77648
77649 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
77650 gl->gl_state == LM_ST_SHARED && ip) {
77651- gl->gl_lockref.count++;
77652+ __lockref_inc(&gl->gl_lockref);
77653 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
77654- gl->gl_lockref.count--;
77655+ __lockref_dec(&gl->gl_lockref);
77656 }
77657 }
77658
77659diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
77660index e3065cb..45e7117 100644
77661--- a/fs/gfs2/quota.c
77662+++ b/fs/gfs2/quota.c
77663@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
77664 if (!spin_trylock(&qd->qd_lockref.lock))
77665 return LRU_SKIP;
77666
77667- if (qd->qd_lockref.count == 0) {
77668+ if (__lockref_read(&qd->qd_lockref) == 0) {
77669 lockref_mark_dead(&qd->qd_lockref);
77670 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
77671 }
77672@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
77673 return NULL;
77674
77675 qd->qd_sbd = sdp;
77676- qd->qd_lockref.count = 1;
77677+ __lockref_set(&qd->qd_lockref, 1);
77678 spin_lock_init(&qd->qd_lockref.lock);
77679 qd->qd_id = qid;
77680 qd->qd_slot = -1;
77681@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
77682 if (lockref_put_or_lock(&qd->qd_lockref))
77683 return;
77684
77685- qd->qd_lockref.count = 0;
77686+ __lockref_set(&qd->qd_lockref, 0);
77687 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
77688 spin_unlock(&qd->qd_lockref.lock);
77689
77690diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
77691index 07d8d8f..2c2a4e7 100644
77692--- a/fs/hostfs/hostfs_kern.c
77693+++ b/fs/hostfs/hostfs_kern.c
77694@@ -918,7 +918,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
77695
77696 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
77697 {
77698- char *s = nd_get_link(nd);
77699+ const char *s = nd_get_link(nd);
77700 if (!IS_ERR(s))
77701 __putname(s);
77702 }
77703diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
77704index 87724c1..5a5e53f 100644
77705--- a/fs/hugetlbfs/inode.c
77706+++ b/fs/hugetlbfs/inode.c
77707@@ -151,6 +151,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
77708 struct mm_struct *mm = current->mm;
77709 struct vm_area_struct *vma;
77710 struct hstate *h = hstate_file(file);
77711+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
77712 struct vm_unmapped_area_info info;
77713
77714 if (len & ~huge_page_mask(h))
77715@@ -164,17 +165,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
77716 return addr;
77717 }
77718
77719+#ifdef CONFIG_PAX_RANDMMAP
77720+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
77721+#endif
77722+
77723 if (addr) {
77724 addr = ALIGN(addr, huge_page_size(h));
77725 vma = find_vma(mm, addr);
77726- if (TASK_SIZE - len >= addr &&
77727- (!vma || addr + len <= vma->vm_start))
77728+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
77729 return addr;
77730 }
77731
77732 info.flags = 0;
77733 info.length = len;
77734 info.low_limit = TASK_UNMAPPED_BASE;
77735+
77736+#ifdef CONFIG_PAX_RANDMMAP
77737+ if (mm->pax_flags & MF_PAX_RANDMMAP)
77738+ info.low_limit += mm->delta_mmap;
77739+#endif
77740+
77741 info.high_limit = TASK_SIZE;
77742 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
77743 info.align_offset = 0;
77744@@ -939,7 +949,7 @@ static struct file_system_type hugetlbfs_fs_type = {
77745 };
77746 MODULE_ALIAS_FS("hugetlbfs");
77747
77748-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77749+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
77750
77751 static int can_do_hugetlb_shm(void)
77752 {
77753diff --git a/fs/inode.c b/fs/inode.c
77754index 6e342ca..0538cb7 100644
77755--- a/fs/inode.c
77756+++ b/fs/inode.c
77757@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
77758 unsigned int *p = &get_cpu_var(last_ino);
77759 unsigned int res = *p;
77760
77761+start:
77762+
77763 #ifdef CONFIG_SMP
77764 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
77765- static atomic_t shared_last_ino;
77766- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
77767+ static atomic_unchecked_t shared_last_ino;
77768+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
77769
77770 res = next - LAST_INO_BATCH;
77771 }
77772 #endif
77773
77774- *p = ++res;
77775+ if (unlikely(!++res))
77776+ goto start; /* never zero */
77777+ *p = res;
77778 put_cpu_var(last_ino);
77779 return res;
77780 }
77781diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
77782index 4a6cf28..d3a29d3 100644
77783--- a/fs/jffs2/erase.c
77784+++ b/fs/jffs2/erase.c
77785@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
77786 struct jffs2_unknown_node marker = {
77787 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
77788 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
77789- .totlen = cpu_to_je32(c->cleanmarker_size)
77790+ .totlen = cpu_to_je32(c->cleanmarker_size),
77791+ .hdr_crc = cpu_to_je32(0)
77792 };
77793
77794 jffs2_prealloc_raw_node_refs(c, jeb, 1);
77795diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
77796index 09ed551..45684f8 100644
77797--- a/fs/jffs2/wbuf.c
77798+++ b/fs/jffs2/wbuf.c
77799@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
77800 {
77801 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
77802 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
77803- .totlen = constant_cpu_to_je32(8)
77804+ .totlen = constant_cpu_to_je32(8),
77805+ .hdr_crc = constant_cpu_to_je32(0)
77806 };
77807
77808 /*
77809diff --git a/fs/jfs/super.c b/fs/jfs/super.c
77810index 4cd9798..8dfe86a 100644
77811--- a/fs/jfs/super.c
77812+++ b/fs/jfs/super.c
77813@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
77814
77815 jfs_inode_cachep =
77816 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
77817- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
77818+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
77819 init_once);
77820 if (jfs_inode_cachep == NULL)
77821 return -ENOMEM;
77822diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
77823index 2d48d28..82eddad 100644
77824--- a/fs/kernfs/dir.c
77825+++ b/fs/kernfs/dir.c
77826@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
77827 *
77828 * Returns 31 bit hash of ns + name (so it fits in an off_t )
77829 */
77830-static unsigned int kernfs_name_hash(const char *name, const void *ns)
77831+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
77832 {
77833 unsigned long hash = init_name_hash();
77834 unsigned int len = strlen(name);
77835@@ -873,6 +873,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
77836 ret = scops->mkdir(parent, dentry->d_name.name, mode);
77837
77838 kernfs_put_active(parent);
77839+
77840+ if (!ret) {
77841+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
77842+ ret = PTR_ERR_OR_ZERO(dentry_ret);
77843+ }
77844+
77845 return ret;
77846 }
77847
77848diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
77849index 2bacb99..f745182 100644
77850--- a/fs/kernfs/file.c
77851+++ b/fs/kernfs/file.c
77852@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
77853
77854 struct kernfs_open_node {
77855 atomic_t refcnt;
77856- atomic_t event;
77857+ atomic_unchecked_t event;
77858 wait_queue_head_t poll;
77859 struct list_head files; /* goes through kernfs_open_file.list */
77860 };
77861@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
77862 {
77863 struct kernfs_open_file *of = sf->private;
77864
77865- of->event = atomic_read(&of->kn->attr.open->event);
77866+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
77867
77868 return of->kn->attr.ops->seq_show(sf, v);
77869 }
77870@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
77871 goto out_free;
77872 }
77873
77874- of->event = atomic_read(&of->kn->attr.open->event);
77875+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
77876 ops = kernfs_ops(of->kn);
77877 if (ops->read)
77878 len = ops->read(of, buf, len, *ppos);
77879@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
77880 {
77881 struct kernfs_open_file *of = kernfs_of(file);
77882 const struct kernfs_ops *ops;
77883- size_t len;
77884+ ssize_t len;
77885 char *buf;
77886
77887 if (of->atomic_write_len) {
77888@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
77889 return ret;
77890 }
77891
77892-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
77893- void *buf, int len, int write)
77894+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
77895+ void *buf, size_t len, int write)
77896 {
77897 struct file *file = vma->vm_file;
77898 struct kernfs_open_file *of = kernfs_of(file);
77899- int ret;
77900+ ssize_t ret;
77901
77902 if (!of->vm_ops)
77903 return -EINVAL;
77904@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
77905 return -ENOMEM;
77906
77907 atomic_set(&new_on->refcnt, 0);
77908- atomic_set(&new_on->event, 1);
77909+ atomic_set_unchecked(&new_on->event, 1);
77910 init_waitqueue_head(&new_on->poll);
77911 INIT_LIST_HEAD(&new_on->files);
77912 goto retry;
77913@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
77914
77915 kernfs_put_active(kn);
77916
77917- if (of->event != atomic_read(&on->event))
77918+ if (of->event != atomic_read_unchecked(&on->event))
77919 goto trigger;
77920
77921 return DEFAULT_POLLMASK;
77922@@ -824,7 +824,7 @@ repeat:
77923
77924 on = kn->attr.open;
77925 if (on) {
77926- atomic_inc(&on->event);
77927+ atomic_inc_unchecked(&on->event);
77928 wake_up_interruptible(&on->poll);
77929 }
77930
77931diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
77932index 8a19889..4c3069a 100644
77933--- a/fs/kernfs/symlink.c
77934+++ b/fs/kernfs/symlink.c
77935@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
77936 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
77937 void *cookie)
77938 {
77939- char *page = nd_get_link(nd);
77940+ const char *page = nd_get_link(nd);
77941 if (!IS_ERR(page))
77942 free_page((unsigned long)page);
77943 }
77944diff --git a/fs/libfs.c b/fs/libfs.c
77945index 0281359..24971ac 100644
77946--- a/fs/libfs.c
77947+++ b/fs/libfs.c
77948@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
77949
77950 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
77951 struct dentry *next = list_entry(p, struct dentry, d_child);
77952+ char d_name[sizeof(next->d_iname)];
77953+ const unsigned char *name;
77954+
77955 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
77956 if (!simple_positive(next)) {
77957 spin_unlock(&next->d_lock);
77958@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
77959
77960 spin_unlock(&next->d_lock);
77961 spin_unlock(&dentry->d_lock);
77962- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
77963+ name = next->d_name.name;
77964+ if (name == next->d_iname) {
77965+ memcpy(d_name, name, next->d_name.len);
77966+ name = d_name;
77967+ }
77968+ if (!dir_emit(ctx, name, next->d_name.len,
77969 d_inode(next)->i_ino, dt_type(d_inode(next))))
77970 return 0;
77971 spin_lock(&dentry->d_lock);
77972@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
77973 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
77974 void *cookie)
77975 {
77976- char *s = nd_get_link(nd);
77977+ const char *s = nd_get_link(nd);
77978 if (!IS_ERR(s))
77979 kfree(s);
77980 }
77981diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
77982index acd3947..1f896e2 100644
77983--- a/fs/lockd/clntproc.c
77984+++ b/fs/lockd/clntproc.c
77985@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
77986 /*
77987 * Cookie counter for NLM requests
77988 */
77989-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
77990+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
77991
77992 void nlmclnt_next_cookie(struct nlm_cookie *c)
77993 {
77994- u32 cookie = atomic_inc_return(&nlm_cookie);
77995+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
77996
77997 memcpy(c->data, &cookie, 4);
77998 c->len=4;
77999diff --git a/fs/mount.h b/fs/mount.h
78000index 6a61c2b..bd79179 100644
78001--- a/fs/mount.h
78002+++ b/fs/mount.h
78003@@ -13,7 +13,7 @@ struct mnt_namespace {
78004 u64 seq; /* Sequence number to prevent loops */
78005 wait_queue_head_t poll;
78006 u64 event;
78007-};
78008+} __randomize_layout;
78009
78010 struct mnt_pcp {
78011 int mnt_count;
78012@@ -65,7 +65,7 @@ struct mount {
78013 struct hlist_head mnt_pins;
78014 struct fs_pin mnt_umount;
78015 struct dentry *mnt_ex_mountpoint;
78016-};
78017+} __randomize_layout;
78018
78019 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
78020
78021diff --git a/fs/namei.c b/fs/namei.c
78022index fe30d3b..57656a7 100644
78023--- a/fs/namei.c
78024+++ b/fs/namei.c
78025@@ -336,17 +336,32 @@ int generic_permission(struct inode *inode, int mask)
78026 if (ret != -EACCES)
78027 return ret;
78028
78029+#ifdef CONFIG_GRKERNSEC
78030+ /* we'll block if we have to log due to a denied capability use */
78031+ if (mask & MAY_NOT_BLOCK)
78032+ return -ECHILD;
78033+#endif
78034+
78035 if (S_ISDIR(inode->i_mode)) {
78036 /* DACs are overridable for directories */
78037- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
78038- return 0;
78039 if (!(mask & MAY_WRITE))
78040- if (capable_wrt_inode_uidgid(inode,
78041- CAP_DAC_READ_SEARCH))
78042+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
78043+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
78044 return 0;
78045+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
78046+ return 0;
78047 return -EACCES;
78048 }
78049 /*
78050+ * Searching includes executable on directories, else just read.
78051+ */
78052+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
78053+ if (mask == MAY_READ)
78054+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
78055+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
78056+ return 0;
78057+
78058+ /*
78059 * Read/write DACs are always overridable.
78060 * Executable DACs are overridable when there is
78061 * at least one exec bit set.
78062@@ -355,14 +370,6 @@ int generic_permission(struct inode *inode, int mask)
78063 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
78064 return 0;
78065
78066- /*
78067- * Searching includes executable on directories, else just read.
78068- */
78069- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
78070- if (mask == MAY_READ)
78071- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
78072- return 0;
78073-
78074 return -EACCES;
78075 }
78076 EXPORT_SYMBOL(generic_permission);
78077@@ -502,7 +509,7 @@ struct nameidata {
78078 int last_type;
78079 unsigned depth;
78080 struct file *base;
78081- char *saved_names[MAX_NESTED_LINKS + 1];
78082+ const char *saved_names[MAX_NESTED_LINKS + 1];
78083 };
78084
78085 /*
78086@@ -713,13 +720,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
78087 nd->flags |= LOOKUP_JUMPED;
78088 }
78089
78090-void nd_set_link(struct nameidata *nd, char *path)
78091+void nd_set_link(struct nameidata *nd, const char *path)
78092 {
78093 nd->saved_names[nd->depth] = path;
78094 }
78095 EXPORT_SYMBOL(nd_set_link);
78096
78097-char *nd_get_link(struct nameidata *nd)
78098+const char *nd_get_link(const struct nameidata *nd)
78099 {
78100 return nd->saved_names[nd->depth];
78101 }
78102@@ -766,7 +773,7 @@ static inline int may_follow_link(struct path *link, struct nameidata *nd)
78103 return 0;
78104
78105 /* Allowed if parent directory not sticky and world-writable. */
78106- parent = nd->path.dentry->d_inode;
78107+ parent = nd->inode;
78108 if ((parent->i_mode & (S_ISVTX|S_IWOTH)) != (S_ISVTX|S_IWOTH))
78109 return 0;
78110
78111@@ -854,7 +861,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
78112 {
78113 struct dentry *dentry = link->dentry;
78114 int error;
78115- char *s;
78116+ const char *s;
78117
78118 BUG_ON(nd->flags & LOOKUP_RCU);
78119
78120@@ -875,6 +882,11 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
78121 if (error)
78122 goto out_put_nd_path;
78123
78124+ if (gr_handle_follow_link(dentry, nd->path.mnt)) {
78125+ error = -EACCES;
78126+ goto out_put_nd_path;
78127+ }
78128+
78129 nd->last_type = LAST_BIND;
78130 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
78131 error = PTR_ERR(*p);
78132@@ -1647,6 +1659,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
78133 if (res)
78134 break;
78135 res = walk_component(nd, path, LOOKUP_FOLLOW);
78136+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
78137+ res = -EACCES;
78138 put_link(nd, &link, cookie);
78139 } while (res > 0);
78140
78141@@ -1719,7 +1733,7 @@ EXPORT_SYMBOL(full_name_hash);
78142 static inline u64 hash_name(const char *name)
78143 {
78144 unsigned long a, b, adata, bdata, mask, hash, len;
78145- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
78146+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
78147
78148 hash = a = 0;
78149 len = -sizeof(unsigned long);
78150@@ -2015,6 +2029,8 @@ static int path_lookupat(int dfd, const struct filename *name,
78151 if (err)
78152 break;
78153 err = lookup_last(nd, &path);
78154+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
78155+ err = -EACCES;
78156 put_link(nd, &link, cookie);
78157 }
78158 }
78159@@ -2022,6 +2038,13 @@ static int path_lookupat(int dfd, const struct filename *name,
78160 if (!err)
78161 err = complete_walk(nd);
78162
78163+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
78164+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
78165+ path_put(&nd->path);
78166+ err = -ENOENT;
78167+ }
78168+ }
78169+
78170 if (!err && nd->flags & LOOKUP_DIRECTORY) {
78171 if (!d_can_lookup(nd->path.dentry)) {
78172 path_put(&nd->path);
78173@@ -2042,8 +2065,15 @@ static int filename_lookup(int dfd, struct filename *name,
78174 if (unlikely(retval == -ESTALE))
78175 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
78176
78177- if (likely(!retval))
78178+ if (likely(!retval)) {
78179 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
78180+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
78181+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
78182+ path_put(&nd->path);
78183+ return -ENOENT;
78184+ }
78185+ }
78186+ }
78187 return retval;
78188 }
78189
78190@@ -2621,6 +2651,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
78191 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
78192 return -EPERM;
78193
78194+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
78195+ return -EPERM;
78196+ if (gr_handle_rawio(inode))
78197+ return -EPERM;
78198+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
78199+ return -EACCES;
78200+
78201 return 0;
78202 }
78203
78204@@ -2852,7 +2889,7 @@ looked_up:
78205 * cleared otherwise prior to returning.
78206 */
78207 static int lookup_open(struct nameidata *nd, struct path *path,
78208- struct file *file,
78209+ struct path *link, struct file *file,
78210 const struct open_flags *op,
78211 bool got_write, int *opened)
78212 {
78213@@ -2887,6 +2924,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
78214 /* Negative dentry, just create the file */
78215 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
78216 umode_t mode = op->mode;
78217+
78218+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
78219+ error = -EACCES;
78220+ goto out_dput;
78221+ }
78222+
78223+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
78224+ error = -EACCES;
78225+ goto out_dput;
78226+ }
78227+
78228 if (!IS_POSIXACL(dir->d_inode))
78229 mode &= ~current_umask();
78230 /*
78231@@ -2908,6 +2956,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
78232 nd->flags & LOOKUP_EXCL);
78233 if (error)
78234 goto out_dput;
78235+ else
78236+ gr_handle_create(dentry, nd->path.mnt);
78237 }
78238 out_no_open:
78239 path->dentry = dentry;
78240@@ -2922,7 +2972,7 @@ out_dput:
78241 /*
78242 * Handle the last step of open()
78243 */
78244-static int do_last(struct nameidata *nd, struct path *path,
78245+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
78246 struct file *file, const struct open_flags *op,
78247 int *opened, struct filename *name)
78248 {
78249@@ -2972,6 +3022,15 @@ static int do_last(struct nameidata *nd, struct path *path,
78250 if (error)
78251 return error;
78252
78253+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
78254+ error = -ENOENT;
78255+ goto out;
78256+ }
78257+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
78258+ error = -EACCES;
78259+ goto out;
78260+ }
78261+
78262 audit_inode(name, dir, LOOKUP_PARENT);
78263 error = -EISDIR;
78264 /* trailing slashes? */
78265@@ -2991,7 +3050,7 @@ retry_lookup:
78266 */
78267 }
78268 mutex_lock(&dir->d_inode->i_mutex);
78269- error = lookup_open(nd, path, file, op, got_write, opened);
78270+ error = lookup_open(nd, path, link, file, op, got_write, opened);
78271 mutex_unlock(&dir->d_inode->i_mutex);
78272
78273 if (error <= 0) {
78274@@ -3015,11 +3074,28 @@ retry_lookup:
78275 goto finish_open_created;
78276 }
78277
78278+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
78279+ error = -ENOENT;
78280+ goto exit_dput;
78281+ }
78282+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
78283+ error = -EACCES;
78284+ goto exit_dput;
78285+ }
78286+
78287 /*
78288 * create/update audit record if it already exists.
78289 */
78290- if (d_is_positive(path->dentry))
78291+ if (d_is_positive(path->dentry)) {
78292+ /* only check if O_CREAT is specified, all other checks need to go
78293+ into may_open */
78294+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
78295+ error = -EACCES;
78296+ goto exit_dput;
78297+ }
78298+
78299 audit_inode(name, path->dentry, 0);
78300+ }
78301
78302 /*
78303 * If atomic_open() acquired write access it is dropped now due to
78304@@ -3060,6 +3136,11 @@ finish_lookup:
78305 }
78306 }
78307 BUG_ON(inode != path->dentry->d_inode);
78308+ /* if we're resolving a symlink to another symlink */
78309+ if (link && gr_handle_symlink_owner(link, inode)) {
78310+ error = -EACCES;
78311+ goto out;
78312+ }
78313 return 1;
78314 }
78315
78316@@ -3079,7 +3160,18 @@ finish_open:
78317 path_put(&save_parent);
78318 return error;
78319 }
78320+
78321+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
78322+ error = -ENOENT;
78323+ goto out;
78324+ }
78325+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
78326+ error = -EACCES;
78327+ goto out;
78328+ }
78329+
78330 audit_inode(name, nd->path.dentry, 0);
78331+
78332 error = -EISDIR;
78333 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
78334 goto out;
78335@@ -3240,7 +3332,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
78336 if (unlikely(error))
78337 goto out;
78338
78339- error = do_last(nd, &path, file, op, &opened, pathname);
78340+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
78341 while (unlikely(error > 0)) { /* trailing symlink */
78342 struct path link = path;
78343 void *cookie;
78344@@ -3258,7 +3350,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
78345 error = follow_link(&link, nd, &cookie);
78346 if (unlikely(error))
78347 break;
78348- error = do_last(nd, &path, file, op, &opened, pathname);
78349+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
78350 put_link(nd, &link, cookie);
78351 }
78352 out:
78353@@ -3361,9 +3453,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
78354 goto unlock;
78355
78356 error = -EEXIST;
78357- if (d_is_positive(dentry))
78358+ if (d_is_positive(dentry)) {
78359+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
78360+ error = -ENOENT;
78361 goto fail;
78362-
78363+ }
78364 /*
78365 * Special case - lookup gave negative, but... we had foo/bar/
78366 * From the vfs_mknod() POV we just have a negative dentry -
78367@@ -3428,6 +3522,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
78368 }
78369 EXPORT_SYMBOL(user_path_create);
78370
78371+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
78372+{
78373+ struct filename *tmp = getname(pathname);
78374+ struct dentry *res;
78375+ if (IS_ERR(tmp))
78376+ return ERR_CAST(tmp);
78377+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
78378+ if (IS_ERR(res))
78379+ putname(tmp);
78380+ else
78381+ *to = tmp;
78382+ return res;
78383+}
78384+
78385 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
78386 {
78387 int error = may_create(dir, dentry);
78388@@ -3491,6 +3599,17 @@ retry:
78389
78390 if (!IS_POSIXACL(path.dentry->d_inode))
78391 mode &= ~current_umask();
78392+
78393+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
78394+ error = -EPERM;
78395+ goto out;
78396+ }
78397+
78398+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
78399+ error = -EACCES;
78400+ goto out;
78401+ }
78402+
78403 error = security_path_mknod(&path, dentry, mode, dev);
78404 if (error)
78405 goto out;
78406@@ -3506,6 +3625,8 @@ retry:
78407 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
78408 break;
78409 }
78410+ if (!error)
78411+ gr_handle_create(dentry, path.mnt);
78412 out:
78413 done_path_create(&path, dentry);
78414 if (retry_estale(error, lookup_flags)) {
78415@@ -3560,9 +3681,16 @@ retry:
78416
78417 if (!IS_POSIXACL(path.dentry->d_inode))
78418 mode &= ~current_umask();
78419+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
78420+ error = -EACCES;
78421+ goto out;
78422+ }
78423 error = security_path_mkdir(&path, dentry, mode);
78424 if (!error)
78425 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
78426+ if (!error)
78427+ gr_handle_create(dentry, path.mnt);
78428+out:
78429 done_path_create(&path, dentry);
78430 if (retry_estale(error, lookup_flags)) {
78431 lookup_flags |= LOOKUP_REVAL;
78432@@ -3595,7 +3723,7 @@ void dentry_unhash(struct dentry *dentry)
78433 {
78434 shrink_dcache_parent(dentry);
78435 spin_lock(&dentry->d_lock);
78436- if (dentry->d_lockref.count == 1)
78437+ if (__lockref_read(&dentry->d_lockref) == 1)
78438 __d_drop(dentry);
78439 spin_unlock(&dentry->d_lock);
78440 }
78441@@ -3646,6 +3774,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
78442 struct filename *name;
78443 struct dentry *dentry;
78444 struct nameidata nd;
78445+ u64 saved_ino = 0;
78446+ dev_t saved_dev = 0;
78447 unsigned int lookup_flags = 0;
78448 retry:
78449 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
78450@@ -3678,10 +3808,21 @@ retry:
78451 error = -ENOENT;
78452 goto exit3;
78453 }
78454+
78455+ saved_ino = gr_get_ino_from_dentry(dentry);
78456+ saved_dev = gr_get_dev_from_dentry(dentry);
78457+
78458+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
78459+ error = -EACCES;
78460+ goto exit3;
78461+ }
78462+
78463 error = security_path_rmdir(&nd.path, dentry);
78464 if (error)
78465 goto exit3;
78466 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
78467+ if (!error && (saved_dev || saved_ino))
78468+ gr_handle_delete(saved_ino, saved_dev);
78469 exit3:
78470 dput(dentry);
78471 exit2:
78472@@ -3774,6 +3915,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
78473 struct nameidata nd;
78474 struct inode *inode = NULL;
78475 struct inode *delegated_inode = NULL;
78476+ u64 saved_ino = 0;
78477+ dev_t saved_dev = 0;
78478 unsigned int lookup_flags = 0;
78479 retry:
78480 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
78481@@ -3800,10 +3943,22 @@ retry_deleg:
78482 if (d_is_negative(dentry))
78483 goto slashes;
78484 ihold(inode);
78485+
78486+ if (inode->i_nlink <= 1) {
78487+ saved_ino = gr_get_ino_from_dentry(dentry);
78488+ saved_dev = gr_get_dev_from_dentry(dentry);
78489+ }
78490+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
78491+ error = -EACCES;
78492+ goto exit2;
78493+ }
78494+
78495 error = security_path_unlink(&nd.path, dentry);
78496 if (error)
78497 goto exit2;
78498 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
78499+ if (!error && (saved_ino || saved_dev))
78500+ gr_handle_delete(saved_ino, saved_dev);
78501 exit2:
78502 dput(dentry);
78503 }
78504@@ -3892,9 +4047,17 @@ retry:
78505 if (IS_ERR(dentry))
78506 goto out_putname;
78507
78508+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
78509+ error = -EACCES;
78510+ goto out;
78511+ }
78512+
78513 error = security_path_symlink(&path, dentry, from->name);
78514 if (!error)
78515 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
78516+ if (!error)
78517+ gr_handle_create(dentry, path.mnt);
78518+out:
78519 done_path_create(&path, dentry);
78520 if (retry_estale(error, lookup_flags)) {
78521 lookup_flags |= LOOKUP_REVAL;
78522@@ -3998,6 +4161,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
78523 struct dentry *new_dentry;
78524 struct path old_path, new_path;
78525 struct inode *delegated_inode = NULL;
78526+ struct filename *to = NULL;
78527 int how = 0;
78528 int error;
78529
78530@@ -4021,7 +4185,7 @@ retry:
78531 if (error)
78532 return error;
78533
78534- new_dentry = user_path_create(newdfd, newname, &new_path,
78535+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
78536 (how & LOOKUP_REVAL));
78537 error = PTR_ERR(new_dentry);
78538 if (IS_ERR(new_dentry))
78539@@ -4033,11 +4197,26 @@ retry:
78540 error = may_linkat(&old_path);
78541 if (unlikely(error))
78542 goto out_dput;
78543+
78544+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt, to)) {
78545+ error = -EACCES;
78546+ goto out_dput;
78547+ }
78548+
78549+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
78550+ old_path.dentry, old_path.mnt, to)) {
78551+ error = -EACCES;
78552+ goto out_dput;
78553+ }
78554+
78555 error = security_path_link(old_path.dentry, &new_path, new_dentry);
78556 if (error)
78557 goto out_dput;
78558 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
78559+ if (!error)
78560+ gr_handle_create(new_dentry, new_path.mnt);
78561 out_dput:
78562+ putname(to);
78563 done_path_create(&new_path, new_dentry);
78564 if (delegated_inode) {
78565 error = break_deleg_wait(&delegated_inode);
78566@@ -4353,6 +4532,20 @@ retry_deleg:
78567 if (new_dentry == trap)
78568 goto exit5;
78569
78570+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
78571+ /* use EXDEV error to cause 'mv' to switch to an alternative
78572+ * method for usability
78573+ */
78574+ error = -EXDEV;
78575+ goto exit5;
78576+ }
78577+
78578+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
78579+ old_dentry, d_backing_inode(old_dir), oldnd.path.mnt,
78580+ to, flags);
78581+ if (error)
78582+ goto exit5;
78583+
78584 error = security_path_rename(&oldnd.path, old_dentry,
78585 &newnd.path, new_dentry, flags);
78586 if (error)
78587@@ -4360,6 +4553,9 @@ retry_deleg:
78588 error = vfs_rename(old_dir->d_inode, old_dentry,
78589 new_dir->d_inode, new_dentry,
78590 &delegated_inode, flags);
78591+ if (!error)
78592+ gr_handle_rename(d_backing_inode(old_dir), d_backing_inode(new_dir), old_dentry,
78593+ new_dentry, oldnd.path.mnt, d_is_positive(new_dentry) ? 1 : 0, flags);
78594 exit5:
78595 dput(new_dentry);
78596 exit4:
78597@@ -4416,14 +4612,24 @@ EXPORT_SYMBOL(vfs_whiteout);
78598
78599 int readlink_copy(char __user *buffer, int buflen, const char *link)
78600 {
78601+ char tmpbuf[64];
78602+ const char *newlink;
78603 int len = PTR_ERR(link);
78604+
78605 if (IS_ERR(link))
78606 goto out;
78607
78608 len = strlen(link);
78609 if (len > (unsigned) buflen)
78610 len = buflen;
78611- if (copy_to_user(buffer, link, len))
78612+
78613+ if (len < sizeof(tmpbuf)) {
78614+ memcpy(tmpbuf, link, len);
78615+ newlink = tmpbuf;
78616+ } else
78617+ newlink = link;
78618+
78619+ if (copy_to_user(buffer, newlink, len))
78620 len = -EFAULT;
78621 out:
78622 return len;
78623diff --git a/fs/namespace.c b/fs/namespace.c
78624index fce3cc1..ac3626c 100644
78625--- a/fs/namespace.c
78626+++ b/fs/namespace.c
78627@@ -1505,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
78628 if (!(sb->s_flags & MS_RDONLY))
78629 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
78630 up_write(&sb->s_umount);
78631+
78632+ gr_log_remount(mnt->mnt_devname, retval);
78633+
78634 return retval;
78635 }
78636
78637@@ -1527,6 +1530,9 @@ static int do_umount(struct mount *mnt, int flags)
78638 }
78639 unlock_mount_hash();
78640 namespace_unlock();
78641+
78642+ gr_log_unmount(mnt->mnt_devname, retval);
78643+
78644 return retval;
78645 }
78646
78647@@ -1581,7 +1587,7 @@ static inline bool may_mount(void)
78648 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
78649 */
78650
78651-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
78652+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
78653 {
78654 struct path path;
78655 struct mount *mnt;
78656@@ -1626,7 +1632,7 @@ out:
78657 /*
78658 * The 2.0 compatible umount. No flags.
78659 */
78660-SYSCALL_DEFINE1(oldumount, char __user *, name)
78661+SYSCALL_DEFINE1(oldumount, const char __user *, name)
78662 {
78663 return sys_umount(name, 0);
78664 }
78665@@ -2701,6 +2707,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
78666 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
78667 MS_STRICTATIME);
78668
78669+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
78670+ retval = -EPERM;
78671+ goto dput_out;
78672+ }
78673+
78674+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
78675+ retval = -EPERM;
78676+ goto dput_out;
78677+ }
78678+
78679 if (flags & MS_REMOUNT)
78680 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
78681 data_page);
78682@@ -2714,7 +2730,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
78683 retval = do_new_mount(&path, type_page, flags, mnt_flags,
78684 dev_name, data_page);
78685 dput_out:
78686+ gr_log_mount(dev_name, &path, retval);
78687+
78688 path_put(&path);
78689+
78690 return retval;
78691 }
78692
78693@@ -2732,7 +2751,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
78694 * number incrementing at 10Ghz will take 12,427 years to wrap which
78695 * is effectively never, so we can ignore the possibility.
78696 */
78697-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
78698+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
78699
78700 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78701 {
78702@@ -2748,7 +2767,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78703 return ERR_PTR(ret);
78704 }
78705 new_ns->ns.ops = &mntns_operations;
78706- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
78707+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
78708 atomic_set(&new_ns->count, 1);
78709 new_ns->root = NULL;
78710 INIT_LIST_HEAD(&new_ns->list);
78711@@ -2758,7 +2777,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
78712 return new_ns;
78713 }
78714
78715-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
78716+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
78717 struct user_namespace *user_ns, struct fs_struct *new_fs)
78718 {
78719 struct mnt_namespace *new_ns;
78720@@ -2879,8 +2898,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
78721 }
78722 EXPORT_SYMBOL(mount_subtree);
78723
78724-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
78725- char __user *, type, unsigned long, flags, void __user *, data)
78726+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
78727+ const char __user *, type, unsigned long, flags, void __user *, data)
78728 {
78729 int ret;
78730 char *kernel_type;
78731@@ -2986,6 +3005,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
78732 if (error)
78733 goto out2;
78734
78735+ if (gr_handle_chroot_pivot()) {
78736+ error = -EPERM;
78737+ goto out2;
78738+ }
78739+
78740 get_fs_root(current->fs, &root);
78741 old_mp = lock_mount(&old);
78742 error = PTR_ERR(old_mp);
78743@@ -3287,7 +3311,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
78744 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
78745 return -EPERM;
78746
78747- if (fs->users != 1)
78748+ if (atomic_read(&fs->users) != 1)
78749 return -EINVAL;
78750
78751 get_mnt_ns(mnt_ns);
78752diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
78753index 19ca95c..b28702c 100644
78754--- a/fs/nfs/callback_xdr.c
78755+++ b/fs/nfs/callback_xdr.c
78756@@ -51,7 +51,7 @@ struct callback_op {
78757 callback_decode_arg_t decode_args;
78758 callback_encode_res_t encode_res;
78759 long res_maxsize;
78760-};
78761+} __do_const;
78762
78763 static struct callback_op callback_ops[];
78764
78765diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
78766index 5d25b9d..765fc0f 100644
78767--- a/fs/nfs/inode.c
78768+++ b/fs/nfs/inode.c
78769@@ -1277,16 +1277,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
78770 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
78771 }
78772
78773-static atomic_long_t nfs_attr_generation_counter;
78774+static atomic_long_unchecked_t nfs_attr_generation_counter;
78775
78776 static unsigned long nfs_read_attr_generation_counter(void)
78777 {
78778- return atomic_long_read(&nfs_attr_generation_counter);
78779+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
78780 }
78781
78782 unsigned long nfs_inc_attr_generation_counter(void)
78783 {
78784- return atomic_long_inc_return(&nfs_attr_generation_counter);
78785+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
78786 }
78787 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
78788
78789diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
78790index 9e6475b..7970138 100644
78791--- a/fs/nfs/internal.h
78792+++ b/fs/nfs/internal.h
78793@@ -296,6 +296,22 @@ extern struct rpc_procinfo nfs4_procedures[];
78794
78795 #ifdef CONFIG_NFS_V4_SECURITY_LABEL
78796 extern struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags);
78797+static inline struct nfs4_label *
78798+nfs4_label_copy(struct nfs4_label *dst, struct nfs4_label *src)
78799+{
78800+ if (!dst || !src)
78801+ return NULL;
78802+
78803+ if (src->len > NFS4_MAXLABELLEN)
78804+ return NULL;
78805+
78806+ dst->lfs = src->lfs;
78807+ dst->pi = src->pi;
78808+ dst->len = src->len;
78809+ memcpy(dst->label, src->label, src->len);
78810+
78811+ return dst;
78812+}
78813 static inline void nfs4_label_free(struct nfs4_label *label)
78814 {
78815 if (label) {
78816@@ -316,6 +332,11 @@ static inline void nfs4_label_free(void *label) {}
78817 static inline void nfs_zap_label_cache_locked(struct nfs_inode *nfsi)
78818 {
78819 }
78820+static inline struct nfs4_label *
78821+nfs4_label_copy(struct nfs4_label *dst, struct nfs4_label *src)
78822+{
78823+ return NULL;
78824+}
78825 #endif /* CONFIG_NFS_V4_SECURITY_LABEL */
78826
78827 /* proc.c */
78828diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
78829index d3f2051..dd338dc 100644
78830--- a/fs/nfs/nfs4proc.c
78831+++ b/fs/nfs/nfs4proc.c
78832@@ -916,6 +916,7 @@ struct nfs4_opendata {
78833 struct nfs_open_confirmres c_res;
78834 struct nfs4_string owner_name;
78835 struct nfs4_string group_name;
78836+ struct nfs4_label *a_label;
78837 struct nfs_fattr f_attr;
78838 struct nfs4_label *f_label;
78839 struct dentry *dir;
78840@@ -1019,6 +1020,10 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
78841 if (IS_ERR(p->f_label))
78842 goto err_free_p;
78843
78844+ p->a_label = nfs4_label_alloc(server, gfp_mask);
78845+ if (IS_ERR(p->a_label))
78846+ goto err_free_f;
78847+
78848 alloc_seqid = server->nfs_client->cl_mvops->alloc_seqid;
78849 p->o_arg.seqid = alloc_seqid(&sp->so_seqid, gfp_mask);
78850 if (IS_ERR(p->o_arg.seqid))
78851@@ -1047,7 +1052,7 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
78852 p->o_arg.server = server;
78853 p->o_arg.bitmask = nfs4_bitmask(server, label);
78854 p->o_arg.open_bitmap = &nfs4_fattr_bitmap[0];
78855- p->o_arg.label = label;
78856+ p->o_arg.label = nfs4_label_copy(p->a_label, label);
78857 p->o_arg.claim = nfs4_map_atomic_open_claim(server, claim);
78858 switch (p->o_arg.claim) {
78859 case NFS4_OPEN_CLAIM_NULL:
78860@@ -1080,6 +1085,8 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
78861 return p;
78862
78863 err_free_label:
78864+ nfs4_label_free(p->a_label);
78865+err_free_f:
78866 nfs4_label_free(p->f_label);
78867 err_free_p:
78868 kfree(p);
78869@@ -1099,6 +1106,7 @@ static void nfs4_opendata_free(struct kref *kref)
78870 nfs4_put_open_state(p->state);
78871 nfs4_put_state_owner(p->owner);
78872
78873+ nfs4_label_free(p->a_label);
78874 nfs4_label_free(p->f_label);
78875
78876 dput(p->dir);
78877diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
78878index 864e200..357c255 100644
78879--- a/fs/nfsd/nfs4proc.c
78880+++ b/fs/nfsd/nfs4proc.c
78881@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
78882 nfsd4op_rsize op_rsize_bop;
78883 stateid_getter op_get_currentstateid;
78884 stateid_setter op_set_currentstateid;
78885-};
78886+} __do_const;
78887
78888 static struct nfsd4_operation nfsd4_ops[];
78889
78890diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
78891index d4d8445..36ae1a1 100644
78892--- a/fs/nfsd/nfs4xdr.c
78893+++ b/fs/nfsd/nfs4xdr.c
78894@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
78895
78896 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
78897
78898-static nfsd4_dec nfsd4_dec_ops[] = {
78899+static const nfsd4_dec nfsd4_dec_ops[] = {
78900 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
78901 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
78902 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
78903diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
78904index 46ec934..f384e41 100644
78905--- a/fs/nfsd/nfscache.c
78906+++ b/fs/nfsd/nfscache.c
78907@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
78908 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
78909 u32 hash;
78910 struct nfsd_drc_bucket *b;
78911- int len;
78912+ long len;
78913 size_t bufsize = 0;
78914
78915 if (!rp)
78916@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
78917 hash = nfsd_cache_hash(rp->c_xid);
78918 b = &drc_hashtbl[hash];
78919
78920- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
78921- len >>= 2;
78922+ if (statp) {
78923+ len = (char*)statp - (char*)resv->iov_base;
78924+ len = resv->iov_len - len;
78925+ len >>= 2;
78926+ }
78927
78928 /* Don't cache excessive amounts of data and XDR failures */
78929- if (!statp || len > (256 >> 2)) {
78930+ if (!statp || len > (256 >> 2) || len < 0) {
78931 nfsd_reply_cache_free(b, rp);
78932 return;
78933 }
78934@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
78935 switch (cachetype) {
78936 case RC_REPLSTAT:
78937 if (len != 1)
78938- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
78939+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
78940 rp->c_replstat = *statp;
78941 break;
78942 case RC_REPLBUFF:
78943diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
78944index 84d770b..929bc5e 100644
78945--- a/fs/nfsd/vfs.c
78946+++ b/fs/nfsd/vfs.c
78947@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
78948
78949 oldfs = get_fs();
78950 set_fs(KERNEL_DS);
78951- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
78952+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
78953 set_fs(oldfs);
78954 return nfsd_finish_read(file, count, host_err);
78955 }
78956@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
78957
78958 /* Write the data. */
78959 oldfs = get_fs(); set_fs(KERNEL_DS);
78960- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
78961+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
78962 set_fs(oldfs);
78963 if (host_err < 0)
78964 goto out_nfserr;
78965@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
78966 */
78967
78968 oldfs = get_fs(); set_fs(KERNEL_DS);
78969- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
78970+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
78971 set_fs(oldfs);
78972
78973 if (host_err < 0)
78974diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
78975index 52ccd34..7a6b202 100644
78976--- a/fs/nls/nls_base.c
78977+++ b/fs/nls/nls_base.c
78978@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
78979
78980 int __register_nls(struct nls_table *nls, struct module *owner)
78981 {
78982- struct nls_table ** tmp = &tables;
78983+ struct nls_table *tmp = tables;
78984
78985 if (nls->next)
78986 return -EBUSY;
78987
78988- nls->owner = owner;
78989+ pax_open_kernel();
78990+ *(void **)&nls->owner = owner;
78991+ pax_close_kernel();
78992 spin_lock(&nls_lock);
78993- while (*tmp) {
78994- if (nls == *tmp) {
78995+ while (tmp) {
78996+ if (nls == tmp) {
78997 spin_unlock(&nls_lock);
78998 return -EBUSY;
78999 }
79000- tmp = &(*tmp)->next;
79001+ tmp = tmp->next;
79002 }
79003- nls->next = tables;
79004+ pax_open_kernel();
79005+ *(struct nls_table **)&nls->next = tables;
79006+ pax_close_kernel();
79007 tables = nls;
79008 spin_unlock(&nls_lock);
79009 return 0;
79010@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
79011
79012 int unregister_nls(struct nls_table * nls)
79013 {
79014- struct nls_table ** tmp = &tables;
79015+ struct nls_table * const * tmp = &tables;
79016
79017 spin_lock(&nls_lock);
79018 while (*tmp) {
79019 if (nls == *tmp) {
79020- *tmp = nls->next;
79021+ pax_open_kernel();
79022+ *(struct nls_table **)tmp = nls->next;
79023+ pax_close_kernel();
79024 spin_unlock(&nls_lock);
79025 return 0;
79026 }
79027@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
79028 return -EINVAL;
79029 }
79030
79031-static struct nls_table *find_nls(char *charset)
79032+static struct nls_table *find_nls(const char *charset)
79033 {
79034 struct nls_table *nls;
79035 spin_lock(&nls_lock);
79036@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
79037 return nls;
79038 }
79039
79040-struct nls_table *load_nls(char *charset)
79041+struct nls_table *load_nls(const char *charset)
79042 {
79043 return try_then_request_module(find_nls(charset), "nls_%s", charset);
79044 }
79045diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
79046index 162b3f1..6076a7c 100644
79047--- a/fs/nls/nls_euc-jp.c
79048+++ b/fs/nls/nls_euc-jp.c
79049@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
79050 p_nls = load_nls("cp932");
79051
79052 if (p_nls) {
79053- table.charset2upper = p_nls->charset2upper;
79054- table.charset2lower = p_nls->charset2lower;
79055+ pax_open_kernel();
79056+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
79057+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
79058+ pax_close_kernel();
79059 return register_nls(&table);
79060 }
79061
79062diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
79063index a80a741..7b96e1b 100644
79064--- a/fs/nls/nls_koi8-ru.c
79065+++ b/fs/nls/nls_koi8-ru.c
79066@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
79067 p_nls = load_nls("koi8-u");
79068
79069 if (p_nls) {
79070- table.charset2upper = p_nls->charset2upper;
79071- table.charset2lower = p_nls->charset2lower;
79072+ pax_open_kernel();
79073+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
79074+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
79075+ pax_close_kernel();
79076 return register_nls(&table);
79077 }
79078
79079diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
79080index cf27550..6c70f29d 100644
79081--- a/fs/notify/fanotify/fanotify_user.c
79082+++ b/fs/notify/fanotify/fanotify_user.c
79083@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
79084
79085 fd = fanotify_event_metadata.fd;
79086 ret = -EFAULT;
79087- if (copy_to_user(buf, &fanotify_event_metadata,
79088- fanotify_event_metadata.event_len))
79089+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
79090+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
79091 goto out_close_fd;
79092
79093 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
79094diff --git a/fs/notify/notification.c b/fs/notify/notification.c
79095index a95d8e0..a91a5fd 100644
79096--- a/fs/notify/notification.c
79097+++ b/fs/notify/notification.c
79098@@ -48,7 +48,7 @@
79099 #include <linux/fsnotify_backend.h>
79100 #include "fsnotify.h"
79101
79102-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79103+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79104
79105 /**
79106 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
79107@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
79108 */
79109 u32 fsnotify_get_cookie(void)
79110 {
79111- return atomic_inc_return(&fsnotify_sync_cookie);
79112+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
79113 }
79114 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
79115
79116diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
79117index 9e38daf..5727cae 100644
79118--- a/fs/ntfs/dir.c
79119+++ b/fs/ntfs/dir.c
79120@@ -1310,7 +1310,7 @@ find_next_index_buffer:
79121 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
79122 ~(s64)(ndir->itype.index.block_size - 1)));
79123 /* Bounds checks. */
79124- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
79125+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
79126 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
79127 "inode 0x%lx or driver bug.", vdir->i_ino);
79128 goto err_out;
79129diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
79130index 9e1e112..241a52a 100644
79131--- a/fs/ntfs/super.c
79132+++ b/fs/ntfs/super.c
79133@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79134 if (!silent)
79135 ntfs_error(sb, "Primary boot sector is invalid.");
79136 } else if (!silent)
79137- ntfs_error(sb, read_err_str, "primary");
79138+ ntfs_error(sb, read_err_str, "%s", "primary");
79139 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
79140 if (bh_primary)
79141 brelse(bh_primary);
79142@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79143 goto hotfix_primary_boot_sector;
79144 brelse(bh_backup);
79145 } else if (!silent)
79146- ntfs_error(sb, read_err_str, "backup");
79147+ ntfs_error(sb, read_err_str, "%s", "backup");
79148 /* Try to read NT3.51- backup boot sector. */
79149 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
79150 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
79151@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
79152 "sector.");
79153 brelse(bh_backup);
79154 } else if (!silent)
79155- ntfs_error(sb, read_err_str, "backup");
79156+ ntfs_error(sb, read_err_str, "%s", "backup");
79157 /* We failed. Cleanup and return. */
79158 if (bh_primary)
79159 brelse(bh_primary);
79160diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
79161index 857bbbc..3c47d15 100644
79162--- a/fs/ocfs2/localalloc.c
79163+++ b/fs/ocfs2/localalloc.c
79164@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
79165 goto bail;
79166 }
79167
79168- atomic_inc(&osb->alloc_stats.moves);
79169+ atomic_inc_unchecked(&osb->alloc_stats.moves);
79170
79171 bail:
79172 if (handle)
79173diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
79174index 460c6c3..b4ef513 100644
79175--- a/fs/ocfs2/ocfs2.h
79176+++ b/fs/ocfs2/ocfs2.h
79177@@ -247,11 +247,11 @@ enum ocfs2_vol_state
79178
79179 struct ocfs2_alloc_stats
79180 {
79181- atomic_t moves;
79182- atomic_t local_data;
79183- atomic_t bitmap_data;
79184- atomic_t bg_allocs;
79185- atomic_t bg_extends;
79186+ atomic_unchecked_t moves;
79187+ atomic_unchecked_t local_data;
79188+ atomic_unchecked_t bitmap_data;
79189+ atomic_unchecked_t bg_allocs;
79190+ atomic_unchecked_t bg_extends;
79191 };
79192
79193 enum ocfs2_local_alloc_state
79194diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
79195index 4479029..5de740b 100644
79196--- a/fs/ocfs2/suballoc.c
79197+++ b/fs/ocfs2/suballoc.c
79198@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
79199 mlog_errno(status);
79200 goto bail;
79201 }
79202- atomic_inc(&osb->alloc_stats.bg_extends);
79203+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
79204
79205 /* You should never ask for this much metadata */
79206 BUG_ON(bits_wanted >
79207@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
79208 mlog_errno(status);
79209 goto bail;
79210 }
79211- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79212+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79213
79214 *suballoc_loc = res.sr_bg_blkno;
79215 *suballoc_bit_start = res.sr_bit_offset;
79216@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
79217 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
79218 res->sr_bits);
79219
79220- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79221+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79222
79223 BUG_ON(res->sr_bits != 1);
79224
79225@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
79226 mlog_errno(status);
79227 goto bail;
79228 }
79229- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79230+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
79231
79232 BUG_ON(res.sr_bits != 1);
79233
79234@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
79235 cluster_start,
79236 num_clusters);
79237 if (!status)
79238- atomic_inc(&osb->alloc_stats.local_data);
79239+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
79240 } else {
79241 if (min_clusters > (osb->bitmap_cpg - 1)) {
79242 /* The only paths asking for contiguousness
79243@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
79244 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
79245 res.sr_bg_blkno,
79246 res.sr_bit_offset);
79247- atomic_inc(&osb->alloc_stats.bitmap_data);
79248+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
79249 *num_clusters = res.sr_bits;
79250 }
79251 }
79252diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
79253index 403c566..6525b35 100644
79254--- a/fs/ocfs2/super.c
79255+++ b/fs/ocfs2/super.c
79256@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
79257 "%10s => GlobalAllocs: %d LocalAllocs: %d "
79258 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
79259 "Stats",
79260- atomic_read(&osb->alloc_stats.bitmap_data),
79261- atomic_read(&osb->alloc_stats.local_data),
79262- atomic_read(&osb->alloc_stats.bg_allocs),
79263- atomic_read(&osb->alloc_stats.moves),
79264- atomic_read(&osb->alloc_stats.bg_extends));
79265+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
79266+ atomic_read_unchecked(&osb->alloc_stats.local_data),
79267+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
79268+ atomic_read_unchecked(&osb->alloc_stats.moves),
79269+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
79270
79271 out += snprintf(buf + out, len - out,
79272 "%10s => State: %u Descriptor: %llu Size: %u bits "
79273@@ -2095,11 +2095,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
79274
79275 mutex_init(&osb->system_file_mutex);
79276
79277- atomic_set(&osb->alloc_stats.moves, 0);
79278- atomic_set(&osb->alloc_stats.local_data, 0);
79279- atomic_set(&osb->alloc_stats.bitmap_data, 0);
79280- atomic_set(&osb->alloc_stats.bg_allocs, 0);
79281- atomic_set(&osb->alloc_stats.bg_extends, 0);
79282+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
79283+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
79284+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
79285+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
79286+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
79287
79288 /* Copy the blockcheck stats from the superblock probe */
79289 osb->osb_ecc_stats = *stats;
79290diff --git a/fs/open.c b/fs/open.c
79291index 98e5a52..8e77e14 100644
79292--- a/fs/open.c
79293+++ b/fs/open.c
79294@@ -32,6 +32,8 @@
79295 #include <linux/dnotify.h>
79296 #include <linux/compat.h>
79297
79298+#define CREATE_TRACE_POINTS
79299+#include <trace/events/fs.h>
79300 #include "internal.h"
79301
79302 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
79303@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
79304 error = locks_verify_truncate(inode, NULL, length);
79305 if (!error)
79306 error = security_path_truncate(path);
79307+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
79308+ error = -EACCES;
79309 if (!error)
79310 error = do_truncate(path->dentry, length, 0, NULL);
79311
79312@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
79313 error = locks_verify_truncate(inode, f.file, length);
79314 if (!error)
79315 error = security_path_truncate(&f.file->f_path);
79316+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
79317+ error = -EACCES;
79318 if (!error)
79319 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
79320 sb_end_write(inode->i_sb);
79321@@ -396,6 +402,9 @@ retry:
79322 if (__mnt_is_readonly(path.mnt))
79323 res = -EROFS;
79324
79325+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
79326+ res = -EACCES;
79327+
79328 out_path_release:
79329 path_put(&path);
79330 if (retry_estale(res, lookup_flags)) {
79331@@ -427,6 +436,8 @@ retry:
79332 if (error)
79333 goto dput_and_out;
79334
79335+ gr_log_chdir(path.dentry, path.mnt);
79336+
79337 set_fs_pwd(current->fs, &path);
79338
79339 dput_and_out:
79340@@ -456,6 +467,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
79341 goto out_putf;
79342
79343 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
79344+
79345+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
79346+ error = -EPERM;
79347+
79348+ if (!error)
79349+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
79350+
79351 if (!error)
79352 set_fs_pwd(current->fs, &f.file->f_path);
79353 out_putf:
79354@@ -485,7 +503,13 @@ retry:
79355 if (error)
79356 goto dput_and_out;
79357
79358+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
79359+ goto dput_and_out;
79360+
79361 set_fs_root(current->fs, &path);
79362+
79363+ gr_handle_chroot_chdir(&path);
79364+
79365 error = 0;
79366 dput_and_out:
79367 path_put(&path);
79368@@ -509,6 +533,16 @@ static int chmod_common(struct path *path, umode_t mode)
79369 return error;
79370 retry_deleg:
79371 mutex_lock(&inode->i_mutex);
79372+
79373+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
79374+ error = -EACCES;
79375+ goto out_unlock;
79376+ }
79377+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
79378+ error = -EACCES;
79379+ goto out_unlock;
79380+ }
79381+
79382 error = security_path_chmod(path, mode);
79383 if (error)
79384 goto out_unlock;
79385@@ -574,6 +608,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
79386 uid = make_kuid(current_user_ns(), user);
79387 gid = make_kgid(current_user_ns(), group);
79388
79389+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
79390+ return -EACCES;
79391+
79392 retry_deleg:
79393 newattrs.ia_valid = ATTR_CTIME;
79394 if (user != (uid_t) -1) {
79395@@ -1018,6 +1055,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
79396 } else {
79397 fsnotify_open(f);
79398 fd_install(fd, f);
79399+ trace_do_sys_open(tmp->name, flags, mode);
79400 }
79401 }
79402 putname(tmp);
79403diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
79404index 04f1248..60b3be1 100644
79405--- a/fs/overlayfs/inode.c
79406+++ b/fs/overlayfs/inode.c
79407@@ -344,6 +344,9 @@ static int ovl_dentry_open(struct dentry *dentry, struct file *file,
79408 enum ovl_path_type type;
79409 bool want_write = false;
79410
79411+ if (d_is_dir(dentry))
79412+ return d_backing_inode(dentry);
79413+
79414 type = ovl_path_real(dentry, &realpath);
79415 if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
79416 want_write = true;
79417diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
79418index bf8537c..c16ef7d 100644
79419--- a/fs/overlayfs/super.c
79420+++ b/fs/overlayfs/super.c
79421@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
79422 {
79423 struct ovl_entry *oe = dentry->d_fsdata;
79424
79425- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
79426+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
79427 }
79428
79429 int ovl_want_write(struct dentry *dentry)
79430@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
79431
79432 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
79433 {
79434- struct path upperpath = { NULL, NULL };
79435- struct path workpath = { NULL, NULL };
79436+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
79437+ struct path workpath = { .dentry = NULL, .mnt = NULL };
79438 struct dentry *root_dentry;
79439 struct ovl_entry *oe;
79440 struct ovl_fs *ufs;
79441diff --git a/fs/pipe.c b/fs/pipe.c
79442index 8865f79..bd2c79b 100644
79443--- a/fs/pipe.c
79444+++ b/fs/pipe.c
79445@@ -36,7 +36,7 @@ unsigned int pipe_max_size = 1048576;
79446 /*
79447 * Minimum pipe size, as required by POSIX
79448 */
79449-unsigned int pipe_min_size = PAGE_SIZE;
79450+unsigned int pipe_min_size __read_only = PAGE_SIZE;
79451
79452 /*
79453 * We use a start+len construction, which provides full use of the
79454@@ -55,7 +55,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
79455
79456 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
79457 {
79458- if (pipe->files)
79459+ if (atomic_read(&pipe->files))
79460 mutex_lock_nested(&pipe->mutex, subclass);
79461 }
79462
79463@@ -70,7 +70,7 @@ EXPORT_SYMBOL(pipe_lock);
79464
79465 void pipe_unlock(struct pipe_inode_info *pipe)
79466 {
79467- if (pipe->files)
79468+ if (atomic_read(&pipe->files))
79469 mutex_unlock(&pipe->mutex);
79470 }
79471 EXPORT_SYMBOL(pipe_unlock);
79472@@ -291,9 +291,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
79473 }
79474 if (bufs) /* More to do? */
79475 continue;
79476- if (!pipe->writers)
79477+ if (!atomic_read(&pipe->writers))
79478 break;
79479- if (!pipe->waiting_writers) {
79480+ if (!atomic_read(&pipe->waiting_writers)) {
79481 /* syscall merging: Usually we must not sleep
79482 * if O_NONBLOCK is set, or if we got some data.
79483 * But if a writer sleeps in kernel space, then
79484@@ -350,7 +350,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79485
79486 __pipe_lock(pipe);
79487
79488- if (!pipe->readers) {
79489+ if (!atomic_read(&pipe->readers)) {
79490 send_sig(SIGPIPE, current, 0);
79491 ret = -EPIPE;
79492 goto out;
79493@@ -386,7 +386,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79494 for (;;) {
79495 int bufs;
79496
79497- if (!pipe->readers) {
79498+ if (!atomic_read(&pipe->readers)) {
79499 send_sig(SIGPIPE, current, 0);
79500 if (!ret)
79501 ret = -EPIPE;
79502@@ -454,9 +454,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
79503 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
79504 do_wakeup = 0;
79505 }
79506- pipe->waiting_writers++;
79507+ atomic_inc(&pipe->waiting_writers);
79508 pipe_wait(pipe);
79509- pipe->waiting_writers--;
79510+ atomic_dec(&pipe->waiting_writers);
79511 }
79512 out:
79513 __pipe_unlock(pipe);
79514@@ -511,7 +511,7 @@ pipe_poll(struct file *filp, poll_table *wait)
79515 mask = 0;
79516 if (filp->f_mode & FMODE_READ) {
79517 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
79518- if (!pipe->writers && filp->f_version != pipe->w_counter)
79519+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
79520 mask |= POLLHUP;
79521 }
79522
79523@@ -521,7 +521,7 @@ pipe_poll(struct file *filp, poll_table *wait)
79524 * Most Unices do not set POLLERR for FIFOs but on Linux they
79525 * behave exactly like pipes for poll().
79526 */
79527- if (!pipe->readers)
79528+ if (!atomic_read(&pipe->readers))
79529 mask |= POLLERR;
79530 }
79531
79532@@ -533,7 +533,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
79533 int kill = 0;
79534
79535 spin_lock(&inode->i_lock);
79536- if (!--pipe->files) {
79537+ if (atomic_dec_and_test(&pipe->files)) {
79538 inode->i_pipe = NULL;
79539 kill = 1;
79540 }
79541@@ -550,11 +550,11 @@ pipe_release(struct inode *inode, struct file *file)
79542
79543 __pipe_lock(pipe);
79544 if (file->f_mode & FMODE_READ)
79545- pipe->readers--;
79546+ atomic_dec(&pipe->readers);
79547 if (file->f_mode & FMODE_WRITE)
79548- pipe->writers--;
79549+ atomic_dec(&pipe->writers);
79550
79551- if (pipe->readers || pipe->writers) {
79552+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
79553 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
79554 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
79555 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
79556@@ -619,7 +619,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
79557 kfree(pipe);
79558 }
79559
79560-static struct vfsmount *pipe_mnt __read_mostly;
79561+struct vfsmount *pipe_mnt __read_mostly;
79562
79563 /*
79564 * pipefs_dname() is called from d_path().
79565@@ -649,8 +649,9 @@ static struct inode * get_pipe_inode(void)
79566 goto fail_iput;
79567
79568 inode->i_pipe = pipe;
79569- pipe->files = 2;
79570- pipe->readers = pipe->writers = 1;
79571+ atomic_set(&pipe->files, 2);
79572+ atomic_set(&pipe->readers, 1);
79573+ atomic_set(&pipe->writers, 1);
79574 inode->i_fop = &pipefifo_fops;
79575
79576 /*
79577@@ -829,17 +830,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
79578 spin_lock(&inode->i_lock);
79579 if (inode->i_pipe) {
79580 pipe = inode->i_pipe;
79581- pipe->files++;
79582+ atomic_inc(&pipe->files);
79583 spin_unlock(&inode->i_lock);
79584 } else {
79585 spin_unlock(&inode->i_lock);
79586 pipe = alloc_pipe_info();
79587 if (!pipe)
79588 return -ENOMEM;
79589- pipe->files = 1;
79590+ atomic_set(&pipe->files, 1);
79591 spin_lock(&inode->i_lock);
79592 if (unlikely(inode->i_pipe)) {
79593- inode->i_pipe->files++;
79594+ atomic_inc(&inode->i_pipe->files);
79595 spin_unlock(&inode->i_lock);
79596 free_pipe_info(pipe);
79597 pipe = inode->i_pipe;
79598@@ -864,10 +865,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
79599 * opened, even when there is no process writing the FIFO.
79600 */
79601 pipe->r_counter++;
79602- if (pipe->readers++ == 0)
79603+ if (atomic_inc_return(&pipe->readers) == 1)
79604 wake_up_partner(pipe);
79605
79606- if (!is_pipe && !pipe->writers) {
79607+ if (!is_pipe && !atomic_read(&pipe->writers)) {
79608 if ((filp->f_flags & O_NONBLOCK)) {
79609 /* suppress POLLHUP until we have
79610 * seen a writer */
79611@@ -886,14 +887,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
79612 * errno=ENXIO when there is no process reading the FIFO.
79613 */
79614 ret = -ENXIO;
79615- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
79616+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
79617 goto err;
79618
79619 pipe->w_counter++;
79620- if (!pipe->writers++)
79621+ if (atomic_inc_return(&pipe->writers) == 1)
79622 wake_up_partner(pipe);
79623
79624- if (!is_pipe && !pipe->readers) {
79625+ if (!is_pipe && !atomic_read(&pipe->readers)) {
79626 if (wait_for_partner(pipe, &pipe->r_counter))
79627 goto err_wr;
79628 }
79629@@ -907,11 +908,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
79630 * the process can at least talk to itself.
79631 */
79632
79633- pipe->readers++;
79634- pipe->writers++;
79635+ atomic_inc(&pipe->readers);
79636+ atomic_inc(&pipe->writers);
79637 pipe->r_counter++;
79638 pipe->w_counter++;
79639- if (pipe->readers == 1 || pipe->writers == 1)
79640+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
79641 wake_up_partner(pipe);
79642 break;
79643
79644@@ -925,13 +926,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
79645 return 0;
79646
79647 err_rd:
79648- if (!--pipe->readers)
79649+ if (atomic_dec_and_test(&pipe->readers))
79650 wake_up_interruptible(&pipe->wait);
79651 ret = -ERESTARTSYS;
79652 goto err;
79653
79654 err_wr:
79655- if (!--pipe->writers)
79656+ if (atomic_dec_and_test(&pipe->writers))
79657 wake_up_interruptible(&pipe->wait);
79658 ret = -ERESTARTSYS;
79659 goto err;
79660@@ -1007,7 +1008,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
79661 * Currently we rely on the pipe array holding a power-of-2 number
79662 * of pages.
79663 */
79664-static inline unsigned int round_pipe_size(unsigned int size)
79665+static inline unsigned long round_pipe_size(unsigned long size)
79666 {
79667 unsigned long nr_pages;
79668
79669@@ -1055,13 +1056,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
79670
79671 switch (cmd) {
79672 case F_SETPIPE_SZ: {
79673- unsigned int size, nr_pages;
79674+ unsigned long size, nr_pages;
79675+
79676+ ret = -EINVAL;
79677+ if (arg < pipe_min_size)
79678+ goto out;
79679
79680 size = round_pipe_size(arg);
79681 nr_pages = size >> PAGE_SHIFT;
79682
79683- ret = -EINVAL;
79684- if (!nr_pages)
79685+ if (size < pipe_min_size)
79686 goto out;
79687
79688 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
79689diff --git a/fs/posix_acl.c b/fs/posix_acl.c
79690index 84bb65b8..4270e47 100644
79691--- a/fs/posix_acl.c
79692+++ b/fs/posix_acl.c
79693@@ -20,6 +20,7 @@
79694 #include <linux/xattr.h>
79695 #include <linux/export.h>
79696 #include <linux/user_namespace.h>
79697+#include <linux/grsecurity.h>
79698
79699 struct posix_acl **acl_by_type(struct inode *inode, int type)
79700 {
79701@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
79702 }
79703 }
79704 if (mode_p)
79705- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
79706+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
79707 return not_equiv;
79708 }
79709 EXPORT_SYMBOL(posix_acl_equiv_mode);
79710@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
79711 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
79712 }
79713
79714- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
79715+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
79716 return not_equiv;
79717 }
79718
79719@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
79720 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
79721 int err = -ENOMEM;
79722 if (clone) {
79723+ *mode_p &= ~gr_acl_umask();
79724+
79725 err = posix_acl_create_masq(clone, mode_p);
79726 if (err < 0) {
79727 posix_acl_release(clone);
79728@@ -663,11 +666,12 @@ struct posix_acl *
79729 posix_acl_from_xattr(struct user_namespace *user_ns,
79730 const void *value, size_t size)
79731 {
79732- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
79733- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
79734+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
79735+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
79736 int count;
79737 struct posix_acl *acl;
79738 struct posix_acl_entry *acl_e;
79739+ umode_t umask = gr_acl_umask();
79740
79741 if (!value)
79742 return NULL;
79743@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
79744
79745 switch(acl_e->e_tag) {
79746 case ACL_USER_OBJ:
79747+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
79748+ break;
79749 case ACL_GROUP_OBJ:
79750 case ACL_MASK:
79751+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
79752+ break;
79753 case ACL_OTHER:
79754+ acl_e->e_perm &= ~(umask & S_IRWXO);
79755 break;
79756
79757 case ACL_USER:
79758+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
79759 acl_e->e_uid =
79760 make_kuid(user_ns,
79761 le32_to_cpu(entry->e_id));
79762@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
79763 goto fail;
79764 break;
79765 case ACL_GROUP:
79766+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
79767 acl_e->e_gid =
79768 make_kgid(user_ns,
79769 le32_to_cpu(entry->e_id));
79770diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
79771index 2183fcf..3c32a98 100644
79772--- a/fs/proc/Kconfig
79773+++ b/fs/proc/Kconfig
79774@@ -30,7 +30,7 @@ config PROC_FS
79775
79776 config PROC_KCORE
79777 bool "/proc/kcore support" if !ARM
79778- depends on PROC_FS && MMU
79779+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
79780 help
79781 Provides a virtual ELF core file of the live kernel. This can
79782 be read with gdb and other ELF tools. No modifications can be
79783@@ -38,8 +38,8 @@ config PROC_KCORE
79784
79785 config PROC_VMCORE
79786 bool "/proc/vmcore support"
79787- depends on PROC_FS && CRASH_DUMP
79788- default y
79789+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
79790+ default n
79791 help
79792 Exports the dump image of crashed kernel in ELF format.
79793
79794@@ -63,8 +63,8 @@ config PROC_SYSCTL
79795 limited in memory.
79796
79797 config PROC_PAGE_MONITOR
79798- default y
79799- depends on PROC_FS && MMU
79800+ default n
79801+ depends on PROC_FS && MMU && !GRKERNSEC
79802 bool "Enable /proc page monitoring" if EXPERT
79803 help
79804 Various /proc files exist to monitor process memory utilization:
79805diff --git a/fs/proc/array.c b/fs/proc/array.c
79806index fd02a9e..7bc9dff 100644
79807--- a/fs/proc/array.c
79808+++ b/fs/proc/array.c
79809@@ -60,6 +60,7 @@
79810 #include <linux/tty.h>
79811 #include <linux/string.h>
79812 #include <linux/mman.h>
79813+#include <linux/grsecurity.h>
79814 #include <linux/proc_fs.h>
79815 #include <linux/ioport.h>
79816 #include <linux/uaccess.h>
79817@@ -340,6 +341,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
79818 cpumask_pr_args(&task->cpus_allowed));
79819 }
79820
79821+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
79822+static inline void task_pax(struct seq_file *m, struct task_struct *p)
79823+{
79824+ if (p->mm)
79825+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
79826+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
79827+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
79828+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
79829+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
79830+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
79831+ else
79832+ seq_printf(m, "PaX:\t-----\n");
79833+}
79834+#endif
79835+
79836 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
79837 struct pid *pid, struct task_struct *task)
79838 {
79839@@ -358,9 +374,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
79840 task_cpus_allowed(m, task);
79841 cpuset_task_status_allowed(m, task);
79842 task_context_switch_counts(m, task);
79843+
79844+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
79845+ task_pax(m, task);
79846+#endif
79847+
79848+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
79849+ task_grsec_rbac(m, task);
79850+#endif
79851+
79852 return 0;
79853 }
79854
79855+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79856+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
79857+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
79858+ _mm->pax_flags & MF_PAX_SEGMEXEC))
79859+#endif
79860+
79861 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79862 struct pid *pid, struct task_struct *task, int whole)
79863 {
79864@@ -382,6 +413,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79865 char tcomm[sizeof(task->comm)];
79866 unsigned long flags;
79867
79868+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79869+ if (current->exec_id != m->exec_id) {
79870+ gr_log_badprocpid("stat");
79871+ return 0;
79872+ }
79873+#endif
79874+
79875 state = *get_task_state(task);
79876 vsize = eip = esp = 0;
79877 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
79878@@ -452,6 +490,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79879 gtime = task_gtime(task);
79880 }
79881
79882+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79883+ if (PAX_RAND_FLAGS(mm)) {
79884+ eip = 0;
79885+ esp = 0;
79886+ wchan = 0;
79887+ }
79888+#endif
79889+#ifdef CONFIG_GRKERNSEC_HIDESYM
79890+ wchan = 0;
79891+ eip =0;
79892+ esp =0;
79893+#endif
79894+
79895 /* scale priority and nice values from timeslices to -20..20 */
79896 /* to make it look like a "normal" Unix priority/nice value */
79897 priority = task_prio(task);
79898@@ -483,9 +534,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79899 seq_put_decimal_ull(m, ' ', vsize);
79900 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
79901 seq_put_decimal_ull(m, ' ', rsslim);
79902+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79903+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
79904+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
79905+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
79906+#else
79907 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
79908 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
79909 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
79910+#endif
79911 seq_put_decimal_ull(m, ' ', esp);
79912 seq_put_decimal_ull(m, ' ', eip);
79913 /* The signal information here is obsolete.
79914@@ -507,7 +564,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
79915 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
79916 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
79917
79918- if (mm && permitted) {
79919+ if (mm && permitted
79920+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79921+ && !PAX_RAND_FLAGS(mm)
79922+#endif
79923+ ) {
79924 seq_put_decimal_ull(m, ' ', mm->start_data);
79925 seq_put_decimal_ull(m, ' ', mm->end_data);
79926 seq_put_decimal_ull(m, ' ', mm->start_brk);
79927@@ -545,8 +606,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
79928 struct pid *pid, struct task_struct *task)
79929 {
79930 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
79931- struct mm_struct *mm = get_task_mm(task);
79932+ struct mm_struct *mm;
79933
79934+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79935+ if (current->exec_id != m->exec_id) {
79936+ gr_log_badprocpid("statm");
79937+ return 0;
79938+ }
79939+#endif
79940+ mm = get_task_mm(task);
79941 if (mm) {
79942 size = task_statm(mm, &shared, &text, &data, &resident);
79943 mmput(mm);
79944@@ -569,6 +637,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
79945 return 0;
79946 }
79947
79948+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
79949+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
79950+{
79951+ unsigned long flags;
79952+ u32 curr_ip = 0;
79953+
79954+ if (lock_task_sighand(task, &flags)) {
79955+ curr_ip = task->signal->curr_ip;
79956+ unlock_task_sighand(task, &flags);
79957+ }
79958+ return seq_printf(m, "%pI4\n", &curr_ip);
79959+}
79960+#endif
79961+
79962 #ifdef CONFIG_CHECKPOINT_RESTORE
79963 static struct pid *
79964 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
79965diff --git a/fs/proc/base.c b/fs/proc/base.c
79966index 093ca14..322f097 100644
79967--- a/fs/proc/base.c
79968+++ b/fs/proc/base.c
79969@@ -113,6 +113,14 @@ struct pid_entry {
79970 union proc_op op;
79971 };
79972
79973+struct getdents_callback {
79974+ struct linux_dirent __user * current_dir;
79975+ struct linux_dirent __user * previous;
79976+ struct file * file;
79977+ int count;
79978+ int error;
79979+};
79980+
79981 #define NOD(NAME, MODE, IOP, FOP, OP) { \
79982 .name = (NAME), \
79983 .len = sizeof(NAME) - 1, \
79984@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
79985 return 0;
79986 }
79987
79988+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
79989+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
79990+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
79991+ _mm->pax_flags & MF_PAX_SEGMEXEC))
79992+#endif
79993+
79994 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
79995 struct pid *pid, struct task_struct *task)
79996 {
79997 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
79998 if (mm && !IS_ERR(mm)) {
79999 unsigned int nwords = 0;
80000+
80001+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80002+ /* allow if we're currently ptracing this task */
80003+ if (PAX_RAND_FLAGS(mm) &&
80004+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
80005+ mmput(mm);
80006+ return 0;
80007+ }
80008+#endif
80009+
80010 do {
80011 nwords += 2;
80012 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
80013@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
80014 }
80015
80016
80017-#ifdef CONFIG_KALLSYMS
80018+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80019 /*
80020 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
80021 * Returns the resolved symbol. If that fails, simply return the address.
80022@@ -267,7 +291,7 @@ static void unlock_trace(struct task_struct *task)
80023 mutex_unlock(&task->signal->cred_guard_mutex);
80024 }
80025
80026-#ifdef CONFIG_STACKTRACE
80027+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80028
80029 #define MAX_STACK_TRACE_DEPTH 64
80030
80031@@ -462,7 +486,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
80032 return 0;
80033 }
80034
80035-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80036+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80037 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
80038 struct pid *pid, struct task_struct *task)
80039 {
80040@@ -495,7 +519,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
80041 /************************************************************************/
80042
80043 /* permission checks */
80044-static int proc_fd_access_allowed(struct inode *inode)
80045+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
80046 {
80047 struct task_struct *task;
80048 int allowed = 0;
80049@@ -505,7 +529,10 @@ static int proc_fd_access_allowed(struct inode *inode)
80050 */
80051 task = get_proc_task(inode);
80052 if (task) {
80053- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
80054+ if (log)
80055+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
80056+ else
80057+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
80058 put_task_struct(task);
80059 }
80060 return allowed;
80061@@ -536,10 +563,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
80062 struct task_struct *task,
80063 int hide_pid_min)
80064 {
80065+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80066+ return false;
80067+
80068+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80069+ rcu_read_lock();
80070+ {
80071+ const struct cred *tmpcred = current_cred();
80072+ const struct cred *cred = __task_cred(task);
80073+
80074+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
80075+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80076+ || in_group_p(grsec_proc_gid)
80077+#endif
80078+ ) {
80079+ rcu_read_unlock();
80080+ return true;
80081+ }
80082+ }
80083+ rcu_read_unlock();
80084+
80085+ if (!pid->hide_pid)
80086+ return false;
80087+#endif
80088+
80089 if (pid->hide_pid < hide_pid_min)
80090 return true;
80091 if (in_group_p(pid->pid_gid))
80092 return true;
80093+
80094 return ptrace_may_access(task, PTRACE_MODE_READ);
80095 }
80096
80097@@ -557,7 +609,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
80098 put_task_struct(task);
80099
80100 if (!has_perms) {
80101+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80102+ {
80103+#else
80104 if (pid->hide_pid == 2) {
80105+#endif
80106 /*
80107 * Let's make getdents(), stat(), and open()
80108 * consistent with each other. If a process
80109@@ -618,6 +674,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
80110
80111 if (task) {
80112 mm = mm_access(task, mode);
80113+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
80114+ mmput(mm);
80115+ mm = ERR_PTR(-EPERM);
80116+ }
80117 put_task_struct(task);
80118
80119 if (!IS_ERR_OR_NULL(mm)) {
80120@@ -639,6 +699,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
80121 return PTR_ERR(mm);
80122
80123 file->private_data = mm;
80124+
80125+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80126+ file->f_version = current->exec_id;
80127+#endif
80128+
80129 return 0;
80130 }
80131
80132@@ -660,6 +725,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
80133 ssize_t copied;
80134 char *page;
80135
80136+#ifdef CONFIG_GRKERNSEC
80137+ if (write)
80138+ return -EPERM;
80139+#endif
80140+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80141+ if (file->f_version != current->exec_id) {
80142+ gr_log_badprocpid("mem");
80143+ return 0;
80144+ }
80145+#endif
80146+
80147 if (!mm)
80148 return 0;
80149
80150@@ -672,7 +748,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
80151 goto free;
80152
80153 while (count > 0) {
80154- int this_len = min_t(int, count, PAGE_SIZE);
80155+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
80156
80157 if (write && copy_from_user(page, buf, this_len)) {
80158 copied = -EFAULT;
80159@@ -764,6 +840,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
80160 if (!mm)
80161 return 0;
80162
80163+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
80164+ if (file->f_version != current->exec_id) {
80165+ gr_log_badprocpid("environ");
80166+ return 0;
80167+ }
80168+#endif
80169+
80170 page = (char *)__get_free_page(GFP_TEMPORARY);
80171 if (!page)
80172 return -ENOMEM;
80173@@ -773,7 +856,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
80174 goto free;
80175 while (count > 0) {
80176 size_t this_len, max_len;
80177- int retval;
80178+ ssize_t retval;
80179
80180 if (src >= (mm->env_end - mm->env_start))
80181 break;
80182@@ -1387,7 +1470,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
80183 int error = -EACCES;
80184
80185 /* Are we allowed to snoop on the tasks file descriptors? */
80186- if (!proc_fd_access_allowed(inode))
80187+ if (!proc_fd_access_allowed(inode, 0))
80188 goto out;
80189
80190 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
80191@@ -1431,8 +1514,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
80192 struct path path;
80193
80194 /* Are we allowed to snoop on the tasks file descriptors? */
80195- if (!proc_fd_access_allowed(inode))
80196- goto out;
80197+ /* logging this is needed for learning on chromium to work properly,
80198+ but we don't want to flood the logs from 'ps' which does a readlink
80199+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
80200+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
80201+ */
80202+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
80203+ if (!proc_fd_access_allowed(inode,0))
80204+ goto out;
80205+ } else {
80206+ if (!proc_fd_access_allowed(inode,1))
80207+ goto out;
80208+ }
80209
80210 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
80211 if (error)
80212@@ -1482,7 +1575,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
80213 rcu_read_lock();
80214 cred = __task_cred(task);
80215 inode->i_uid = cred->euid;
80216+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80217+ inode->i_gid = grsec_proc_gid;
80218+#else
80219 inode->i_gid = cred->egid;
80220+#endif
80221 rcu_read_unlock();
80222 }
80223 security_task_to_inode(task, inode);
80224@@ -1518,10 +1615,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
80225 return -ENOENT;
80226 }
80227 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
80228+#ifdef CONFIG_GRKERNSEC_PROC_USER
80229+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
80230+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80231+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
80232+#endif
80233 task_dumpable(task)) {
80234 cred = __task_cred(task);
80235 stat->uid = cred->euid;
80236+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80237+ stat->gid = grsec_proc_gid;
80238+#else
80239 stat->gid = cred->egid;
80240+#endif
80241 }
80242 }
80243 rcu_read_unlock();
80244@@ -1559,11 +1665,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
80245
80246 if (task) {
80247 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
80248+#ifdef CONFIG_GRKERNSEC_PROC_USER
80249+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
80250+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80251+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
80252+#endif
80253 task_dumpable(task)) {
80254 rcu_read_lock();
80255 cred = __task_cred(task);
80256 inode->i_uid = cred->euid;
80257+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80258+ inode->i_gid = grsec_proc_gid;
80259+#else
80260 inode->i_gid = cred->egid;
80261+#endif
80262 rcu_read_unlock();
80263 } else {
80264 inode->i_uid = GLOBAL_ROOT_UID;
80265@@ -2095,6 +2210,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
80266 if (!task)
80267 goto out_no_task;
80268
80269+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80270+ goto out;
80271+
80272 /*
80273 * Yes, it does not scale. And it should not. Don't add
80274 * new entries into /proc/<tgid>/ without very good reasons.
80275@@ -2125,6 +2243,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
80276 if (!task)
80277 return -ENOENT;
80278
80279+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80280+ goto out;
80281+
80282 if (!dir_emit_dots(file, ctx))
80283 goto out;
80284
80285@@ -2569,7 +2690,7 @@ static const struct pid_entry tgid_base_stuff[] = {
80286 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
80287 #endif
80288 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
80289-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80290+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80291 ONE("syscall", S_IRUSR, proc_pid_syscall),
80292 #endif
80293 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
80294@@ -2594,10 +2715,10 @@ static const struct pid_entry tgid_base_stuff[] = {
80295 #ifdef CONFIG_SECURITY
80296 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
80297 #endif
80298-#ifdef CONFIG_KALLSYMS
80299+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80300 ONE("wchan", S_IRUGO, proc_pid_wchan),
80301 #endif
80302-#ifdef CONFIG_STACKTRACE
80303+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80304 ONE("stack", S_IRUSR, proc_pid_stack),
80305 #endif
80306 #ifdef CONFIG_SCHEDSTATS
80307@@ -2631,6 +2752,9 @@ static const struct pid_entry tgid_base_stuff[] = {
80308 #ifdef CONFIG_HARDWALL
80309 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
80310 #endif
80311+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80312+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
80313+#endif
80314 #ifdef CONFIG_USER_NS
80315 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
80316 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
80317@@ -2763,7 +2887,14 @@ static int proc_pid_instantiate(struct inode *dir,
80318 if (!inode)
80319 goto out;
80320
80321+#ifdef CONFIG_GRKERNSEC_PROC_USER
80322+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
80323+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
80324+ inode->i_gid = grsec_proc_gid;
80325+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
80326+#else
80327 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
80328+#endif
80329 inode->i_op = &proc_tgid_base_inode_operations;
80330 inode->i_fop = &proc_tgid_base_operations;
80331 inode->i_flags|=S_IMMUTABLE;
80332@@ -2801,7 +2932,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
80333 if (!task)
80334 goto out;
80335
80336+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
80337+ goto out_put_task;
80338+
80339 result = proc_pid_instantiate(dir, dentry, task, NULL);
80340+out_put_task:
80341 put_task_struct(task);
80342 out:
80343 return ERR_PTR(result);
80344@@ -2915,7 +3050,7 @@ static const struct pid_entry tid_base_stuff[] = {
80345 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
80346 #endif
80347 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
80348-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
80349+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
80350 ONE("syscall", S_IRUSR, proc_pid_syscall),
80351 #endif
80352 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
80353@@ -2942,10 +3077,10 @@ static const struct pid_entry tid_base_stuff[] = {
80354 #ifdef CONFIG_SECURITY
80355 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
80356 #endif
80357-#ifdef CONFIG_KALLSYMS
80358+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80359 ONE("wchan", S_IRUGO, proc_pid_wchan),
80360 #endif
80361-#ifdef CONFIG_STACKTRACE
80362+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
80363 ONE("stack", S_IRUSR, proc_pid_stack),
80364 #endif
80365 #ifdef CONFIG_SCHEDSTATS
80366diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
80367index cbd82df..c0407d2 100644
80368--- a/fs/proc/cmdline.c
80369+++ b/fs/proc/cmdline.c
80370@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
80371
80372 static int __init proc_cmdline_init(void)
80373 {
80374+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80375+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
80376+#else
80377 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
80378+#endif
80379 return 0;
80380 }
80381 fs_initcall(proc_cmdline_init);
80382diff --git a/fs/proc/devices.c b/fs/proc/devices.c
80383index 50493ed..248166b 100644
80384--- a/fs/proc/devices.c
80385+++ b/fs/proc/devices.c
80386@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
80387
80388 static int __init proc_devices_init(void)
80389 {
80390+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80391+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
80392+#else
80393 proc_create("devices", 0, NULL, &proc_devinfo_operations);
80394+#endif
80395 return 0;
80396 }
80397 fs_initcall(proc_devices_init);
80398diff --git a/fs/proc/fd.c b/fs/proc/fd.c
80399index 6e5fcd0..06ea074 100644
80400--- a/fs/proc/fd.c
80401+++ b/fs/proc/fd.c
80402@@ -27,7 +27,8 @@ static int seq_show(struct seq_file *m, void *v)
80403 if (!task)
80404 return -ENOENT;
80405
80406- files = get_files_struct(task);
80407+ if (!gr_acl_handle_procpidmem(task))
80408+ files = get_files_struct(task);
80409 put_task_struct(task);
80410
80411 if (files) {
80412@@ -291,11 +292,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
80413 */
80414 int proc_fd_permission(struct inode *inode, int mask)
80415 {
80416+ struct task_struct *task;
80417 int rv = generic_permission(inode, mask);
80418- if (rv == 0)
80419- return 0;
80420+
80421 if (task_tgid(current) == proc_pid(inode))
80422 rv = 0;
80423+
80424+ task = get_proc_task(inode);
80425+ if (task == NULL)
80426+ return rv;
80427+
80428+ if (gr_acl_handle_procpidmem(task))
80429+ rv = -EACCES;
80430+
80431+ put_task_struct(task);
80432+
80433 return rv;
80434 }
80435
80436diff --git a/fs/proc/generic.c b/fs/proc/generic.c
80437index e5dee5c..dafe21b 100644
80438--- a/fs/proc/generic.c
80439+++ b/fs/proc/generic.c
80440@@ -22,6 +22,7 @@
80441 #include <linux/bitops.h>
80442 #include <linux/spinlock.h>
80443 #include <linux/completion.h>
80444+#include <linux/grsecurity.h>
80445 #include <asm/uaccess.h>
80446
80447 #include "internal.h"
80448@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
80449 return proc_lookup_de(PDE(dir), dir, dentry);
80450 }
80451
80452+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
80453+ unsigned int flags)
80454+{
80455+ if (gr_proc_is_restricted())
80456+ return ERR_PTR(-EACCES);
80457+
80458+ return proc_lookup_de(PDE(dir), dir, dentry);
80459+}
80460+
80461 /*
80462 * This returns non-zero if at EOF, so that the /proc
80463 * root directory can use this and check if it should
80464@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
80465 return proc_readdir_de(PDE(inode), file, ctx);
80466 }
80467
80468+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
80469+{
80470+ struct inode *inode = file_inode(file);
80471+
80472+ if (gr_proc_is_restricted())
80473+ return -EACCES;
80474+
80475+ return proc_readdir_de(PDE(inode), file, ctx);
80476+}
80477+
80478 /*
80479 * These are the generic /proc directory operations. They
80480 * use the in-memory "struct proc_dir_entry" tree to parse
80481@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
80482 .iterate = proc_readdir,
80483 };
80484
80485+static const struct file_operations proc_dir_restricted_operations = {
80486+ .llseek = generic_file_llseek,
80487+ .read = generic_read_dir,
80488+ .iterate = proc_readdir_restrict,
80489+};
80490+
80491 /*
80492 * proc directories can do almost nothing..
80493 */
80494@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
80495 .setattr = proc_notify_change,
80496 };
80497
80498+static const struct inode_operations proc_dir_restricted_inode_operations = {
80499+ .lookup = proc_lookup_restrict,
80500+ .getattr = proc_getattr,
80501+ .setattr = proc_notify_change,
80502+};
80503+
80504 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
80505 {
80506 int ret;
80507@@ -445,6 +477,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
80508 }
80509 EXPORT_SYMBOL_GPL(proc_mkdir_data);
80510
80511+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
80512+ struct proc_dir_entry *parent, void *data)
80513+{
80514+ struct proc_dir_entry *ent;
80515+
80516+ if (mode == 0)
80517+ mode = S_IRUGO | S_IXUGO;
80518+
80519+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
80520+ if (ent) {
80521+ ent->data = data;
80522+ ent->restricted = 1;
80523+ ent->proc_fops = &proc_dir_restricted_operations;
80524+ ent->proc_iops = &proc_dir_restricted_inode_operations;
80525+ parent->nlink++;
80526+ if (proc_register(parent, ent) < 0) {
80527+ kfree(ent);
80528+ parent->nlink--;
80529+ ent = NULL;
80530+ }
80531+ }
80532+ return ent;
80533+}
80534+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
80535+
80536 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
80537 struct proc_dir_entry *parent)
80538 {
80539@@ -459,6 +516,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
80540 }
80541 EXPORT_SYMBOL(proc_mkdir);
80542
80543+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
80544+ struct proc_dir_entry *parent)
80545+{
80546+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
80547+}
80548+EXPORT_SYMBOL(proc_mkdir_restrict);
80549+
80550 struct proc_dir_entry *proc_create_mount_point(const char *name)
80551 {
80552 umode_t mode = S_IFDIR | S_IRUGO | S_IXUGO;
80553diff --git a/fs/proc/inode.c b/fs/proc/inode.c
80554index e3eb552..bcb0f25 100644
80555--- a/fs/proc/inode.c
80556+++ b/fs/proc/inode.c
80557@@ -24,11 +24,17 @@
80558 #include <linux/mount.h>
80559 #include <linux/magic.h>
80560 #include <linux/namei.h>
80561+#include <linux/grsecurity.h>
80562
80563 #include <asm/uaccess.h>
80564
80565 #include "internal.h"
80566
80567+#ifdef CONFIG_PROC_SYSCTL
80568+extern const struct inode_operations proc_sys_inode_operations;
80569+extern const struct inode_operations proc_sys_dir_operations;
80570+#endif
80571+
80572 static void proc_evict_inode(struct inode *inode)
80573 {
80574 struct proc_dir_entry *de;
80575@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
80576 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
80577 sysctl_head_put(head);
80578 }
80579+
80580+#ifdef CONFIG_PROC_SYSCTL
80581+ if (inode->i_op == &proc_sys_inode_operations ||
80582+ inode->i_op == &proc_sys_dir_operations)
80583+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
80584+#endif
80585+
80586 }
80587
80588 static struct kmem_cache * proc_inode_cachep;
80589@@ -430,7 +443,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
80590 if (de->mode) {
80591 inode->i_mode = de->mode;
80592 inode->i_uid = de->uid;
80593+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80594+ inode->i_gid = grsec_proc_gid;
80595+#else
80596 inode->i_gid = de->gid;
80597+#endif
80598 }
80599 if (de->size)
80600 inode->i_size = de->size;
80601diff --git a/fs/proc/internal.h b/fs/proc/internal.h
80602index aa27810..9f2d3b2 100644
80603--- a/fs/proc/internal.h
80604+++ b/fs/proc/internal.h
80605@@ -47,9 +47,10 @@ struct proc_dir_entry {
80606 struct completion *pde_unload_completion;
80607 struct list_head pde_openers; /* who did ->open, but not ->release */
80608 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
80609+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
80610 u8 namelen;
80611 char name[];
80612-};
80613+} __randomize_layout;
80614
80615 union proc_op {
80616 int (*proc_get_link)(struct dentry *, struct path *);
80617@@ -67,7 +68,7 @@ struct proc_inode {
80618 struct ctl_table *sysctl_entry;
80619 const struct proc_ns_operations *ns_ops;
80620 struct inode vfs_inode;
80621-};
80622+} __randomize_layout;
80623
80624 /*
80625 * General functions
80626@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
80627 struct pid *, struct task_struct *);
80628 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
80629 struct pid *, struct task_struct *);
80630+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
80631+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
80632+ struct pid *, struct task_struct *);
80633+#endif
80634
80635 /*
80636 * base.c
80637@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
80638 * generic.c
80639 */
80640 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
80641+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
80642 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
80643 struct dentry *);
80644 extern int proc_readdir(struct file *, struct dir_context *);
80645+extern int proc_readdir_restrict(struct file *, struct dir_context *);
80646 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
80647
80648 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
80649diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
80650index a352d57..cb94a5c 100644
80651--- a/fs/proc/interrupts.c
80652+++ b/fs/proc/interrupts.c
80653@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
80654
80655 static int __init proc_interrupts_init(void)
80656 {
80657+#ifdef CONFIG_GRKERNSEC_PROC_ADD
80658+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
80659+#else
80660 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
80661+#endif
80662 return 0;
80663 }
80664 fs_initcall(proc_interrupts_init);
80665diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
80666index 91a4e64..14bf8fa 100644
80667--- a/fs/proc/kcore.c
80668+++ b/fs/proc/kcore.c
80669@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80670 * the addresses in the elf_phdr on our list.
80671 */
80672 start = kc_offset_to_vaddr(*fpos - elf_buflen);
80673- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
80674+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
80675+ if (tsz > buflen)
80676 tsz = buflen;
80677-
80678+
80679 while (buflen) {
80680 struct kcore_list *m;
80681
80682@@ -515,19 +516,20 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80683 } else {
80684 if (kern_addr_valid(start)) {
80685 unsigned long n;
80686+ char *elf_buf;
80687+ mm_segment_t oldfs;
80688
80689- n = copy_to_user(buffer, (char *)start, tsz);
80690- /*
80691- * We cannot distinguish between fault on source
80692- * and fault on destination. When this happens
80693- * we clear too and hope it will trigger the
80694- * EFAULT again.
80695- */
80696- if (n) {
80697- if (clear_user(buffer + tsz - n,
80698- n))
80699- return -EFAULT;
80700- }
80701+ elf_buf = kzalloc(tsz, GFP_KERNEL);
80702+ if (!elf_buf)
80703+ return -ENOMEM;
80704+ oldfs = get_fs();
80705+ set_fs(KERNEL_DS);
80706+ n = __copy_from_user(elf_buf, (const void __user *)start, tsz);
80707+ set_fs(oldfs);
80708+ n = copy_to_user(buffer, elf_buf, tsz);
80709+ kfree(elf_buf);
80710+ if (n)
80711+ return -EFAULT;
80712 } else {
80713 if (clear_user(buffer, tsz))
80714 return -EFAULT;
80715@@ -547,6 +549,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
80716
80717 static int open_kcore(struct inode *inode, struct file *filp)
80718 {
80719+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
80720+ return -EPERM;
80721+#endif
80722 if (!capable(CAP_SYS_RAWIO))
80723 return -EPERM;
80724 if (kcore_need_update)
80725@@ -580,7 +585,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
80726 return NOTIFY_OK;
80727 }
80728
80729-static struct notifier_block kcore_callback_nb __meminitdata = {
80730+static struct notifier_block kcore_callback_nb __meminitconst = {
80731 .notifier_call = kcore_callback,
80732 .priority = 0,
80733 };
80734diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
80735index d3ebf2e..6ad42d1 100644
80736--- a/fs/proc/meminfo.c
80737+++ b/fs/proc/meminfo.c
80738@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
80739 vmi.used >> 10,
80740 vmi.largest_chunk >> 10
80741 #ifdef CONFIG_MEMORY_FAILURE
80742- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
80743+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
80744 #endif
80745 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
80746 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
80747diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
80748index d4a3574..b421ce9 100644
80749--- a/fs/proc/nommu.c
80750+++ b/fs/proc/nommu.c
80751@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
80752
80753 if (file) {
80754 seq_pad(m, ' ');
80755- seq_path(m, &file->f_path, "");
80756+ seq_path(m, &file->f_path, "\n\\");
80757 }
80758
80759 seq_putc(m, '\n');
80760diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
80761index 350984a..0fb02a9 100644
80762--- a/fs/proc/proc_net.c
80763+++ b/fs/proc/proc_net.c
80764@@ -23,9 +23,27 @@
80765 #include <linux/nsproxy.h>
80766 #include <net/net_namespace.h>
80767 #include <linux/seq_file.h>
80768+#include <linux/grsecurity.h>
80769
80770 #include "internal.h"
80771
80772+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
80773+static struct seq_operations *ipv6_seq_ops_addr;
80774+
80775+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
80776+{
80777+ ipv6_seq_ops_addr = addr;
80778+}
80779+
80780+void unregister_ipv6_seq_ops_addr(void)
80781+{
80782+ ipv6_seq_ops_addr = NULL;
80783+}
80784+
80785+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
80786+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
80787+#endif
80788+
80789 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
80790 {
80791 return pde->parent->data;
80792@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
80793 return maybe_get_net(PDE_NET(PDE(inode)));
80794 }
80795
80796+extern const struct seq_operations dev_seq_ops;
80797+
80798 int seq_open_net(struct inode *ino, struct file *f,
80799 const struct seq_operations *ops, int size)
80800 {
80801@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
80802
80803 BUG_ON(size < sizeof(*p));
80804
80805+ /* only permit access to /proc/net/dev */
80806+ if (
80807+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
80808+ ops != ipv6_seq_ops_addr &&
80809+#endif
80810+ ops != &dev_seq_ops && gr_proc_is_restricted())
80811+ return -EACCES;
80812+
80813 net = get_proc_net(ino);
80814 if (net == NULL)
80815 return -ENXIO;
80816@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
80817 int err;
80818 struct net *net;
80819
80820+ if (gr_proc_is_restricted())
80821+ return -EACCES;
80822+
80823 err = -ENXIO;
80824 net = get_proc_net(inode);
80825 if (net == NULL)
80826diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
80827index fdda62e..cd7c75f 100644
80828--- a/fs/proc/proc_sysctl.c
80829+++ b/fs/proc/proc_sysctl.c
80830@@ -11,13 +11,21 @@
80831 #include <linux/namei.h>
80832 #include <linux/mm.h>
80833 #include <linux/module.h>
80834+#include <linux/nsproxy.h>
80835+#ifdef CONFIG_GRKERNSEC
80836+#include <net/net_namespace.h>
80837+#endif
80838 #include "internal.h"
80839
80840+extern int gr_handle_chroot_sysctl(const int op);
80841+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
80842+ const int op);
80843+
80844 static const struct dentry_operations proc_sys_dentry_operations;
80845 static const struct file_operations proc_sys_file_operations;
80846-static const struct inode_operations proc_sys_inode_operations;
80847+const struct inode_operations proc_sys_inode_operations;
80848 static const struct file_operations proc_sys_dir_file_operations;
80849-static const struct inode_operations proc_sys_dir_operations;
80850+const struct inode_operations proc_sys_dir_operations;
80851
80852 /* Support for permanently empty directories */
80853
80854@@ -32,13 +40,17 @@ static bool is_empty_dir(struct ctl_table_header *head)
80855
80856 static void set_empty_dir(struct ctl_dir *dir)
80857 {
80858- dir->header.ctl_table[0].child = sysctl_mount_point;
80859+ pax_open_kernel();
80860+ *(const void **)&dir->header.ctl_table[0].child = sysctl_mount_point;
80861+ pax_close_kernel();
80862 }
80863
80864 static void clear_empty_dir(struct ctl_dir *dir)
80865
80866 {
80867- dir->header.ctl_table[0].child = NULL;
80868+ pax_open_kernel();
80869+ *(void **)&dir->header.ctl_table[0].child = NULL;
80870+ pax_close_kernel();
80871 }
80872
80873 void proc_sys_poll_notify(struct ctl_table_poll *poll)
80874@@ -504,6 +516,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
80875
80876 err = NULL;
80877 d_set_d_op(dentry, &proc_sys_dentry_operations);
80878+
80879+ gr_handle_proc_create(dentry, inode);
80880+
80881 d_add(dentry, inode);
80882
80883 out:
80884@@ -519,6 +534,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
80885 struct inode *inode = file_inode(filp);
80886 struct ctl_table_header *head = grab_header(inode);
80887 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
80888+ int op = write ? MAY_WRITE : MAY_READ;
80889 ssize_t error;
80890 size_t res;
80891
80892@@ -530,7 +546,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
80893 * and won't be until we finish.
80894 */
80895 error = -EPERM;
80896- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
80897+ if (sysctl_perm(head, table, op))
80898 goto out;
80899
80900 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
80901@@ -538,6 +554,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
80902 if (!table->proc_handler)
80903 goto out;
80904
80905+#ifdef CONFIG_GRKERNSEC
80906+ error = -EPERM;
80907+ if (gr_handle_chroot_sysctl(op))
80908+ goto out;
80909+ dget(filp->f_path.dentry);
80910+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
80911+ dput(filp->f_path.dentry);
80912+ goto out;
80913+ }
80914+ dput(filp->f_path.dentry);
80915+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
80916+ goto out;
80917+ if (write) {
80918+ if (current->nsproxy->net_ns != table->extra2) {
80919+ if (!capable(CAP_SYS_ADMIN))
80920+ goto out;
80921+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
80922+ goto out;
80923+ }
80924+#endif
80925+
80926 /* careful: calling conventions are nasty here */
80927 res = count;
80928 error = table->proc_handler(table, write, buf, &res, ppos);
80929@@ -635,6 +672,9 @@ static bool proc_sys_fill_cache(struct file *file,
80930 return false;
80931 } else {
80932 d_set_d_op(child, &proc_sys_dentry_operations);
80933+
80934+ gr_handle_proc_create(child, inode);
80935+
80936 d_add(child, inode);
80937 }
80938 } else {
80939@@ -678,6 +718,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
80940 if ((*pos)++ < ctx->pos)
80941 return true;
80942
80943+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
80944+ return 0;
80945+
80946 if (unlikely(S_ISLNK(table->mode)))
80947 res = proc_sys_link_fill_cache(file, ctx, head, table);
80948 else
80949@@ -771,6 +814,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
80950 if (IS_ERR(head))
80951 return PTR_ERR(head);
80952
80953+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
80954+ return -ENOENT;
80955+
80956 generic_fillattr(inode, stat);
80957 if (table)
80958 stat->mode = (stat->mode & S_IFMT) | table->mode;
80959@@ -793,13 +839,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
80960 .llseek = generic_file_llseek,
80961 };
80962
80963-static const struct inode_operations proc_sys_inode_operations = {
80964+const struct inode_operations proc_sys_inode_operations = {
80965 .permission = proc_sys_permission,
80966 .setattr = proc_sys_setattr,
80967 .getattr = proc_sys_getattr,
80968 };
80969
80970-static const struct inode_operations proc_sys_dir_operations = {
80971+const struct inode_operations proc_sys_dir_operations = {
80972 .lookup = proc_sys_lookup,
80973 .permission = proc_sys_permission,
80974 .setattr = proc_sys_setattr,
80975@@ -876,7 +922,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
80976 static struct ctl_dir *new_dir(struct ctl_table_set *set,
80977 const char *name, int namelen)
80978 {
80979- struct ctl_table *table;
80980+ ctl_table_no_const *table;
80981 struct ctl_dir *new;
80982 struct ctl_node *node;
80983 char *new_name;
80984@@ -888,7 +934,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
80985 return NULL;
80986
80987 node = (struct ctl_node *)(new + 1);
80988- table = (struct ctl_table *)(node + 1);
80989+ table = (ctl_table_no_const *)(node + 1);
80990 new_name = (char *)(table + 2);
80991 memcpy(new_name, name, namelen);
80992 new_name[namelen] = '\0';
80993@@ -1057,7 +1103,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
80994 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
80995 struct ctl_table_root *link_root)
80996 {
80997- struct ctl_table *link_table, *entry, *link;
80998+ ctl_table_no_const *link_table, *link;
80999+ struct ctl_table *entry;
81000 struct ctl_table_header *links;
81001 struct ctl_node *node;
81002 char *link_name;
81003@@ -1080,7 +1127,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
81004 return NULL;
81005
81006 node = (struct ctl_node *)(links + 1);
81007- link_table = (struct ctl_table *)(node + nr_entries);
81008+ link_table = (ctl_table_no_const *)(node + nr_entries);
81009 link_name = (char *)&link_table[nr_entries + 1];
81010
81011 for (link = link_table, entry = table; entry->procname; link++, entry++) {
81012@@ -1328,8 +1375,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
81013 struct ctl_table_header ***subheader, struct ctl_table_set *set,
81014 struct ctl_table *table)
81015 {
81016- struct ctl_table *ctl_table_arg = NULL;
81017- struct ctl_table *entry, *files;
81018+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
81019+ struct ctl_table *entry;
81020 int nr_files = 0;
81021 int nr_dirs = 0;
81022 int err = -ENOMEM;
81023@@ -1341,10 +1388,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
81024 nr_files++;
81025 }
81026
81027- files = table;
81028 /* If there are mixed files and directories we need a new table */
81029 if (nr_dirs && nr_files) {
81030- struct ctl_table *new;
81031+ ctl_table_no_const *new;
81032 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
81033 GFP_KERNEL);
81034 if (!files)
81035@@ -1362,7 +1408,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
81036 /* Register everything except a directory full of subdirectories */
81037 if (nr_files || !nr_dirs) {
81038 struct ctl_table_header *header;
81039- header = __register_sysctl_table(set, path, files);
81040+ header = __register_sysctl_table(set, path, files ? files : table);
81041 if (!header) {
81042 kfree(ctl_table_arg);
81043 goto out;
81044diff --git a/fs/proc/root.c b/fs/proc/root.c
81045index 68feb0f..2c04780 100644
81046--- a/fs/proc/root.c
81047+++ b/fs/proc/root.c
81048@@ -185,7 +185,15 @@ void __init proc_root_init(void)
81049 proc_create_mount_point("openprom");
81050 #endif
81051 proc_tty_init();
81052+#ifdef CONFIG_GRKERNSEC_PROC_ADD
81053+#ifdef CONFIG_GRKERNSEC_PROC_USER
81054+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
81055+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81056+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
81057+#endif
81058+#else
81059 proc_mkdir("bus", NULL);
81060+#endif
81061 proc_sys_init();
81062 }
81063
81064diff --git a/fs/proc/stat.c b/fs/proc/stat.c
81065index 510413eb..34d9a8c 100644
81066--- a/fs/proc/stat.c
81067+++ b/fs/proc/stat.c
81068@@ -11,6 +11,7 @@
81069 #include <linux/irqnr.h>
81070 #include <linux/cputime.h>
81071 #include <linux/tick.h>
81072+#include <linux/grsecurity.h>
81073
81074 #ifndef arch_irq_stat_cpu
81075 #define arch_irq_stat_cpu(cpu) 0
81076@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
81077 u64 sum_softirq = 0;
81078 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
81079 struct timespec boottime;
81080+ int unrestricted = 1;
81081+
81082+#ifdef CONFIG_GRKERNSEC_PROC_ADD
81083+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81084+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
81085+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
81086+ && !in_group_p(grsec_proc_gid)
81087+#endif
81088+ )
81089+ unrestricted = 0;
81090+#endif
81091+#endif
81092
81093 user = nice = system = idle = iowait =
81094 irq = softirq = steal = 0;
81095@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
81096 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
81097 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
81098 idle += get_idle_time(i);
81099- iowait += get_iowait_time(i);
81100- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81101- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81102- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81103- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81104- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81105- sum += kstat_cpu_irqs_sum(i);
81106- sum += arch_irq_stat_cpu(i);
81107+ if (unrestricted) {
81108+ iowait += get_iowait_time(i);
81109+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81110+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81111+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81112+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81113+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81114+ sum += kstat_cpu_irqs_sum(i);
81115+ sum += arch_irq_stat_cpu(i);
81116+ for (j = 0; j < NR_SOFTIRQS; j++) {
81117+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
81118
81119- for (j = 0; j < NR_SOFTIRQS; j++) {
81120- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
81121-
81122- per_softirq_sums[j] += softirq_stat;
81123- sum_softirq += softirq_stat;
81124+ per_softirq_sums[j] += softirq_stat;
81125+ sum_softirq += softirq_stat;
81126+ }
81127 }
81128 }
81129- sum += arch_irq_stat();
81130+ if (unrestricted)
81131+ sum += arch_irq_stat();
81132
81133 seq_puts(p, "cpu ");
81134 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
81135@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
81136 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
81137 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
81138 idle = get_idle_time(i);
81139- iowait = get_iowait_time(i);
81140- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81141- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81142- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81143- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81144- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81145+ if (unrestricted) {
81146+ iowait = get_iowait_time(i);
81147+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
81148+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
81149+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
81150+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
81151+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
81152+ }
81153 seq_printf(p, "cpu%d", i);
81154 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
81155 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
81156@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
81157
81158 /* sum again ? it could be updated? */
81159 for_each_irq_nr(j)
81160- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
81161+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
81162
81163 seq_printf(p,
81164 "\nctxt %llu\n"
81165@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
81166 "processes %lu\n"
81167 "procs_running %lu\n"
81168 "procs_blocked %lu\n",
81169- nr_context_switches(),
81170+ unrestricted ? nr_context_switches() : 0ULL,
81171 (unsigned long)jif,
81172- total_forks,
81173- nr_running(),
81174- nr_iowait());
81175+ unrestricted ? total_forks : 0UL,
81176+ unrestricted ? nr_running() : 0UL,
81177+ unrestricted ? nr_iowait() : 0UL);
81178
81179 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
81180
81181diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
81182index 6dee68d..1b4add0 100644
81183--- a/fs/proc/task_mmu.c
81184+++ b/fs/proc/task_mmu.c
81185@@ -13,12 +13,19 @@
81186 #include <linux/swap.h>
81187 #include <linux/swapops.h>
81188 #include <linux/mmu_notifier.h>
81189+#include <linux/grsecurity.h>
81190
81191 #include <asm/elf.h>
81192 #include <asm/uaccess.h>
81193 #include <asm/tlbflush.h>
81194 #include "internal.h"
81195
81196+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81197+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
81198+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
81199+ _mm->pax_flags & MF_PAX_SEGMEXEC))
81200+#endif
81201+
81202 void task_mem(struct seq_file *m, struct mm_struct *mm)
81203 {
81204 unsigned long data, text, lib, swap, ptes, pmds;
81205@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81206 "VmLib:\t%8lu kB\n"
81207 "VmPTE:\t%8lu kB\n"
81208 "VmPMD:\t%8lu kB\n"
81209- "VmSwap:\t%8lu kB\n",
81210- hiwater_vm << (PAGE_SHIFT-10),
81211+ "VmSwap:\t%8lu kB\n"
81212+
81213+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
81214+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
81215+#endif
81216+
81217+ ,hiwater_vm << (PAGE_SHIFT-10),
81218 total_vm << (PAGE_SHIFT-10),
81219 mm->locked_vm << (PAGE_SHIFT-10),
81220 mm->pinned_vm << (PAGE_SHIFT-10),
81221@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81222 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
81223 ptes >> 10,
81224 pmds >> 10,
81225- swap << (PAGE_SHIFT-10));
81226+ swap << (PAGE_SHIFT-10)
81227+
81228+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
81229+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81230+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
81231+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
81232+#else
81233+ , mm->context.user_cs_base
81234+ , mm->context.user_cs_limit
81235+#endif
81236+#endif
81237+
81238+ );
81239 }
81240
81241 unsigned long task_vsize(struct mm_struct *mm)
81242@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81243 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
81244 }
81245
81246- /* We don't show the stack guard page in /proc/maps */
81247+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81248+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
81249+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
81250+#else
81251 start = vma->vm_start;
81252- if (stack_guard_page_start(vma, start))
81253- start += PAGE_SIZE;
81254 end = vma->vm_end;
81255- if (stack_guard_page_end(vma, end))
81256- end -= PAGE_SIZE;
81257+#endif
81258
81259 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
81260 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
81261@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81262 flags & VM_WRITE ? 'w' : '-',
81263 flags & VM_EXEC ? 'x' : '-',
81264 flags & VM_MAYSHARE ? 's' : 'p',
81265+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81266+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
81267+#else
81268 pgoff,
81269+#endif
81270 MAJOR(dev), MINOR(dev), ino);
81271
81272 /*
81273@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81274 */
81275 if (file) {
81276 seq_pad(m, ' ');
81277- seq_path(m, &file->f_path, "\n");
81278+ seq_path(m, &file->f_path, "\n\\");
81279 goto done;
81280 }
81281
81282@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
81283 * Thread stack in /proc/PID/task/TID/maps or
81284 * the main process stack.
81285 */
81286- if (!is_pid || (vma->vm_start <= mm->start_stack &&
81287- vma->vm_end >= mm->start_stack)) {
81288+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
81289+ (vma->vm_start <= mm->start_stack &&
81290+ vma->vm_end >= mm->start_stack)) {
81291 name = "[stack]";
81292 } else {
81293 /* Thread stack in /proc/PID/maps */
81294@@ -362,6 +391,12 @@ done:
81295
81296 static int show_map(struct seq_file *m, void *v, int is_pid)
81297 {
81298+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81299+ if (current->exec_id != m->exec_id) {
81300+ gr_log_badprocpid("maps");
81301+ return 0;
81302+ }
81303+#endif
81304 show_map_vma(m, v, is_pid);
81305 m_cache_vma(m, v);
81306 return 0;
81307@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
81308 .private = &mss,
81309 };
81310
81311+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81312+ if (current->exec_id != m->exec_id) {
81313+ gr_log_badprocpid("smaps");
81314+ return 0;
81315+ }
81316+#endif
81317 memset(&mss, 0, sizeof mss);
81318- /* mmap_sem is held in m_start */
81319- walk_page_vma(vma, &smaps_walk);
81320+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81321+ if (!PAX_RAND_FLAGS(vma->vm_mm))
81322+#endif
81323+ /* mmap_sem is held in m_start */
81324+ walk_page_vma(vma, &smaps_walk);
81325
81326 show_map_vma(m, vma, is_pid);
81327
81328@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
81329 "KernelPageSize: %8lu kB\n"
81330 "MMUPageSize: %8lu kB\n"
81331 "Locked: %8lu kB\n",
81332+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81333+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
81334+#else
81335 (vma->vm_end - vma->vm_start) >> 10,
81336+#endif
81337 mss.resident >> 10,
81338 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
81339 mss.shared_clean >> 10,
81340@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
81341 char buffer[64];
81342 int nid;
81343
81344+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81345+ if (current->exec_id != m->exec_id) {
81346+ gr_log_badprocpid("numa_maps");
81347+ return 0;
81348+ }
81349+#endif
81350+
81351 if (!mm)
81352 return 0;
81353
81354@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
81355 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
81356 }
81357
81358+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81359+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
81360+#else
81361 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
81362+#endif
81363
81364 if (file) {
81365 seq_puts(m, " file=");
81366- seq_path(m, &file->f_path, "\n\t= ");
81367+ seq_path(m, &file->f_path, "\n\t\\= ");
81368 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
81369 seq_puts(m, " heap");
81370 } else {
81371diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
81372index 599ec2e..f1413ae 100644
81373--- a/fs/proc/task_nommu.c
81374+++ b/fs/proc/task_nommu.c
81375@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
81376 else
81377 bytes += kobjsize(mm);
81378
81379- if (current->fs && current->fs->users > 1)
81380+ if (current->fs && atomic_read(&current->fs->users) > 1)
81381 sbytes += kobjsize(current->fs);
81382 else
81383 bytes += kobjsize(current->fs);
81384@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
81385
81386 if (file) {
81387 seq_pad(m, ' ');
81388- seq_path(m, &file->f_path, "");
81389+ seq_path(m, &file->f_path, "\n\\");
81390 } else if (mm) {
81391 pid_t tid = pid_of_stack(priv, vma, is_pid);
81392
81393diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
81394index 4e61388..1a2523d 100644
81395--- a/fs/proc/vmcore.c
81396+++ b/fs/proc/vmcore.c
81397@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
81398 nr_bytes = count;
81399
81400 /* If pfn is not ram, return zeros for sparse dump files */
81401- if (pfn_is_ram(pfn) == 0)
81402- memset(buf, 0, nr_bytes);
81403- else {
81404+ if (pfn_is_ram(pfn) == 0) {
81405+ if (userbuf) {
81406+ if (clear_user((char __force_user *)buf, nr_bytes))
81407+ return -EFAULT;
81408+ } else
81409+ memset(buf, 0, nr_bytes);
81410+ } else {
81411 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
81412 offset, userbuf);
81413 if (tmp < 0)
81414@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
81415 static int copy_to(void *target, void *src, size_t size, int userbuf)
81416 {
81417 if (userbuf) {
81418- if (copy_to_user((char __user *) target, src, size))
81419+ if (copy_to_user((char __force_user *) target, src, size))
81420 return -EFAULT;
81421 } else {
81422 memcpy(target, src, size);
81423@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
81424 if (*fpos < m->offset + m->size) {
81425 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
81426 start = m->paddr + *fpos - m->offset;
81427- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
81428+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
81429 if (tmp < 0)
81430 return tmp;
81431 buflen -= tsz;
81432@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
81433 static ssize_t read_vmcore(struct file *file, char __user *buffer,
81434 size_t buflen, loff_t *fpos)
81435 {
81436- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
81437+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
81438 }
81439
81440 /*
81441diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
81442index d3fb2b6..43a8140 100644
81443--- a/fs/qnx6/qnx6.h
81444+++ b/fs/qnx6/qnx6.h
81445@@ -74,7 +74,7 @@ enum {
81446 BYTESEX_BE,
81447 };
81448
81449-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
81450+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
81451 {
81452 if (sbi->s_bytesex == BYTESEX_LE)
81453 return le64_to_cpu((__force __le64)n);
81454@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
81455 return (__force __fs64)cpu_to_be64(n);
81456 }
81457
81458-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
81459+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
81460 {
81461 if (sbi->s_bytesex == BYTESEX_LE)
81462 return le32_to_cpu((__force __le32)n);
81463diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
81464index bb2869f..d34ada8 100644
81465--- a/fs/quota/netlink.c
81466+++ b/fs/quota/netlink.c
81467@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
81468 void quota_send_warning(struct kqid qid, dev_t dev,
81469 const char warntype)
81470 {
81471- static atomic_t seq;
81472+ static atomic_unchecked_t seq;
81473 struct sk_buff *skb;
81474 void *msg_head;
81475 int ret;
81476@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
81477 "VFS: Not enough memory to send quota warning.\n");
81478 return;
81479 }
81480- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
81481+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
81482 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
81483 if (!msg_head) {
81484 printk(KERN_ERR
81485diff --git a/fs/read_write.c b/fs/read_write.c
81486index 819ef3f..f07222d 100644
81487--- a/fs/read_write.c
81488+++ b/fs/read_write.c
81489@@ -505,7 +505,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
81490
81491 old_fs = get_fs();
81492 set_fs(get_ds());
81493- p = (__force const char __user *)buf;
81494+ p = (const char __force_user *)buf;
81495 if (count > MAX_RW_COUNT)
81496 count = MAX_RW_COUNT;
81497 ret = __vfs_write(file, p, count, pos);
81498diff --git a/fs/readdir.c b/fs/readdir.c
81499index ced6791..936687b 100644
81500--- a/fs/readdir.c
81501+++ b/fs/readdir.c
81502@@ -18,6 +18,7 @@
81503 #include <linux/security.h>
81504 #include <linux/syscalls.h>
81505 #include <linux/unistd.h>
81506+#include <linux/namei.h>
81507
81508 #include <asm/uaccess.h>
81509
81510@@ -71,6 +72,7 @@ struct old_linux_dirent {
81511 struct readdir_callback {
81512 struct dir_context ctx;
81513 struct old_linux_dirent __user * dirent;
81514+ struct file * file;
81515 int result;
81516 };
81517
81518@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
81519 buf->result = -EOVERFLOW;
81520 return -EOVERFLOW;
81521 }
81522+
81523+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81524+ return 0;
81525+
81526 buf->result++;
81527 dirent = buf->dirent;
81528 if (!access_ok(VERIFY_WRITE, dirent,
81529@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
81530 if (!f.file)
81531 return -EBADF;
81532
81533+ buf.file = f.file;
81534 error = iterate_dir(f.file, &buf.ctx);
81535 if (buf.result)
81536 error = buf.result;
81537@@ -145,6 +152,7 @@ struct getdents_callback {
81538 struct dir_context ctx;
81539 struct linux_dirent __user * current_dir;
81540 struct linux_dirent __user * previous;
81541+ struct file * file;
81542 int count;
81543 int error;
81544 };
81545@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
81546 buf->error = -EOVERFLOW;
81547 return -EOVERFLOW;
81548 }
81549+
81550+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81551+ return 0;
81552+
81553 dirent = buf->previous;
81554 if (dirent) {
81555 if (__put_user(offset, &dirent->d_off))
81556@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
81557 if (!f.file)
81558 return -EBADF;
81559
81560+ buf.file = f.file;
81561 error = iterate_dir(f.file, &buf.ctx);
81562 if (error >= 0)
81563 error = buf.error;
81564@@ -230,6 +243,7 @@ struct getdents_callback64 {
81565 struct dir_context ctx;
81566 struct linux_dirent64 __user * current_dir;
81567 struct linux_dirent64 __user * previous;
81568+ struct file *file;
81569 int count;
81570 int error;
81571 };
81572@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
81573 buf->error = -EINVAL; /* only used if we fail.. */
81574 if (reclen > buf->count)
81575 return -EINVAL;
81576+
81577+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
81578+ return 0;
81579+
81580 dirent = buf->previous;
81581 if (dirent) {
81582 if (__put_user(offset, &dirent->d_off))
81583@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
81584 if (!f.file)
81585 return -EBADF;
81586
81587+ buf.file = f.file;
81588 error = iterate_dir(f.file, &buf.ctx);
81589 if (error >= 0)
81590 error = buf.error;
81591diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
81592index 9c02d96..6562c10 100644
81593--- a/fs/reiserfs/do_balan.c
81594+++ b/fs/reiserfs/do_balan.c
81595@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
81596 return;
81597 }
81598
81599- atomic_inc(&fs_generation(tb->tb_sb));
81600+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
81601 do_balance_starts(tb);
81602
81603 /*
81604diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
81605index aca73dd..e3c558d 100644
81606--- a/fs/reiserfs/item_ops.c
81607+++ b/fs/reiserfs/item_ops.c
81608@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
81609 }
81610
81611 static struct item_operations errcatch_ops = {
81612- errcatch_bytes_number,
81613- errcatch_decrement_key,
81614- errcatch_is_left_mergeable,
81615- errcatch_print_item,
81616- errcatch_check_item,
81617+ .bytes_number = errcatch_bytes_number,
81618+ .decrement_key = errcatch_decrement_key,
81619+ .is_left_mergeable = errcatch_is_left_mergeable,
81620+ .print_item = errcatch_print_item,
81621+ .check_item = errcatch_check_item,
81622
81623- errcatch_create_vi,
81624- errcatch_check_left,
81625- errcatch_check_right,
81626- errcatch_part_size,
81627- errcatch_unit_num,
81628- errcatch_print_vi
81629+ .create_vi = errcatch_create_vi,
81630+ .check_left = errcatch_check_left,
81631+ .check_right = errcatch_check_right,
81632+ .part_size = errcatch_part_size,
81633+ .unit_num = errcatch_unit_num,
81634+ .print_vi = errcatch_print_vi
81635 };
81636
81637 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
81638diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
81639index 621b9f3..af527fd 100644
81640--- a/fs/reiserfs/procfs.c
81641+++ b/fs/reiserfs/procfs.c
81642@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
81643 "SMALL_TAILS " : "NO_TAILS ",
81644 replay_only(sb) ? "REPLAY_ONLY " : "",
81645 convert_reiserfs(sb) ? "CONV " : "",
81646- atomic_read(&r->s_generation_counter),
81647+ atomic_read_unchecked(&r->s_generation_counter),
81648 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
81649 SF(s_do_balance), SF(s_unneeded_left_neighbor),
81650 SF(s_good_search_by_key_reada), SF(s_bmaps),
81651diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
81652index 2adcde1..7d27bc8 100644
81653--- a/fs/reiserfs/reiserfs.h
81654+++ b/fs/reiserfs/reiserfs.h
81655@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
81656 /* Comment? -Hans */
81657 wait_queue_head_t s_wait;
81658 /* increased by one every time the tree gets re-balanced */
81659- atomic_t s_generation_counter;
81660+ atomic_unchecked_t s_generation_counter;
81661
81662 /* File system properties. Currently holds on-disk FS format */
81663 unsigned long s_properties;
81664@@ -2300,7 +2300,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
81665 #define REISERFS_USER_MEM 1 /* user memory mode */
81666
81667 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
81668-#define get_generation(s) atomic_read (&fs_generation(s))
81669+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
81670 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
81671 #define __fs_changed(gen,s) (gen != get_generation (s))
81672 #define fs_changed(gen,s) \
81673diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
81674index 0111ad0..00f4749 100644
81675--- a/fs/reiserfs/super.c
81676+++ b/fs/reiserfs/super.c
81677@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
81678 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
81679 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
81680 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
81681+#ifdef CONFIG_REISERFS_FS_XATTR
81682+ /* turn on user xattrs by default */
81683+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
81684+#endif
81685 /* no preallocation minimum, be smart in reiserfs_file_write instead */
81686 sbi->s_alloc_options.preallocmin = 0;
81687 /* Preallocate by 16 blocks (17-1) at once */
81688diff --git a/fs/select.c b/fs/select.c
81689index f684c75..4117611 100644
81690--- a/fs/select.c
81691+++ b/fs/select.c
81692@@ -20,6 +20,7 @@
81693 #include <linux/export.h>
81694 #include <linux/slab.h>
81695 #include <linux/poll.h>
81696+#include <linux/security.h>
81697 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
81698 #include <linux/file.h>
81699 #include <linux/fdtable.h>
81700@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
81701 struct poll_list *walk = head;
81702 unsigned long todo = nfds;
81703
81704+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
81705 if (nfds > rlimit(RLIMIT_NOFILE))
81706 return -EINVAL;
81707
81708diff --git a/fs/seq_file.c b/fs/seq_file.c
81709index 555f821..02a990b 100644
81710--- a/fs/seq_file.c
81711+++ b/fs/seq_file.c
81712@@ -12,6 +12,8 @@
81713 #include <linux/slab.h>
81714 #include <linux/cred.h>
81715 #include <linux/mm.h>
81716+#include <linux/sched.h>
81717+#include <linux/grsecurity.h>
81718
81719 #include <asm/uaccess.h>
81720 #include <asm/page.h>
81721@@ -29,9 +31,9 @@ static void *seq_buf_alloc(unsigned long size)
81722 * __GFP_NORETRY to avoid oom-killings with high-order allocations -
81723 * it's better to fall back to vmalloc() than to kill things.
81724 */
81725- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
81726+ buf = kmalloc(size, GFP_KERNEL | GFP_USERCOPY | __GFP_NORETRY | __GFP_NOWARN);
81727 if (!buf && size > PAGE_SIZE)
81728- buf = vmalloc(size);
81729+ buf = vmalloc_usercopy(size);
81730 return buf;
81731 }
81732
81733@@ -65,6 +67,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
81734 #ifdef CONFIG_USER_NS
81735 p->user_ns = file->f_cred->user_ns;
81736 #endif
81737+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
81738+ p->exec_id = current->exec_id;
81739+#endif
81740
81741 /*
81742 * Wrappers around seq_open(e.g. swaps_open) need to be
81743@@ -87,6 +92,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
81744 }
81745 EXPORT_SYMBOL(seq_open);
81746
81747+
81748+int seq_open_restrict(struct file *file, const struct seq_operations *op)
81749+{
81750+ if (gr_proc_is_restricted())
81751+ return -EACCES;
81752+
81753+ return seq_open(file, op);
81754+}
81755+EXPORT_SYMBOL(seq_open_restrict);
81756+
81757 static int traverse(struct seq_file *m, loff_t offset)
81758 {
81759 loff_t pos = 0, index;
81760@@ -158,7 +173,7 @@ Eoverflow:
81761 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
81762 {
81763 struct seq_file *m = file->private_data;
81764- size_t copied = 0;
81765+ ssize_t copied = 0;
81766 loff_t pos;
81767 size_t n;
81768 void *p;
81769@@ -557,7 +572,7 @@ static void single_stop(struct seq_file *p, void *v)
81770 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
81771 void *data)
81772 {
81773- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
81774+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
81775 int res = -ENOMEM;
81776
81777 if (op) {
81778@@ -593,6 +608,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
81779 }
81780 EXPORT_SYMBOL(single_open_size);
81781
81782+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
81783+ void *data)
81784+{
81785+ if (gr_proc_is_restricted())
81786+ return -EACCES;
81787+
81788+ return single_open(file, show, data);
81789+}
81790+EXPORT_SYMBOL(single_open_restrict);
81791+
81792+
81793 int single_release(struct inode *inode, struct file *file)
81794 {
81795 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
81796diff --git a/fs/splice.c b/fs/splice.c
81797index bfe62ae..a84920d 100644
81798--- a/fs/splice.c
81799+++ b/fs/splice.c
81800@@ -192,7 +192,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81801 pipe_lock(pipe);
81802
81803 for (;;) {
81804- if (!pipe->readers) {
81805+ if (!atomic_read(&pipe->readers)) {
81806 send_sig(SIGPIPE, current, 0);
81807 if (!ret)
81808 ret = -EPIPE;
81809@@ -215,7 +215,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81810 page_nr++;
81811 ret += buf->len;
81812
81813- if (pipe->files)
81814+ if (atomic_read(&pipe->files))
81815 do_wakeup = 1;
81816
81817 if (!--spd->nr_pages)
81818@@ -246,9 +246,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
81819 do_wakeup = 0;
81820 }
81821
81822- pipe->waiting_writers++;
81823+ atomic_inc(&pipe->waiting_writers);
81824 pipe_wait(pipe);
81825- pipe->waiting_writers--;
81826+ atomic_dec(&pipe->waiting_writers);
81827 }
81828
81829 pipe_unlock(pipe);
81830@@ -578,7 +578,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
81831 old_fs = get_fs();
81832 set_fs(get_ds());
81833 /* The cast to a user pointer is valid due to the set_fs() */
81834- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
81835+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
81836 set_fs(old_fs);
81837
81838 return res;
81839@@ -593,7 +593,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
81840 old_fs = get_fs();
81841 set_fs(get_ds());
81842 /* The cast to a user pointer is valid due to the set_fs() */
81843- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
81844+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
81845 set_fs(old_fs);
81846
81847 return res;
81848@@ -646,7 +646,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
81849 goto err;
81850
81851 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
81852- vec[i].iov_base = (void __user *) page_address(page);
81853+ vec[i].iov_base = (void __force_user *) page_address(page);
81854 vec[i].iov_len = this_len;
81855 spd.pages[i] = page;
81856 spd.nr_pages++;
81857@@ -785,7 +785,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
81858 ops->release(pipe, buf);
81859 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
81860 pipe->nrbufs--;
81861- if (pipe->files)
81862+ if (atomic_read(&pipe->files))
81863 sd->need_wakeup = true;
81864 }
81865
81866@@ -809,10 +809,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
81867 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
81868 {
81869 while (!pipe->nrbufs) {
81870- if (!pipe->writers)
81871+ if (!atomic_read(&pipe->writers))
81872 return 0;
81873
81874- if (!pipe->waiting_writers && sd->num_spliced)
81875+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
81876 return 0;
81877
81878 if (sd->flags & SPLICE_F_NONBLOCK)
81879@@ -1027,7 +1027,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
81880 ops->release(pipe, buf);
81881 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
81882 pipe->nrbufs--;
81883- if (pipe->files)
81884+ if (atomic_read(&pipe->files))
81885 sd.need_wakeup = true;
81886 } else {
81887 buf->offset += ret;
81888@@ -1187,7 +1187,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
81889 * out of the pipe right after the splice_to_pipe(). So set
81890 * PIPE_READERS appropriately.
81891 */
81892- pipe->readers = 1;
81893+ atomic_set(&pipe->readers, 1);
81894
81895 current->splice_pipe = pipe;
81896 }
81897@@ -1494,6 +1494,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
81898
81899 partial[buffers].offset = off;
81900 partial[buffers].len = plen;
81901+ partial[buffers].private = 0;
81902
81903 off = 0;
81904 len -= plen;
81905@@ -1725,9 +1726,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
81906 ret = -ERESTARTSYS;
81907 break;
81908 }
81909- if (!pipe->writers)
81910+ if (!atomic_read(&pipe->writers))
81911 break;
81912- if (!pipe->waiting_writers) {
81913+ if (!atomic_read(&pipe->waiting_writers)) {
81914 if (flags & SPLICE_F_NONBLOCK) {
81915 ret = -EAGAIN;
81916 break;
81917@@ -1759,7 +1760,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
81918 pipe_lock(pipe);
81919
81920 while (pipe->nrbufs >= pipe->buffers) {
81921- if (!pipe->readers) {
81922+ if (!atomic_read(&pipe->readers)) {
81923 send_sig(SIGPIPE, current, 0);
81924 ret = -EPIPE;
81925 break;
81926@@ -1772,9 +1773,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
81927 ret = -ERESTARTSYS;
81928 break;
81929 }
81930- pipe->waiting_writers++;
81931+ atomic_inc(&pipe->waiting_writers);
81932 pipe_wait(pipe);
81933- pipe->waiting_writers--;
81934+ atomic_dec(&pipe->waiting_writers);
81935 }
81936
81937 pipe_unlock(pipe);
81938@@ -1810,14 +1811,14 @@ retry:
81939 pipe_double_lock(ipipe, opipe);
81940
81941 do {
81942- if (!opipe->readers) {
81943+ if (!atomic_read(&opipe->readers)) {
81944 send_sig(SIGPIPE, current, 0);
81945 if (!ret)
81946 ret = -EPIPE;
81947 break;
81948 }
81949
81950- if (!ipipe->nrbufs && !ipipe->writers)
81951+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
81952 break;
81953
81954 /*
81955@@ -1914,7 +1915,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
81956 pipe_double_lock(ipipe, opipe);
81957
81958 do {
81959- if (!opipe->readers) {
81960+ if (!atomic_read(&opipe->readers)) {
81961 send_sig(SIGPIPE, current, 0);
81962 if (!ret)
81963 ret = -EPIPE;
81964@@ -1959,7 +1960,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
81965 * return EAGAIN if we have the potential of some data in the
81966 * future, otherwise just return 0
81967 */
81968- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
81969+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
81970 ret = -EAGAIN;
81971
81972 pipe_unlock(ipipe);
81973diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
81974index e5e0ddf..09598c4 100644
81975--- a/fs/squashfs/xattr.c
81976+++ b/fs/squashfs/xattr.c
81977@@ -46,8 +46,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
81978 + msblk->xattr_table;
81979 int offset = SQUASHFS_XATTR_OFFSET(squashfs_i(inode)->xattr);
81980 int count = squashfs_i(inode)->xattr_count;
81981- size_t rest = buffer_size;
81982- int err;
81983+ size_t used = 0;
81984+ ssize_t err;
81985
81986 /* check that the file system has xattrs */
81987 if (msblk->xattr_id_table == NULL)
81988@@ -68,11 +68,11 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
81989 name_size = le16_to_cpu(entry.size);
81990 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
81991 if (handler)
81992- prefix_size = handler->list(d, buffer, rest, NULL,
81993+ prefix_size = handler->list(d, buffer, buffer ? buffer_size - used : 0, NULL,
81994 name_size, handler->flags);
81995 if (prefix_size) {
81996 if (buffer) {
81997- if (prefix_size + name_size + 1 > rest) {
81998+ if (prefix_size + name_size + 1 > buffer_size - used) {
81999 err = -ERANGE;
82000 goto failed;
82001 }
82002@@ -86,7 +86,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
82003 buffer[name_size] = '\0';
82004 buffer += name_size + 1;
82005 }
82006- rest -= prefix_size + name_size + 1;
82007+ used += prefix_size + name_size + 1;
82008 } else {
82009 /* no handler or insuffficient privileges, so skip */
82010 err = squashfs_read_metadata(sb, NULL, &start,
82011@@ -107,7 +107,7 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
82012 if (err < 0)
82013 goto failed;
82014 }
82015- err = buffer_size - rest;
82016+ err = used;
82017
82018 failed:
82019 return err;
82020diff --git a/fs/stat.c b/fs/stat.c
82021index cccc1aa..7fe8951 100644
82022--- a/fs/stat.c
82023+++ b/fs/stat.c
82024@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
82025 stat->gid = inode->i_gid;
82026 stat->rdev = inode->i_rdev;
82027 stat->size = i_size_read(inode);
82028- stat->atime = inode->i_atime;
82029- stat->mtime = inode->i_mtime;
82030+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
82031+ stat->atime = inode->i_ctime;
82032+ stat->mtime = inode->i_ctime;
82033+ } else {
82034+ stat->atime = inode->i_atime;
82035+ stat->mtime = inode->i_mtime;
82036+ }
82037 stat->ctime = inode->i_ctime;
82038 stat->blksize = (1 << inode->i_blkbits);
82039 stat->blocks = inode->i_blocks;
82040@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
82041 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
82042 {
82043 struct inode *inode = d_backing_inode(path->dentry);
82044+ int retval;
82045
82046- if (inode->i_op->getattr)
82047- return inode->i_op->getattr(path->mnt, path->dentry, stat);
82048+ if (inode->i_op->getattr) {
82049+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
82050+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
82051+ stat->atime = stat->ctime;
82052+ stat->mtime = stat->ctime;
82053+ }
82054+ return retval;
82055+ }
82056
82057 generic_fillattr(inode, stat);
82058 return 0;
82059diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
82060index 94374e4..b5da3a1 100644
82061--- a/fs/sysfs/dir.c
82062+++ b/fs/sysfs/dir.c
82063@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
82064 kfree(buf);
82065 }
82066
82067+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
82068+extern int grsec_enable_sysfs_restrict;
82069+#endif
82070+
82071 /**
82072 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
82073 * @kobj: object we're creating directory for
82074@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
82075 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
82076 {
82077 struct kernfs_node *parent, *kn;
82078+ const char *name;
82079+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
82080+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
82081+ const char *parent_name;
82082+#endif
82083
82084 BUG_ON(!kobj);
82085
82086+ name = kobject_name(kobj);
82087+
82088 if (kobj->parent)
82089 parent = kobj->parent->sd;
82090 else
82091@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
82092 if (!parent)
82093 return -ENOENT;
82094
82095- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
82096- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
82097+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
82098+ parent_name = parent->name;
82099+ mode = S_IRWXU;
82100+
82101+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
82102+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
82103+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
82104+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
82105+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
82106+ if (!grsec_enable_sysfs_restrict)
82107+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
82108+#endif
82109+
82110+ kn = kernfs_create_dir_ns(parent, name,
82111+ mode, kobj, ns);
82112 if (IS_ERR(kn)) {
82113 if (PTR_ERR(kn) == -EEXIST)
82114- sysfs_warn_dup(parent, kobject_name(kobj));
82115+ sysfs_warn_dup(parent, name);
82116 return PTR_ERR(kn);
82117 }
82118
82119diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
82120index 69d4889..a810bd4 100644
82121--- a/fs/sysv/sysv.h
82122+++ b/fs/sysv/sysv.h
82123@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
82124 #endif
82125 }
82126
82127-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
82128+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
82129 {
82130 if (sbi->s_bytesex == BYTESEX_PDP)
82131 return PDP_swab((__force __u32)n);
82132diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
82133index a43df11..c368e71 100644
82134--- a/fs/tracefs/inode.c
82135+++ b/fs/tracefs/inode.c
82136@@ -53,7 +53,7 @@ static const struct file_operations tracefs_file_operations = {
82137 static struct tracefs_dir_ops {
82138 int (*mkdir)(const char *name);
82139 int (*rmdir)(const char *name);
82140-} tracefs_ops;
82141+} __no_const tracefs_ops __read_only;
82142
82143 static char *get_dname(struct dentry *dentry)
82144 {
82145@@ -490,8 +490,10 @@ struct dentry *tracefs_create_instance_dir(const char *name, struct dentry *pare
82146 if (!dentry)
82147 return NULL;
82148
82149- tracefs_ops.mkdir = mkdir;
82150- tracefs_ops.rmdir = rmdir;
82151+ pax_open_kernel();
82152+ *(void **)&tracefs_ops.mkdir = mkdir;
82153+ *(void **)&tracefs_ops.rmdir = rmdir;
82154+ pax_close_kernel();
82155
82156 return dentry;
82157 }
82158diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
82159index 97be412..974b37f 100644
82160--- a/fs/ubifs/io.c
82161+++ b/fs/ubifs/io.c
82162@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
82163 return err;
82164 }
82165
82166-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
82167+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
82168 {
82169 int err;
82170
82171diff --git a/fs/udf/misc.c b/fs/udf/misc.c
82172index 71d1c25..084e2ad 100644
82173--- a/fs/udf/misc.c
82174+++ b/fs/udf/misc.c
82175@@ -288,7 +288,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
82176
82177 u8 udf_tag_checksum(const struct tag *t)
82178 {
82179- u8 *data = (u8 *)t;
82180+ const u8 *data = (const u8 *)t;
82181 u8 checksum = 0;
82182 int i;
82183 for (i = 0; i < sizeof(struct tag); ++i)
82184diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
82185index 8d974c4..b82f6ec 100644
82186--- a/fs/ufs/swab.h
82187+++ b/fs/ufs/swab.h
82188@@ -22,7 +22,7 @@ enum {
82189 BYTESEX_BE
82190 };
82191
82192-static inline u64
82193+static inline u64 __intentional_overflow(-1)
82194 fs64_to_cpu(struct super_block *sbp, __fs64 n)
82195 {
82196 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
82197@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
82198 return (__force __fs64)cpu_to_be64(n);
82199 }
82200
82201-static inline u32
82202+static inline u32 __intentional_overflow(-1)
82203 fs32_to_cpu(struct super_block *sbp, __fs32 n)
82204 {
82205 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
82206diff --git a/fs/utimes.c b/fs/utimes.c
82207index aa138d6..5f3a811 100644
82208--- a/fs/utimes.c
82209+++ b/fs/utimes.c
82210@@ -1,6 +1,7 @@
82211 #include <linux/compiler.h>
82212 #include <linux/file.h>
82213 #include <linux/fs.h>
82214+#include <linux/security.h>
82215 #include <linux/linkage.h>
82216 #include <linux/mount.h>
82217 #include <linux/namei.h>
82218@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
82219 }
82220 }
82221 retry_deleg:
82222+
82223+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
82224+ error = -EACCES;
82225+ goto mnt_drop_write_and_out;
82226+ }
82227+
82228 mutex_lock(&inode->i_mutex);
82229 error = notify_change(path->dentry, &newattrs, &delegated_inode);
82230 mutex_unlock(&inode->i_mutex);
82231diff --git a/fs/xattr.c b/fs/xattr.c
82232index 4ef6985..a6cd6567 100644
82233--- a/fs/xattr.c
82234+++ b/fs/xattr.c
82235@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
82236 return rc;
82237 }
82238
82239+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
82240+ssize_t
82241+pax_getxattr(struct dentry *dentry, void *value, size_t size)
82242+{
82243+ struct inode *inode = dentry->d_inode;
82244+ ssize_t error;
82245+
82246+ error = inode_permission(inode, MAY_EXEC);
82247+ if (error)
82248+ return error;
82249+
82250+ if (inode->i_op->getxattr)
82251+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
82252+ else
82253+ error = -EOPNOTSUPP;
82254+
82255+ return error;
82256+}
82257+EXPORT_SYMBOL(pax_getxattr);
82258+#endif
82259+
82260 ssize_t
82261 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
82262 {
82263@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
82264 * Extended attribute SET operations
82265 */
82266 static long
82267-setxattr(struct dentry *d, const char __user *name, const void __user *value,
82268+setxattr(struct path *path, const char __user *name, const void __user *value,
82269 size_t size, int flags)
82270 {
82271 int error;
82272@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
82273 posix_acl_fix_xattr_from_user(kvalue, size);
82274 }
82275
82276- error = vfs_setxattr(d, kname, kvalue, size, flags);
82277+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
82278+ error = -EACCES;
82279+ goto out;
82280+ }
82281+
82282+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
82283 out:
82284 if (vvalue)
82285 vfree(vvalue);
82286@@ -376,7 +402,7 @@ retry:
82287 return error;
82288 error = mnt_want_write(path.mnt);
82289 if (!error) {
82290- error = setxattr(path.dentry, name, value, size, flags);
82291+ error = setxattr(&path, name, value, size, flags);
82292 mnt_drop_write(path.mnt);
82293 }
82294 path_put(&path);
82295@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
82296 audit_file(f.file);
82297 error = mnt_want_write_file(f.file);
82298 if (!error) {
82299- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
82300+ error = setxattr(&f.file->f_path, name, value, size, flags);
82301 mnt_drop_write_file(f.file);
82302 }
82303 fdput(f);
82304@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
82305 * Extended attribute REMOVE operations
82306 */
82307 static long
82308-removexattr(struct dentry *d, const char __user *name)
82309+removexattr(struct path *path, const char __user *name)
82310 {
82311 int error;
82312 char kname[XATTR_NAME_MAX + 1];
82313@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
82314 if (error < 0)
82315 return error;
82316
82317- return vfs_removexattr(d, kname);
82318+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
82319+ return -EACCES;
82320+
82321+ return vfs_removexattr(path->dentry, kname);
82322 }
82323
82324 static int path_removexattr(const char __user *pathname,
82325@@ -623,7 +652,7 @@ retry:
82326 return error;
82327 error = mnt_want_write(path.mnt);
82328 if (!error) {
82329- error = removexattr(path.dentry, name);
82330+ error = removexattr(&path, name);
82331 mnt_drop_write(path.mnt);
82332 }
82333 path_put(&path);
82334@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
82335 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
82336 {
82337 struct fd f = fdget(fd);
82338+ struct path *path;
82339 int error = -EBADF;
82340
82341 if (!f.file)
82342 return error;
82343+ path = &f.file->f_path;
82344 audit_file(f.file);
82345 error = mnt_want_write_file(f.file);
82346 if (!error) {
82347- error = removexattr(f.file->f_path.dentry, name);
82348+ error = removexattr(path, name);
82349 mnt_drop_write_file(f.file);
82350 }
82351 fdput(f);
82352diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
82353index f1026e8..a0fbe4f 100644
82354--- a/fs/xfs/libxfs/xfs_bmap.c
82355+++ b/fs/xfs/libxfs/xfs_bmap.c
82356@@ -554,7 +554,7 @@ xfs_bmap_validate_ret(
82357
82358 #else
82359 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
82360-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
82361+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
82362 #endif /* DEBUG */
82363
82364 /*
82365diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
82366index 098cd78..724d3f8 100644
82367--- a/fs/xfs/xfs_dir2_readdir.c
82368+++ b/fs/xfs/xfs_dir2_readdir.c
82369@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
82370 ino = dp->d_ops->sf_get_ino(sfp, sfep);
82371 filetype = dp->d_ops->sf_get_ftype(sfep);
82372 ctx->pos = off & 0x7fffffff;
82373- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
82374+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
82375+ char name[sfep->namelen];
82376+ memcpy(name, sfep->name, sfep->namelen);
82377+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
82378+ return 0;
82379+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
82380 xfs_dir3_get_dtype(dp->i_mount, filetype)))
82381 return 0;
82382 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
82383diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
82384index 87f67c6..7e335bf 100644
82385--- a/fs/xfs/xfs_ioctl.c
82386+++ b/fs/xfs/xfs_ioctl.c
82387@@ -120,7 +120,7 @@ xfs_find_handle(
82388 }
82389
82390 error = -EFAULT;
82391- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
82392+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
82393 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
82394 goto out_put;
82395
82396diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
82397index 7c7842c..ce15222 100644
82398--- a/fs/xfs/xfs_linux.h
82399+++ b/fs/xfs/xfs_linux.h
82400@@ -225,7 +225,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
82401 * of the compiler which do not like us using do_div in the middle
82402 * of large functions.
82403 */
82404-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
82405+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
82406 {
82407 __u32 mod;
82408
82409@@ -281,7 +281,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
82410 return 0;
82411 }
82412 #else
82413-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
82414+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
82415 {
82416 __u32 mod;
82417
82418diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
82419new file mode 100644
82420index 0000000..31f8fe4
82421--- /dev/null
82422+++ b/grsecurity/Kconfig
82423@@ -0,0 +1,1182 @@
82424+#
82425+# grecurity configuration
82426+#
82427+menu "Memory Protections"
82428+depends on GRKERNSEC
82429+
82430+config GRKERNSEC_KMEM
82431+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
82432+ default y if GRKERNSEC_CONFIG_AUTO
82433+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
82434+ help
82435+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
82436+ be written to or read from to modify or leak the contents of the running
82437+ kernel. /dev/port will also not be allowed to be opened, writing to
82438+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
82439+ If you have module support disabled, enabling this will close up several
82440+ ways that are currently used to insert malicious code into the running
82441+ kernel.
82442+
82443+ Even with this feature enabled, we still highly recommend that
82444+ you use the RBAC system, as it is still possible for an attacker to
82445+ modify the running kernel through other more obscure methods.
82446+
82447+ It is highly recommended that you say Y here if you meet all the
82448+ conditions above.
82449+
82450+config GRKERNSEC_VM86
82451+ bool "Restrict VM86 mode"
82452+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82453+ depends on X86_32
82454+
82455+ help
82456+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
82457+ make use of a special execution mode on 32bit x86 processors called
82458+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
82459+ video cards and will still work with this option enabled. The purpose
82460+ of the option is to prevent exploitation of emulation errors in
82461+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
82462+ Nearly all users should be able to enable this option.
82463+
82464+config GRKERNSEC_IO
82465+ bool "Disable privileged I/O"
82466+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82467+ depends on X86
82468+ select RTC_CLASS
82469+ select RTC_INTF_DEV
82470+ select RTC_DRV_CMOS
82471+
82472+ help
82473+ If you say Y here, all ioperm and iopl calls will return an error.
82474+ Ioperm and iopl can be used to modify the running kernel.
82475+ Unfortunately, some programs need this access to operate properly,
82476+ the most notable of which are XFree86 and hwclock. hwclock can be
82477+ remedied by having RTC support in the kernel, so real-time
82478+ clock support is enabled if this option is enabled, to ensure
82479+ that hwclock operates correctly. If hwclock still does not work,
82480+ either update udev or symlink /dev/rtc to /dev/rtc0.
82481+
82482+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
82483+ you may not be able to boot into a graphical environment with this
82484+ option enabled. In this case, you should use the RBAC system instead.
82485+
82486+config GRKERNSEC_BPF_HARDEN
82487+ bool "Harden BPF interpreter"
82488+ default y if GRKERNSEC_CONFIG_AUTO
82489+ help
82490+ Unlike previous versions of grsecurity that hardened both the BPF
82491+ interpreted code against corruption at rest as well as the JIT code
82492+ against JIT-spray attacks and attacker-controlled immediate values
82493+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
82494+ and will ensure the interpreted code is read-only at rest. This feature
82495+ may be removed at a later time when eBPF stabilizes to entirely revert
82496+ back to the more secure pre-3.16 BPF interpreter/JIT.
82497+
82498+ If you're using KERNEXEC, it's recommended that you enable this option
82499+ to supplement the hardening of the kernel.
82500+
82501+config GRKERNSEC_PERF_HARDEN
82502+ bool "Disable unprivileged PERF_EVENTS usage by default"
82503+ default y if GRKERNSEC_CONFIG_AUTO
82504+ depends on PERF_EVENTS
82505+ help
82506+ If you say Y here, the range of acceptable values for the
82507+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
82508+ default to a new value: 3. When the sysctl is set to this value, no
82509+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
82510+
82511+ Though PERF_EVENTS can be used legitimately for performance monitoring
82512+ and low-level application profiling, it is forced on regardless of
82513+ configuration, has been at fault for several vulnerabilities, and
82514+ creates new opportunities for side channels and other information leaks.
82515+
82516+ This feature puts PERF_EVENTS into a secure default state and permits
82517+ the administrator to change out of it temporarily if unprivileged
82518+ application profiling is needed.
82519+
82520+config GRKERNSEC_RAND_THREADSTACK
82521+ bool "Insert random gaps between thread stacks"
82522+ default y if GRKERNSEC_CONFIG_AUTO
82523+ depends on PAX_RANDMMAP && !PPC
82524+ help
82525+ If you say Y here, a random-sized gap will be enforced between allocated
82526+ thread stacks. Glibc's NPTL and other threading libraries that
82527+ pass MAP_STACK to the kernel for thread stack allocation are supported.
82528+ The implementation currently provides 8 bits of entropy for the gap.
82529+
82530+ Many distributions do not compile threaded remote services with the
82531+ -fstack-check argument to GCC, causing the variable-sized stack-based
82532+ allocator, alloca(), to not probe the stack on allocation. This
82533+ permits an unbounded alloca() to skip over any guard page and potentially
82534+ modify another thread's stack reliably. An enforced random gap
82535+ reduces the reliability of such an attack and increases the chance
82536+ that such a read/write to another thread's stack instead lands in
82537+ an unmapped area, causing a crash and triggering grsecurity's
82538+ anti-bruteforcing logic.
82539+
82540+config GRKERNSEC_PROC_MEMMAP
82541+ bool "Harden ASLR against information leaks and entropy reduction"
82542+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
82543+ depends on PAX_NOEXEC || PAX_ASLR
82544+ help
82545+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
82546+ give no information about the addresses of its mappings if
82547+ PaX features that rely on random addresses are enabled on the task.
82548+ In addition to sanitizing this information and disabling other
82549+ dangerous sources of information, this option causes reads of sensitive
82550+ /proc/<pid> entries where the file descriptor was opened in a different
82551+ task than the one performing the read. Such attempts are logged.
82552+ This option also limits argv/env strings for suid/sgid binaries
82553+ to 512KB to prevent a complete exhaustion of the stack entropy provided
82554+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
82555+ binaries to prevent alternative mmap layouts from being abused.
82556+
82557+ If you use PaX it is essential that you say Y here as it closes up
82558+ several holes that make full ASLR useless locally.
82559+
82560+
82561+config GRKERNSEC_KSTACKOVERFLOW
82562+ bool "Prevent kernel stack overflows"
82563+ default y if GRKERNSEC_CONFIG_AUTO
82564+ depends on !IA64 && 64BIT
82565+ help
82566+ If you say Y here, the kernel's process stacks will be allocated
82567+ with vmalloc instead of the kernel's default allocator. This
82568+ introduces guard pages that in combination with the alloca checking
82569+ of the STACKLEAK feature prevents all forms of kernel process stack
82570+ overflow abuse. Note that this is different from kernel stack
82571+ buffer overflows.
82572+
82573+config GRKERNSEC_BRUTE
82574+ bool "Deter exploit bruteforcing"
82575+ default y if GRKERNSEC_CONFIG_AUTO
82576+ help
82577+ If you say Y here, attempts to bruteforce exploits against forking
82578+ daemons such as apache or sshd, as well as against suid/sgid binaries
82579+ will be deterred. When a child of a forking daemon is killed by PaX
82580+ or crashes due to an illegal instruction or other suspicious signal,
82581+ the parent process will be delayed 30 seconds upon every subsequent
82582+ fork until the administrator is able to assess the situation and
82583+ restart the daemon.
82584+ In the suid/sgid case, the attempt is logged, the user has all their
82585+ existing instances of the suid/sgid binary terminated and will
82586+ be unable to execute any suid/sgid binaries for 15 minutes.
82587+
82588+ It is recommended that you also enable signal logging in the auditing
82589+ section so that logs are generated when a process triggers a suspicious
82590+ signal.
82591+ If the sysctl option is enabled, a sysctl option with name
82592+ "deter_bruteforce" is created.
82593+
82594+config GRKERNSEC_MODHARDEN
82595+ bool "Harden module auto-loading"
82596+ default y if GRKERNSEC_CONFIG_AUTO
82597+ depends on MODULES
82598+ help
82599+ If you say Y here, module auto-loading in response to use of some
82600+ feature implemented by an unloaded module will be restricted to
82601+ root users. Enabling this option helps defend against attacks
82602+ by unprivileged users who abuse the auto-loading behavior to
82603+ cause a vulnerable module to load that is then exploited.
82604+
82605+ If this option prevents a legitimate use of auto-loading for a
82606+ non-root user, the administrator can execute modprobe manually
82607+ with the exact name of the module mentioned in the alert log.
82608+ Alternatively, the administrator can add the module to the list
82609+ of modules loaded at boot by modifying init scripts.
82610+
82611+ Modification of init scripts will most likely be needed on
82612+ Ubuntu servers with encrypted home directory support enabled,
82613+ as the first non-root user logging in will cause the ecb(aes),
82614+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
82615+
82616+config GRKERNSEC_HIDESYM
82617+ bool "Hide kernel symbols"
82618+ default y if GRKERNSEC_CONFIG_AUTO
82619+ select PAX_USERCOPY_SLABS
82620+ help
82621+ If you say Y here, getting information on loaded modules, and
82622+ displaying all kernel symbols through a syscall will be restricted
82623+ to users with CAP_SYS_MODULE. For software compatibility reasons,
82624+ /proc/kallsyms will be restricted to the root user. The RBAC
82625+ system can hide that entry even from root.
82626+
82627+ This option also prevents leaking of kernel addresses through
82628+ several /proc entries.
82629+
82630+ Note that this option is only effective provided the following
82631+ conditions are met:
82632+ 1) The kernel using grsecurity is not precompiled by some distribution
82633+ 2) You have also enabled GRKERNSEC_DMESG
82634+ 3) You are using the RBAC system and hiding other files such as your
82635+ kernel image and System.map. Alternatively, enabling this option
82636+ causes the permissions on /boot, /lib/modules, and the kernel
82637+ source directory to change at compile time to prevent
82638+ reading by non-root users.
82639+ If the above conditions are met, this option will aid in providing a
82640+ useful protection against local kernel exploitation of overflows
82641+ and arbitrary read/write vulnerabilities.
82642+
82643+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
82644+ in addition to this feature.
82645+
82646+config GRKERNSEC_RANDSTRUCT
82647+ bool "Randomize layout of sensitive kernel structures"
82648+ default y if GRKERNSEC_CONFIG_AUTO
82649+ select GRKERNSEC_HIDESYM
82650+ select MODVERSIONS if MODULES
82651+ help
82652+ If you say Y here, the layouts of a number of sensitive kernel
82653+ structures (task, fs, cred, etc) and all structures composed entirely
82654+ of function pointers (aka "ops" structs) will be randomized at compile-time.
82655+ This can introduce the requirement of an additional infoleak
82656+ vulnerability for exploits targeting these structure types.
82657+
82658+ Enabling this feature will introduce some performance impact, slightly
82659+ increase memory usage, and prevent the use of forensic tools like
82660+ Volatility against the system (unless the kernel source tree isn't
82661+ cleaned after kernel installation).
82662+
82663+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
82664+ It remains after a make clean to allow for external modules to be compiled
82665+ with the existing seed and will be removed by a make mrproper or
82666+ make distclean.
82667+
82668+ Note that the implementation requires gcc 4.6.4. or newer. You may need
82669+ to install the supporting headers explicitly in addition to the normal
82670+ gcc package.
82671+
82672+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
82673+ bool "Use cacheline-aware structure randomization"
82674+ depends on GRKERNSEC_RANDSTRUCT
82675+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
82676+ help
82677+ If you say Y here, the RANDSTRUCT randomization will make a best effort
82678+ at restricting randomization to cacheline-sized groups of elements. It
82679+ will further not randomize bitfields in structures. This reduces the
82680+ performance hit of RANDSTRUCT at the cost of weakened randomization.
82681+
82682+config GRKERNSEC_KERN_LOCKOUT
82683+ bool "Active kernel exploit response"
82684+ default y if GRKERNSEC_CONFIG_AUTO
82685+ depends on X86 || ARM || PPC || SPARC
82686+ help
82687+ If you say Y here, when a PaX alert is triggered due to suspicious
82688+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
82689+ or an OOPS occurs due to bad memory accesses, instead of just
82690+ terminating the offending process (and potentially allowing
82691+ a subsequent exploit from the same user), we will take one of two
82692+ actions:
82693+ If the user was root, we will panic the system
82694+ If the user was non-root, we will log the attempt, terminate
82695+ all processes owned by the user, then prevent them from creating
82696+ any new processes until the system is restarted
82697+ This deters repeated kernel exploitation/bruteforcing attempts
82698+ and is useful for later forensics.
82699+
82700+config GRKERNSEC_OLD_ARM_USERLAND
82701+ bool "Old ARM userland compatibility"
82702+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
82703+ help
82704+ If you say Y here, stubs of executable code to perform such operations
82705+ as "compare-exchange" will be placed at fixed locations in the ARM vector
82706+ table. This is unfortunately needed for old ARM userland meant to run
82707+ across a wide range of processors. Without this option enabled,
82708+ the get_tls and data memory barrier stubs will be emulated by the kernel,
82709+ which is enough for Linaro userlands or other userlands designed for v6
82710+ and newer ARM CPUs. It's recommended that you try without this option enabled
82711+ first, and only enable it if your userland does not boot (it will likely fail
82712+ at init time).
82713+
82714+endmenu
82715+menu "Role Based Access Control Options"
82716+depends on GRKERNSEC
82717+
82718+config GRKERNSEC_RBAC_DEBUG
82719+ bool
82720+
82721+config GRKERNSEC_NO_RBAC
82722+ bool "Disable RBAC system"
82723+ help
82724+ If you say Y here, the /dev/grsec device will be removed from the kernel,
82725+ preventing the RBAC system from being enabled. You should only say Y
82726+ here if you have no intention of using the RBAC system, so as to prevent
82727+ an attacker with root access from misusing the RBAC system to hide files
82728+ and processes when loadable module support and /dev/[k]mem have been
82729+ locked down.
82730+
82731+config GRKERNSEC_ACL_HIDEKERN
82732+ bool "Hide kernel processes"
82733+ help
82734+ If you say Y here, all kernel threads will be hidden to all
82735+ processes but those whose subject has the "view hidden processes"
82736+ flag.
82737+
82738+config GRKERNSEC_ACL_MAXTRIES
82739+ int "Maximum tries before password lockout"
82740+ default 3
82741+ help
82742+ This option enforces the maximum number of times a user can attempt
82743+ to authorize themselves with the grsecurity RBAC system before being
82744+ denied the ability to attempt authorization again for a specified time.
82745+ The lower the number, the harder it will be to brute-force a password.
82746+
82747+config GRKERNSEC_ACL_TIMEOUT
82748+ int "Time to wait after max password tries, in seconds"
82749+ default 30
82750+ help
82751+ This option specifies the time the user must wait after attempting to
82752+ authorize to the RBAC system with the maximum number of invalid
82753+ passwords. The higher the number, the harder it will be to brute-force
82754+ a password.
82755+
82756+endmenu
82757+menu "Filesystem Protections"
82758+depends on GRKERNSEC
82759+
82760+config GRKERNSEC_PROC
82761+ bool "Proc restrictions"
82762+ default y if GRKERNSEC_CONFIG_AUTO
82763+ help
82764+ If you say Y here, the permissions of the /proc filesystem
82765+ will be altered to enhance system security and privacy. You MUST
82766+ choose either a user only restriction or a user and group restriction.
82767+ Depending upon the option you choose, you can either restrict users to
82768+ see only the processes they themselves run, or choose a group that can
82769+ view all processes and files normally restricted to root if you choose
82770+ the "restrict to user only" option. NOTE: If you're running identd or
82771+ ntpd as a non-root user, you will have to run it as the group you
82772+ specify here.
82773+
82774+config GRKERNSEC_PROC_USER
82775+ bool "Restrict /proc to user only"
82776+ depends on GRKERNSEC_PROC
82777+ help
82778+ If you say Y here, non-root users will only be able to view their own
82779+ processes, and restricts them from viewing network-related information,
82780+ and viewing kernel symbol and module information.
82781+
82782+config GRKERNSEC_PROC_USERGROUP
82783+ bool "Allow special group"
82784+ default y if GRKERNSEC_CONFIG_AUTO
82785+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
82786+ help
82787+ If you say Y here, you will be able to select a group that will be
82788+ able to view all processes and network-related information. If you've
82789+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
82790+ remain hidden. This option is useful if you want to run identd as
82791+ a non-root user. The group you select may also be chosen at boot time
82792+ via "grsec_proc_gid=" on the kernel commandline.
82793+
82794+config GRKERNSEC_PROC_GID
82795+ int "GID for special group"
82796+ depends on GRKERNSEC_PROC_USERGROUP
82797+ default 1001
82798+
82799+config GRKERNSEC_PROC_ADD
82800+ bool "Additional restrictions"
82801+ default y if GRKERNSEC_CONFIG_AUTO
82802+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
82803+ help
82804+ If you say Y here, additional restrictions will be placed on
82805+ /proc that keep normal users from viewing device information and
82806+ slabinfo information that could be useful for exploits.
82807+
82808+config GRKERNSEC_LINK
82809+ bool "Linking restrictions"
82810+ default y if GRKERNSEC_CONFIG_AUTO
82811+ help
82812+ If you say Y here, /tmp race exploits will be prevented, since users
82813+ will no longer be able to follow symlinks owned by other users in
82814+ world-writable +t directories (e.g. /tmp), unless the owner of the
82815+ symlink is the owner of the directory. users will also not be
82816+ able to hardlink to files they do not own. If the sysctl option is
82817+ enabled, a sysctl option with name "linking_restrictions" is created.
82818+
82819+config GRKERNSEC_SYMLINKOWN
82820+ bool "Kernel-enforced SymlinksIfOwnerMatch"
82821+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
82822+ help
82823+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
82824+ that prevents it from being used as a security feature. As Apache
82825+ verifies the symlink by performing a stat() against the target of
82826+ the symlink before it is followed, an attacker can setup a symlink
82827+ to point to a same-owned file, then replace the symlink with one
82828+ that targets another user's file just after Apache "validates" the
82829+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
82830+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
82831+ will be in place for the group you specify. If the sysctl option
82832+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
82833+ created.
82834+
82835+config GRKERNSEC_SYMLINKOWN_GID
82836+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
82837+ depends on GRKERNSEC_SYMLINKOWN
82838+ default 1006
82839+ help
82840+ Setting this GID determines what group kernel-enforced
82841+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
82842+ is enabled, a sysctl option with name "symlinkown_gid" is created.
82843+
82844+config GRKERNSEC_FIFO
82845+ bool "FIFO restrictions"
82846+ default y if GRKERNSEC_CONFIG_AUTO
82847+ help
82848+ If you say Y here, users will not be able to write to FIFOs they don't
82849+ own in world-writable +t directories (e.g. /tmp), unless the owner of
82850+ the FIFO is the same owner of the directory it's held in. If the sysctl
82851+ option is enabled, a sysctl option with name "fifo_restrictions" is
82852+ created.
82853+
82854+config GRKERNSEC_SYSFS_RESTRICT
82855+ bool "Sysfs/debugfs restriction"
82856+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
82857+ depends on SYSFS
82858+ help
82859+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
82860+ any filesystem normally mounted under it (e.g. debugfs) will be
82861+ mostly accessible only by root. These filesystems generally provide access
82862+ to hardware and debug information that isn't appropriate for unprivileged
82863+ users of the system. Sysfs and debugfs have also become a large source
82864+ of new vulnerabilities, ranging from infoleaks to local compromise.
82865+ There has been very little oversight with an eye toward security involved
82866+ in adding new exporters of information to these filesystems, so their
82867+ use is discouraged.
82868+ For reasons of compatibility, a few directories have been whitelisted
82869+ for access by non-root users:
82870+ /sys/fs/selinux
82871+ /sys/fs/fuse
82872+ /sys/devices/system/cpu
82873+
82874+config GRKERNSEC_ROFS
82875+ bool "Runtime read-only mount protection"
82876+ depends on SYSCTL
82877+ help
82878+ If you say Y here, a sysctl option with name "romount_protect" will
82879+ be created. By setting this option to 1 at runtime, filesystems
82880+ will be protected in the following ways:
82881+ * No new writable mounts will be allowed
82882+ * Existing read-only mounts won't be able to be remounted read/write
82883+ * Write operations will be denied on all block devices
82884+ This option acts independently of grsec_lock: once it is set to 1,
82885+ it cannot be turned off. Therefore, please be mindful of the resulting
82886+ behavior if this option is enabled in an init script on a read-only
82887+ filesystem.
82888+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
82889+ and GRKERNSEC_IO should be enabled and module loading disabled via
82890+ config or at runtime.
82891+ This feature is mainly intended for secure embedded systems.
82892+
82893+
82894+config GRKERNSEC_DEVICE_SIDECHANNEL
82895+ bool "Eliminate stat/notify-based device sidechannels"
82896+ default y if GRKERNSEC_CONFIG_AUTO
82897+ help
82898+ If you say Y here, timing analyses on block or character
82899+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
82900+ will be thwarted for unprivileged users. If a process without
82901+ CAP_MKNOD stats such a device, the last access and last modify times
82902+ will match the device's create time. No access or modify events
82903+ will be triggered through inotify/dnotify/fanotify for such devices.
82904+ This feature will prevent attacks that may at a minimum
82905+ allow an attacker to determine the administrator's password length.
82906+
82907+config GRKERNSEC_CHROOT
82908+ bool "Chroot jail restrictions"
82909+ default y if GRKERNSEC_CONFIG_AUTO
82910+ help
82911+ If you say Y here, you will be able to choose several options that will
82912+ make breaking out of a chrooted jail much more difficult. If you
82913+ encounter no software incompatibilities with the following options, it
82914+ is recommended that you enable each one.
82915+
82916+ Note that the chroot restrictions are not intended to apply to "chroots"
82917+ to directories that are simple bind mounts of the global root filesystem.
82918+ For several other reasons, a user shouldn't expect any significant
82919+ security by performing such a chroot.
82920+
82921+config GRKERNSEC_CHROOT_MOUNT
82922+ bool "Deny mounts"
82923+ default y if GRKERNSEC_CONFIG_AUTO
82924+ depends on GRKERNSEC_CHROOT
82925+ help
82926+ If you say Y here, processes inside a chroot will not be able to
82927+ mount or remount filesystems. If the sysctl option is enabled, a
82928+ sysctl option with name "chroot_deny_mount" is created.
82929+
82930+config GRKERNSEC_CHROOT_DOUBLE
82931+ bool "Deny double-chroots"
82932+ default y if GRKERNSEC_CONFIG_AUTO
82933+ depends on GRKERNSEC_CHROOT
82934+ help
82935+ If you say Y here, processes inside a chroot will not be able to chroot
82936+ again outside the chroot. This is a widely used method of breaking
82937+ out of a chroot jail and should not be allowed. If the sysctl
82938+ option is enabled, a sysctl option with name
82939+ "chroot_deny_chroot" is created.
82940+
82941+config GRKERNSEC_CHROOT_PIVOT
82942+ bool "Deny pivot_root in chroot"
82943+ default y if GRKERNSEC_CONFIG_AUTO
82944+ depends on GRKERNSEC_CHROOT
82945+ help
82946+ If you say Y here, processes inside a chroot will not be able to use
82947+ a function called pivot_root() that was introduced in Linux 2.3.41. It
82948+ works similar to chroot in that it changes the root filesystem. This
82949+ function could be misused in a chrooted process to attempt to break out
82950+ of the chroot, and therefore should not be allowed. If the sysctl
82951+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
82952+ created.
82953+
82954+config GRKERNSEC_CHROOT_CHDIR
82955+ bool "Enforce chdir(\"/\") on all chroots"
82956+ default y if GRKERNSEC_CONFIG_AUTO
82957+ depends on GRKERNSEC_CHROOT
82958+ help
82959+ If you say Y here, the current working directory of all newly-chrooted
82960+ applications will be set to the the root directory of the chroot.
82961+ The man page on chroot(2) states:
82962+ Note that this call does not change the current working
82963+ directory, so that `.' can be outside the tree rooted at
82964+ `/'. In particular, the super-user can escape from a
82965+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
82966+
82967+ It is recommended that you say Y here, since it's not known to break
82968+ any software. If the sysctl option is enabled, a sysctl option with
82969+ name "chroot_enforce_chdir" is created.
82970+
82971+config GRKERNSEC_CHROOT_CHMOD
82972+ bool "Deny (f)chmod +s"
82973+ default y if GRKERNSEC_CONFIG_AUTO
82974+ depends on GRKERNSEC_CHROOT
82975+ help
82976+ If you say Y here, processes inside a chroot will not be able to chmod
82977+ or fchmod files to make them have suid or sgid bits. This protects
82978+ against another published method of breaking a chroot. If the sysctl
82979+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
82980+ created.
82981+
82982+config GRKERNSEC_CHROOT_FCHDIR
82983+ bool "Deny fchdir and fhandle out of chroot"
82984+ default y if GRKERNSEC_CONFIG_AUTO
82985+ depends on GRKERNSEC_CHROOT
82986+ help
82987+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
82988+ to a file descriptor of the chrooting process that points to a directory
82989+ outside the filesystem will be stopped. Additionally, this option prevents
82990+ use of the recently-created syscall for opening files by a guessable "file
82991+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
82992+ with name "chroot_deny_fchdir" is created.
82993+
82994+config GRKERNSEC_CHROOT_MKNOD
82995+ bool "Deny mknod"
82996+ default y if GRKERNSEC_CONFIG_AUTO
82997+ depends on GRKERNSEC_CHROOT
82998+ help
82999+ If you say Y here, processes inside a chroot will not be allowed to
83000+ mknod. The problem with using mknod inside a chroot is that it
83001+ would allow an attacker to create a device entry that is the same
83002+ as one on the physical root of your system, which could range from
83003+ anything from the console device to a device for your harddrive (which
83004+ they could then use to wipe the drive or steal data). It is recommended
83005+ that you say Y here, unless you run into software incompatibilities.
83006+ If the sysctl option is enabled, a sysctl option with name
83007+ "chroot_deny_mknod" is created.
83008+
83009+config GRKERNSEC_CHROOT_SHMAT
83010+ bool "Deny shmat() out of chroot"
83011+ default y if GRKERNSEC_CONFIG_AUTO
83012+ depends on GRKERNSEC_CHROOT
83013+ help
83014+ If you say Y here, processes inside a chroot will not be able to attach
83015+ to shared memory segments that were created outside of the chroot jail.
83016+ It is recommended that you say Y here. If the sysctl option is enabled,
83017+ a sysctl option with name "chroot_deny_shmat" is created.
83018+
83019+config GRKERNSEC_CHROOT_UNIX
83020+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
83021+ default y if GRKERNSEC_CONFIG_AUTO
83022+ depends on GRKERNSEC_CHROOT
83023+ help
83024+ If you say Y here, processes inside a chroot will not be able to
83025+ connect to abstract (meaning not belonging to a filesystem) Unix
83026+ domain sockets that were bound outside of a chroot. It is recommended
83027+ that you say Y here. If the sysctl option is enabled, a sysctl option
83028+ with name "chroot_deny_unix" is created.
83029+
83030+config GRKERNSEC_CHROOT_FINDTASK
83031+ bool "Protect outside processes"
83032+ default y if GRKERNSEC_CONFIG_AUTO
83033+ depends on GRKERNSEC_CHROOT
83034+ help
83035+ If you say Y here, processes inside a chroot will not be able to
83036+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
83037+ getsid, or view any process outside of the chroot. If the sysctl
83038+ option is enabled, a sysctl option with name "chroot_findtask" is
83039+ created.
83040+
83041+config GRKERNSEC_CHROOT_NICE
83042+ bool "Restrict priority changes"
83043+ default y if GRKERNSEC_CONFIG_AUTO
83044+ depends on GRKERNSEC_CHROOT
83045+ help
83046+ If you say Y here, processes inside a chroot will not be able to raise
83047+ the priority of processes in the chroot, or alter the priority of
83048+ processes outside the chroot. This provides more security than simply
83049+ removing CAP_SYS_NICE from the process' capability set. If the
83050+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
83051+ is created.
83052+
83053+config GRKERNSEC_CHROOT_SYSCTL
83054+ bool "Deny sysctl writes"
83055+ default y if GRKERNSEC_CONFIG_AUTO
83056+ depends on GRKERNSEC_CHROOT
83057+ help
83058+ If you say Y here, an attacker in a chroot will not be able to
83059+ write to sysctl entries, either by sysctl(2) or through a /proc
83060+ interface. It is strongly recommended that you say Y here. If the
83061+ sysctl option is enabled, a sysctl option with name
83062+ "chroot_deny_sysctl" is created.
83063+
83064+config GRKERNSEC_CHROOT_RENAME
83065+ bool "Deny bad renames"
83066+ default y if GRKERNSEC_CONFIG_AUTO
83067+ depends on GRKERNSEC_CHROOT
83068+ help
83069+ If you say Y here, an attacker in a chroot will not be able to
83070+ abuse the ability to create double chroots to break out of the
83071+ chroot by exploiting a race condition between a rename of a directory
83072+ within a chroot against an open of a symlink with relative path
83073+ components. This feature will likewise prevent an accomplice outside
83074+ a chroot from enabling a user inside the chroot to break out and make
83075+ use of their credentials on the global filesystem. Enabling this
83076+ feature is essential to prevent root users from breaking out of a
83077+ chroot. If the sysctl option is enabled, a sysctl option with name
83078+ "chroot_deny_bad_rename" is created.
83079+
83080+config GRKERNSEC_CHROOT_CAPS
83081+ bool "Capability restrictions"
83082+ default y if GRKERNSEC_CONFIG_AUTO
83083+ depends on GRKERNSEC_CHROOT
83084+ help
83085+ If you say Y here, the capabilities on all processes within a
83086+ chroot jail will be lowered to stop module insertion, raw i/o,
83087+ system and net admin tasks, rebooting the system, modifying immutable
83088+ files, modifying IPC owned by another, and changing the system time.
83089+ This is left an option because it can break some apps. Disable this
83090+ if your chrooted apps are having problems performing those kinds of
83091+ tasks. If the sysctl option is enabled, a sysctl option with
83092+ name "chroot_caps" is created.
83093+
83094+config GRKERNSEC_CHROOT_INITRD
83095+ bool "Exempt initrd tasks from restrictions"
83096+ default y if GRKERNSEC_CONFIG_AUTO
83097+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
83098+ help
83099+ If you say Y here, tasks started prior to init will be exempted from
83100+ grsecurity's chroot restrictions. This option is mainly meant to
83101+ resolve Plymouth's performing privileged operations unnecessarily
83102+ in a chroot.
83103+
83104+endmenu
83105+menu "Kernel Auditing"
83106+depends on GRKERNSEC
83107+
83108+config GRKERNSEC_AUDIT_GROUP
83109+ bool "Single group for auditing"
83110+ help
83111+ If you say Y here, the exec and chdir logging features will only operate
83112+ on a group you specify. This option is recommended if you only want to
83113+ watch certain users instead of having a large amount of logs from the
83114+ entire system. If the sysctl option is enabled, a sysctl option with
83115+ name "audit_group" is created.
83116+
83117+config GRKERNSEC_AUDIT_GID
83118+ int "GID for auditing"
83119+ depends on GRKERNSEC_AUDIT_GROUP
83120+ default 1007
83121+
83122+config GRKERNSEC_EXECLOG
83123+ bool "Exec logging"
83124+ help
83125+ If you say Y here, all execve() calls will be logged (since the
83126+ other exec*() calls are frontends to execve(), all execution
83127+ will be logged). Useful for shell-servers that like to keep track
83128+ of their users. If the sysctl option is enabled, a sysctl option with
83129+ name "exec_logging" is created.
83130+ WARNING: This option when enabled will produce a LOT of logs, especially
83131+ on an active system.
83132+
83133+config GRKERNSEC_RESLOG
83134+ bool "Resource logging"
83135+ default y if GRKERNSEC_CONFIG_AUTO
83136+ help
83137+ If you say Y here, all attempts to overstep resource limits will
83138+ be logged with the resource name, the requested size, and the current
83139+ limit. It is highly recommended that you say Y here. If the sysctl
83140+ option is enabled, a sysctl option with name "resource_logging" is
83141+ created. If the RBAC system is enabled, the sysctl value is ignored.
83142+
83143+config GRKERNSEC_CHROOT_EXECLOG
83144+ bool "Log execs within chroot"
83145+ help
83146+ If you say Y here, all executions inside a chroot jail will be logged
83147+ to syslog. This can cause a large amount of logs if certain
83148+ applications (eg. djb's daemontools) are installed on the system, and
83149+ is therefore left as an option. If the sysctl option is enabled, a
83150+ sysctl option with name "chroot_execlog" is created.
83151+
83152+config GRKERNSEC_AUDIT_PTRACE
83153+ bool "Ptrace logging"
83154+ help
83155+ If you say Y here, all attempts to attach to a process via ptrace
83156+ will be logged. If the sysctl option is enabled, a sysctl option
83157+ with name "audit_ptrace" is created.
83158+
83159+config GRKERNSEC_AUDIT_CHDIR
83160+ bool "Chdir logging"
83161+ help
83162+ If you say Y here, all chdir() calls will be logged. If the sysctl
83163+ option is enabled, a sysctl option with name "audit_chdir" is created.
83164+
83165+config GRKERNSEC_AUDIT_MOUNT
83166+ bool "(Un)Mount logging"
83167+ help
83168+ If you say Y here, all mounts and unmounts will be logged. If the
83169+ sysctl option is enabled, a sysctl option with name "audit_mount" is
83170+ created.
83171+
83172+config GRKERNSEC_SIGNAL
83173+ bool "Signal logging"
83174+ default y if GRKERNSEC_CONFIG_AUTO
83175+ help
83176+ If you say Y here, certain important signals will be logged, such as
83177+ SIGSEGV, which will as a result inform you of when a error in a program
83178+ occurred, which in some cases could mean a possible exploit attempt.
83179+ If the sysctl option is enabled, a sysctl option with name
83180+ "signal_logging" is created.
83181+
83182+config GRKERNSEC_FORKFAIL
83183+ bool "Fork failure logging"
83184+ help
83185+ If you say Y here, all failed fork() attempts will be logged.
83186+ This could suggest a fork bomb, or someone attempting to overstep
83187+ their process limit. If the sysctl option is enabled, a sysctl option
83188+ with name "forkfail_logging" is created.
83189+
83190+config GRKERNSEC_TIME
83191+ bool "Time change logging"
83192+ default y if GRKERNSEC_CONFIG_AUTO
83193+ help
83194+ If you say Y here, any changes of the system clock will be logged.
83195+ If the sysctl option is enabled, a sysctl option with name
83196+ "timechange_logging" is created.
83197+
83198+config GRKERNSEC_PROC_IPADDR
83199+ bool "/proc/<pid>/ipaddr support"
83200+ default y if GRKERNSEC_CONFIG_AUTO
83201+ help
83202+ If you say Y here, a new entry will be added to each /proc/<pid>
83203+ directory that contains the IP address of the person using the task.
83204+ The IP is carried across local TCP and AF_UNIX stream sockets.
83205+ This information can be useful for IDS/IPSes to perform remote response
83206+ to a local attack. The entry is readable by only the owner of the
83207+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
83208+ the RBAC system), and thus does not create privacy concerns.
83209+
83210+config GRKERNSEC_RWXMAP_LOG
83211+ bool 'Denied RWX mmap/mprotect logging'
83212+ default y if GRKERNSEC_CONFIG_AUTO
83213+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
83214+ help
83215+ If you say Y here, calls to mmap() and mprotect() with explicit
83216+ usage of PROT_WRITE and PROT_EXEC together will be logged when
83217+ denied by the PAX_MPROTECT feature. This feature will also
83218+ log other problematic scenarios that can occur when PAX_MPROTECT
83219+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
83220+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
83221+ is created.
83222+
83223+endmenu
83224+
83225+menu "Executable Protections"
83226+depends on GRKERNSEC
83227+
83228+config GRKERNSEC_DMESG
83229+ bool "Dmesg(8) restriction"
83230+ default y if GRKERNSEC_CONFIG_AUTO
83231+ help
83232+ If you say Y here, non-root users will not be able to use dmesg(8)
83233+ to view the contents of the kernel's circular log buffer.
83234+ The kernel's log buffer often contains kernel addresses and other
83235+ identifying information useful to an attacker in fingerprinting a
83236+ system for a targeted exploit.
83237+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
83238+ created.
83239+
83240+config GRKERNSEC_HARDEN_PTRACE
83241+ bool "Deter ptrace-based process snooping"
83242+ default y if GRKERNSEC_CONFIG_AUTO
83243+ help
83244+ If you say Y here, TTY sniffers and other malicious monitoring
83245+ programs implemented through ptrace will be defeated. If you
83246+ have been using the RBAC system, this option has already been
83247+ enabled for several years for all users, with the ability to make
83248+ fine-grained exceptions.
83249+
83250+ This option only affects the ability of non-root users to ptrace
83251+ processes that are not a descendent of the ptracing process.
83252+ This means that strace ./binary and gdb ./binary will still work,
83253+ but attaching to arbitrary processes will not. If the sysctl
83254+ option is enabled, a sysctl option with name "harden_ptrace" is
83255+ created.
83256+
83257+config GRKERNSEC_PTRACE_READEXEC
83258+ bool "Require read access to ptrace sensitive binaries"
83259+ default y if GRKERNSEC_CONFIG_AUTO
83260+ help
83261+ If you say Y here, unprivileged users will not be able to ptrace unreadable
83262+ binaries. This option is useful in environments that
83263+ remove the read bits (e.g. file mode 4711) from suid binaries to
83264+ prevent infoleaking of their contents. This option adds
83265+ consistency to the use of that file mode, as the binary could normally
83266+ be read out when run without privileges while ptracing.
83267+
83268+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
83269+ is created.
83270+
83271+config GRKERNSEC_SETXID
83272+ bool "Enforce consistent multithreaded privileges"
83273+ default y if GRKERNSEC_CONFIG_AUTO
83274+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
83275+ help
83276+ If you say Y here, a change from a root uid to a non-root uid
83277+ in a multithreaded application will cause the resulting uids,
83278+ gids, supplementary groups, and capabilities in that thread
83279+ to be propagated to the other threads of the process. In most
83280+ cases this is unnecessary, as glibc will emulate this behavior
83281+ on behalf of the application. Other libcs do not act in the
83282+ same way, allowing the other threads of the process to continue
83283+ running with root privileges. If the sysctl option is enabled,
83284+ a sysctl option with name "consistent_setxid" is created.
83285+
83286+config GRKERNSEC_HARDEN_IPC
83287+ bool "Disallow access to overly-permissive IPC objects"
83288+ default y if GRKERNSEC_CONFIG_AUTO
83289+ depends on SYSVIPC
83290+ help
83291+ If you say Y here, access to overly-permissive IPC objects (shared
83292+ memory, message queues, and semaphores) will be denied for processes
83293+ given the following criteria beyond normal permission checks:
83294+ 1) If the IPC object is world-accessible and the euid doesn't match
83295+ that of the creator or current uid for the IPC object
83296+ 2) If the IPC object is group-accessible and the egid doesn't
83297+ match that of the creator or current gid for the IPC object
83298+ It's a common error to grant too much permission to these objects,
83299+ with impact ranging from denial of service and information leaking to
83300+ privilege escalation. This feature was developed in response to
83301+ research by Tim Brown:
83302+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
83303+ who found hundreds of such insecure usages. Processes with
83304+ CAP_IPC_OWNER are still permitted to access these IPC objects.
83305+ If the sysctl option is enabled, a sysctl option with name
83306+ "harden_ipc" is created.
83307+
83308+config GRKERNSEC_TPE
83309+ bool "Trusted Path Execution (TPE)"
83310+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
83311+ help
83312+ If you say Y here, you will be able to choose a gid to add to the
83313+ supplementary groups of users you want to mark as "untrusted."
83314+ These users will not be able to execute any files that are not in
83315+ root-owned directories writable only by root. If the sysctl option
83316+ is enabled, a sysctl option with name "tpe" is created.
83317+
83318+config GRKERNSEC_TPE_ALL
83319+ bool "Partially restrict all non-root users"
83320+ depends on GRKERNSEC_TPE
83321+ help
83322+ If you say Y here, all non-root users will be covered under
83323+ a weaker TPE restriction. This is separate from, and in addition to,
83324+ the main TPE options that you have selected elsewhere. Thus, if a
83325+ "trusted" GID is chosen, this restriction applies to even that GID.
83326+ Under this restriction, all non-root users will only be allowed to
83327+ execute files in directories they own that are not group or
83328+ world-writable, or in directories owned by root and writable only by
83329+ root. If the sysctl option is enabled, a sysctl option with name
83330+ "tpe_restrict_all" is created.
83331+
83332+config GRKERNSEC_TPE_INVERT
83333+ bool "Invert GID option"
83334+ depends on GRKERNSEC_TPE
83335+ help
83336+ If you say Y here, the group you specify in the TPE configuration will
83337+ decide what group TPE restrictions will be *disabled* for. This
83338+ option is useful if you want TPE restrictions to be applied to most
83339+ users on the system. If the sysctl option is enabled, a sysctl option
83340+ with name "tpe_invert" is created. Unlike other sysctl options, this
83341+ entry will default to on for backward-compatibility.
83342+
83343+config GRKERNSEC_TPE_GID
83344+ int
83345+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
83346+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
83347+
83348+config GRKERNSEC_TPE_UNTRUSTED_GID
83349+ int "GID for TPE-untrusted users"
83350+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
83351+ default 1005
83352+ help
83353+ Setting this GID determines what group TPE restrictions will be
83354+ *enabled* for. If the sysctl option is enabled, a sysctl option
83355+ with name "tpe_gid" is created.
83356+
83357+config GRKERNSEC_TPE_TRUSTED_GID
83358+ int "GID for TPE-trusted users"
83359+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
83360+ default 1005
83361+ help
83362+ Setting this GID determines what group TPE restrictions will be
83363+ *disabled* for. If the sysctl option is enabled, a sysctl option
83364+ with name "tpe_gid" is created.
83365+
83366+endmenu
83367+menu "Network Protections"
83368+depends on GRKERNSEC
83369+
83370+config GRKERNSEC_BLACKHOLE
83371+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
83372+ default y if GRKERNSEC_CONFIG_AUTO
83373+ depends on NET
83374+ help
83375+ If you say Y here, neither TCP resets nor ICMP
83376+ destination-unreachable packets will be sent in response to packets
83377+ sent to ports for which no associated listening process exists.
83378+ It will also prevent the sending of ICMP protocol unreachable packets
83379+ in response to packets with unknown protocols.
83380+ This feature supports both IPV4 and IPV6 and exempts the
83381+ loopback interface from blackholing. Enabling this feature
83382+ makes a host more resilient to DoS attacks and reduces network
83383+ visibility against scanners.
83384+
83385+ The blackhole feature as-implemented is equivalent to the FreeBSD
83386+ blackhole feature, as it prevents RST responses to all packets, not
83387+ just SYNs. Under most application behavior this causes no
83388+ problems, but applications (like haproxy) may not close certain
83389+ connections in a way that cleanly terminates them on the remote
83390+ end, leaving the remote host in LAST_ACK state. Because of this
83391+ side-effect and to prevent intentional LAST_ACK DoSes, this
83392+ feature also adds automatic mitigation against such attacks.
83393+ The mitigation drastically reduces the amount of time a socket
83394+ can spend in LAST_ACK state. If you're using haproxy and not
83395+ all servers it connects to have this option enabled, consider
83396+ disabling this feature on the haproxy host.
83397+
83398+ If the sysctl option is enabled, two sysctl options with names
83399+ "ip_blackhole" and "lastack_retries" will be created.
83400+ While "ip_blackhole" takes the standard zero/non-zero on/off
83401+ toggle, "lastack_retries" uses the same kinds of values as
83402+ "tcp_retries1" and "tcp_retries2". The default value of 4
83403+ prevents a socket from lasting more than 45 seconds in LAST_ACK
83404+ state.
83405+
83406+config GRKERNSEC_NO_SIMULT_CONNECT
83407+ bool "Disable TCP Simultaneous Connect"
83408+ default y if GRKERNSEC_CONFIG_AUTO
83409+ depends on NET
83410+ help
83411+ If you say Y here, a feature by Willy Tarreau will be enabled that
83412+ removes a weakness in Linux's strict implementation of TCP that
83413+ allows two clients to connect to each other without either entering
83414+ a listening state. The weakness allows an attacker to easily prevent
83415+ a client from connecting to a known server provided the source port
83416+ for the connection is guessed correctly.
83417+
83418+ As the weakness could be used to prevent an antivirus or IPS from
83419+ fetching updates, or prevent an SSL gateway from fetching a CRL,
83420+ it should be eliminated by enabling this option. Though Linux is
83421+ one of few operating systems supporting simultaneous connect, it
83422+ has no legitimate use in practice and is rarely supported by firewalls.
83423+
83424+config GRKERNSEC_SOCKET
83425+ bool "Socket restrictions"
83426+ depends on NET
83427+ help
83428+ If you say Y here, you will be able to choose from several options.
83429+ If you assign a GID on your system and add it to the supplementary
83430+ groups of users you want to restrict socket access to, this patch
83431+ will perform up to three things, based on the option(s) you choose.
83432+
83433+config GRKERNSEC_SOCKET_ALL
83434+ bool "Deny any sockets to group"
83435+ depends on GRKERNSEC_SOCKET
83436+ help
83437+ If you say Y here, you will be able to choose a GID of whose users will
83438+ be unable to connect to other hosts from your machine or run server
83439+ applications from your machine. If the sysctl option is enabled, a
83440+ sysctl option with name "socket_all" is created.
83441+
83442+config GRKERNSEC_SOCKET_ALL_GID
83443+ int "GID to deny all sockets for"
83444+ depends on GRKERNSEC_SOCKET_ALL
83445+ default 1004
83446+ help
83447+ Here you can choose the GID to disable socket access for. Remember to
83448+ add the users you want socket access disabled for to the GID
83449+ specified here. If the sysctl option is enabled, a sysctl option
83450+ with name "socket_all_gid" is created.
83451+
83452+config GRKERNSEC_SOCKET_CLIENT
83453+ bool "Deny client sockets to group"
83454+ depends on GRKERNSEC_SOCKET
83455+ help
83456+ If you say Y here, you will be able to choose a GID of whose users will
83457+ be unable to connect to other hosts from your machine, but will be
83458+ able to run servers. If this option is enabled, all users in the group
83459+ you specify will have to use passive mode when initiating ftp transfers
83460+ from the shell on your machine. If the sysctl option is enabled, a
83461+ sysctl option with name "socket_client" is created.
83462+
83463+config GRKERNSEC_SOCKET_CLIENT_GID
83464+ int "GID to deny client sockets for"
83465+ depends on GRKERNSEC_SOCKET_CLIENT
83466+ default 1003
83467+ help
83468+ Here you can choose the GID to disable client socket access for.
83469+ Remember to add the users you want client socket access disabled for to
83470+ the GID specified here. If the sysctl option is enabled, a sysctl
83471+ option with name "socket_client_gid" is created.
83472+
83473+config GRKERNSEC_SOCKET_SERVER
83474+ bool "Deny server sockets to group"
83475+ depends on GRKERNSEC_SOCKET
83476+ help
83477+ If you say Y here, you will be able to choose a GID of whose users will
83478+ be unable to run server applications from your machine. If the sysctl
83479+ option is enabled, a sysctl option with name "socket_server" is created.
83480+
83481+config GRKERNSEC_SOCKET_SERVER_GID
83482+ int "GID to deny server sockets for"
83483+ depends on GRKERNSEC_SOCKET_SERVER
83484+ default 1002
83485+ help
83486+ Here you can choose the GID to disable server socket access for.
83487+ Remember to add the users you want server socket access disabled for to
83488+ the GID specified here. If the sysctl option is enabled, a sysctl
83489+ option with name "socket_server_gid" is created.
83490+
83491+endmenu
83492+
83493+menu "Physical Protections"
83494+depends on GRKERNSEC
83495+
83496+config GRKERNSEC_DENYUSB
83497+ bool "Deny new USB connections after toggle"
83498+ default y if GRKERNSEC_CONFIG_AUTO
83499+ depends on SYSCTL && USB_SUPPORT
83500+ help
83501+ If you say Y here, a new sysctl option with name "deny_new_usb"
83502+ will be created. Setting its value to 1 will prevent any new
83503+ USB devices from being recognized by the OS. Any attempted USB
83504+ device insertion will be logged. This option is intended to be
83505+ used against custom USB devices designed to exploit vulnerabilities
83506+ in various USB device drivers.
83507+
83508+ For greatest effectiveness, this sysctl should be set after any
83509+ relevant init scripts. This option is safe to enable in distros
83510+ as each user can choose whether or not to toggle the sysctl.
83511+
83512+config GRKERNSEC_DENYUSB_FORCE
83513+ bool "Reject all USB devices not connected at boot"
83514+ select USB
83515+ depends on GRKERNSEC_DENYUSB
83516+ help
83517+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
83518+ that doesn't involve a sysctl entry. This option should only be
83519+ enabled if you're sure you want to deny all new USB connections
83520+ at runtime and don't want to modify init scripts. This should not
83521+ be enabled by distros. It forces the core USB code to be built
83522+ into the kernel image so that all devices connected at boot time
83523+ can be recognized and new USB device connections can be prevented
83524+ prior to init running.
83525+
83526+endmenu
83527+
83528+menu "Sysctl Support"
83529+depends on GRKERNSEC && SYSCTL
83530+
83531+config GRKERNSEC_SYSCTL
83532+ bool "Sysctl support"
83533+ default y if GRKERNSEC_CONFIG_AUTO
83534+ help
83535+ If you say Y here, you will be able to change the options that
83536+ grsecurity runs with at bootup, without having to recompile your
83537+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
83538+ to enable (1) or disable (0) various features. All the sysctl entries
83539+ are mutable until the "grsec_lock" entry is set to a non-zero value.
83540+ All features enabled in the kernel configuration are disabled at boot
83541+ if you do not say Y to the "Turn on features by default" option.
83542+ All options should be set at startup, and the grsec_lock entry should
83543+ be set to a non-zero value after all the options are set.
83544+ *THIS IS EXTREMELY IMPORTANT*
83545+
83546+config GRKERNSEC_SYSCTL_DISTRO
83547+ bool "Extra sysctl support for distro makers (READ HELP)"
83548+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
83549+ help
83550+ If you say Y here, additional sysctl options will be created
83551+ for features that affect processes running as root. Therefore,
83552+ it is critical when using this option that the grsec_lock entry be
83553+ enabled after boot. Only distros with prebuilt kernel packages
83554+ with this option enabled that can ensure grsec_lock is enabled
83555+ after boot should use this option.
83556+ *Failure to set grsec_lock after boot makes all grsec features
83557+ this option covers useless*
83558+
83559+ Currently this option creates the following sysctl entries:
83560+ "Disable Privileged I/O": "disable_priv_io"
83561+
83562+config GRKERNSEC_SYSCTL_ON
83563+ bool "Turn on features by default"
83564+ default y if GRKERNSEC_CONFIG_AUTO
83565+ depends on GRKERNSEC_SYSCTL
83566+ help
83567+ If you say Y here, instead of having all features enabled in the
83568+ kernel configuration disabled at boot time, the features will be
83569+ enabled at boot time. It is recommended you say Y here unless
83570+ there is some reason you would want all sysctl-tunable features to
83571+ be disabled by default. As mentioned elsewhere, it is important
83572+ to enable the grsec_lock entry once you have finished modifying
83573+ the sysctl entries.
83574+
83575+endmenu
83576+menu "Logging Options"
83577+depends on GRKERNSEC
83578+
83579+config GRKERNSEC_FLOODTIME
83580+ int "Seconds in between log messages (minimum)"
83581+ default 10
83582+ help
83583+ This option allows you to enforce the number of seconds between
83584+ grsecurity log messages. The default should be suitable for most
83585+ people, however, if you choose to change it, choose a value small enough
83586+ to allow informative logs to be produced, but large enough to
83587+ prevent flooding.
83588+
83589+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
83590+ any rate limiting on grsecurity log messages.
83591+
83592+config GRKERNSEC_FLOODBURST
83593+ int "Number of messages in a burst (maximum)"
83594+ default 6
83595+ help
83596+ This option allows you to choose the maximum number of messages allowed
83597+ within the flood time interval you chose in a separate option. The
83598+ default should be suitable for most people, however if you find that
83599+ many of your logs are being interpreted as flooding, you may want to
83600+ raise this value.
83601+
83602+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
83603+ any rate limiting on grsecurity log messages.
83604+
83605+endmenu
83606diff --git a/grsecurity/Makefile b/grsecurity/Makefile
83607new file mode 100644
83608index 0000000..30ababb
83609--- /dev/null
83610+++ b/grsecurity/Makefile
83611@@ -0,0 +1,54 @@
83612+# grsecurity – access control and security hardening for Linux
83613+# All code in this directory and various hooks located throughout the Linux kernel are
83614+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
83615+# http://www.grsecurity.net spender@grsecurity.net
83616+#
83617+# This program is free software; you can redistribute it and/or
83618+# modify it under the terms of the GNU General Public License version 2
83619+# as published by the Free Software Foundation.
83620+#
83621+# This program is distributed in the hope that it will be useful,
83622+# but WITHOUT ANY WARRANTY; without even the implied warranty of
83623+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
83624+# GNU General Public License for more details.
83625+#
83626+# You should have received a copy of the GNU General Public License
83627+# along with this program; if not, write to the Free Software
83628+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
83629+
83630+KBUILD_CFLAGS += -Werror
83631+
83632+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
83633+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
83634+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
83635+ grsec_usb.o grsec_ipc.o grsec_proc.o
83636+
83637+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
83638+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
83639+ gracl_learn.o grsec_log.o gracl_policy.o
83640+ifdef CONFIG_COMPAT
83641+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
83642+endif
83643+
83644+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
83645+
83646+ifdef CONFIG_NET
83647+obj-y += grsec_sock.o
83648+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
83649+endif
83650+
83651+ifndef CONFIG_GRKERNSEC
83652+obj-y += grsec_disabled.o
83653+endif
83654+
83655+ifdef CONFIG_GRKERNSEC_HIDESYM
83656+extra-y := grsec_hidesym.o
83657+$(obj)/grsec_hidesym.o:
83658+ @-chmod -f 500 /boot
83659+ @-chmod -f 500 /lib/modules
83660+ @-chmod -f 500 /lib64/modules
83661+ @-chmod -f 500 /lib32/modules
83662+ @-chmod -f 700 .
83663+ @-chmod -f 700 $(objtree)
83664+ @echo ' grsec: protected kernel image paths'
83665+endif
83666diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
83667new file mode 100644
83668index 0000000..7ad630a
83669--- /dev/null
83670+++ b/grsecurity/gracl.c
83671@@ -0,0 +1,2757 @@
83672+#include <linux/kernel.h>
83673+#include <linux/module.h>
83674+#include <linux/sched.h>
83675+#include <linux/mm.h>
83676+#include <linux/file.h>
83677+#include <linux/fs.h>
83678+#include <linux/namei.h>
83679+#include <linux/mount.h>
83680+#include <linux/tty.h>
83681+#include <linux/proc_fs.h>
83682+#include <linux/lglock.h>
83683+#include <linux/slab.h>
83684+#include <linux/vmalloc.h>
83685+#include <linux/types.h>
83686+#include <linux/sysctl.h>
83687+#include <linux/netdevice.h>
83688+#include <linux/ptrace.h>
83689+#include <linux/gracl.h>
83690+#include <linux/gralloc.h>
83691+#include <linux/security.h>
83692+#include <linux/grinternal.h>
83693+#include <linux/pid_namespace.h>
83694+#include <linux/stop_machine.h>
83695+#include <linux/fdtable.h>
83696+#include <linux/percpu.h>
83697+#include <linux/lglock.h>
83698+#include <linux/hugetlb.h>
83699+#include <linux/posix-timers.h>
83700+#include <linux/prefetch.h>
83701+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83702+#include <linux/magic.h>
83703+#include <linux/pagemap.h>
83704+#include "../fs/btrfs/async-thread.h"
83705+#include "../fs/btrfs/ctree.h"
83706+#include "../fs/btrfs/btrfs_inode.h"
83707+#endif
83708+#include "../fs/mount.h"
83709+
83710+#include <asm/uaccess.h>
83711+#include <asm/errno.h>
83712+#include <asm/mman.h>
83713+
83714+#define FOR_EACH_ROLE_START(role) \
83715+ role = running_polstate.role_list; \
83716+ while (role) {
83717+
83718+#define FOR_EACH_ROLE_END(role) \
83719+ role = role->prev; \
83720+ }
83721+
83722+extern struct path gr_real_root;
83723+
83724+static struct gr_policy_state running_polstate;
83725+struct gr_policy_state *polstate = &running_polstate;
83726+extern struct gr_alloc_state *current_alloc_state;
83727+
83728+extern char *gr_shared_page[4];
83729+DEFINE_RWLOCK(gr_inode_lock);
83730+
83731+static unsigned int gr_status __read_only = GR_STATUS_INIT;
83732+
83733+#ifdef CONFIG_NET
83734+extern struct vfsmount *sock_mnt;
83735+#endif
83736+
83737+extern struct vfsmount *pipe_mnt;
83738+extern struct vfsmount *shm_mnt;
83739+
83740+#ifdef CONFIG_HUGETLBFS
83741+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
83742+#endif
83743+
83744+extern u16 acl_sp_role_value;
83745+extern struct acl_object_label *fakefs_obj_rw;
83746+extern struct acl_object_label *fakefs_obj_rwx;
83747+
83748+int gr_acl_is_enabled(void)
83749+{
83750+ return (gr_status & GR_READY);
83751+}
83752+
83753+void gr_enable_rbac_system(void)
83754+{
83755+ pax_open_kernel();
83756+ gr_status |= GR_READY;
83757+ pax_close_kernel();
83758+}
83759+
83760+int gr_rbac_disable(void *unused)
83761+{
83762+ pax_open_kernel();
83763+ gr_status &= ~GR_READY;
83764+ pax_close_kernel();
83765+
83766+ return 0;
83767+}
83768+
83769+static inline dev_t __get_dev(const struct dentry *dentry)
83770+{
83771+ struct dentry *ldentry = d_backing_dentry((struct dentry *)dentry);
83772+
83773+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83774+ if (ldentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83775+ return BTRFS_I(d_inode(ldentry))->root->anon_dev;
83776+ else
83777+#endif
83778+ return d_inode(ldentry)->i_sb->s_dev;
83779+}
83780+
83781+static inline u64 __get_ino(const struct dentry *dentry)
83782+{
83783+ struct dentry *ldentry = d_backing_dentry((struct dentry *)dentry);
83784+
83785+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
83786+ if (ldentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
83787+ return btrfs_ino(d_inode(dentry));
83788+ else
83789+#endif
83790+ return d_inode(ldentry)->i_ino;
83791+}
83792+
83793+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
83794+{
83795+ return __get_dev(dentry);
83796+}
83797+
83798+u64 gr_get_ino_from_dentry(struct dentry *dentry)
83799+{
83800+ return __get_ino(dentry);
83801+}
83802+
83803+static char gr_task_roletype_to_char(struct task_struct *task)
83804+{
83805+ switch (task->role->roletype &
83806+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
83807+ GR_ROLE_SPECIAL)) {
83808+ case GR_ROLE_DEFAULT:
83809+ return 'D';
83810+ case GR_ROLE_USER:
83811+ return 'U';
83812+ case GR_ROLE_GROUP:
83813+ return 'G';
83814+ case GR_ROLE_SPECIAL:
83815+ return 'S';
83816+ }
83817+
83818+ return 'X';
83819+}
83820+
83821+char gr_roletype_to_char(void)
83822+{
83823+ return gr_task_roletype_to_char(current);
83824+}
83825+
83826+int
83827+gr_acl_tpe_check(void)
83828+{
83829+ if (unlikely(!(gr_status & GR_READY)))
83830+ return 0;
83831+ if (current->role->roletype & GR_ROLE_TPE)
83832+ return 1;
83833+ else
83834+ return 0;
83835+}
83836+
83837+int
83838+gr_handle_rawio(const struct inode *inode)
83839+{
83840+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
83841+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
83842+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
83843+ !capable(CAP_SYS_RAWIO))
83844+ return 1;
83845+#endif
83846+ return 0;
83847+}
83848+
83849+int
83850+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
83851+{
83852+ if (likely(lena != lenb))
83853+ return 0;
83854+
83855+ return !memcmp(a, b, lena);
83856+}
83857+
83858+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
83859+{
83860+ *buflen -= namelen;
83861+ if (*buflen < 0)
83862+ return -ENAMETOOLONG;
83863+ *buffer -= namelen;
83864+ memcpy(*buffer, str, namelen);
83865+ return 0;
83866+}
83867+
83868+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
83869+{
83870+ return prepend(buffer, buflen, name->name, name->len);
83871+}
83872+
83873+static int prepend_path(const struct path *path, struct path *root,
83874+ char **buffer, int *buflen)
83875+{
83876+ struct dentry *dentry = path->dentry;
83877+ struct vfsmount *vfsmnt = path->mnt;
83878+ struct mount *mnt = real_mount(vfsmnt);
83879+ bool slash = false;
83880+ int error = 0;
83881+
83882+ while (dentry != root->dentry || vfsmnt != root->mnt) {
83883+ struct dentry * parent;
83884+
83885+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
83886+ /* Global root? */
83887+ if (!mnt_has_parent(mnt)) {
83888+ goto out;
83889+ }
83890+ dentry = mnt->mnt_mountpoint;
83891+ mnt = mnt->mnt_parent;
83892+ vfsmnt = &mnt->mnt;
83893+ continue;
83894+ }
83895+ parent = dentry->d_parent;
83896+ prefetch(parent);
83897+ spin_lock(&dentry->d_lock);
83898+ error = prepend_name(buffer, buflen, &dentry->d_name);
83899+ spin_unlock(&dentry->d_lock);
83900+ if (!error)
83901+ error = prepend(buffer, buflen, "/", 1);
83902+ if (error)
83903+ break;
83904+
83905+ slash = true;
83906+ dentry = parent;
83907+ }
83908+
83909+out:
83910+ if (!error && !slash)
83911+ error = prepend(buffer, buflen, "/", 1);
83912+
83913+ return error;
83914+}
83915+
83916+/* this must be called with mount_lock and rename_lock held */
83917+
83918+static char *__our_d_path(const struct path *path, struct path *root,
83919+ char *buf, int buflen)
83920+{
83921+ char *res = buf + buflen;
83922+ int error;
83923+
83924+ prepend(&res, &buflen, "\0", 1);
83925+ error = prepend_path(path, root, &res, &buflen);
83926+ if (error)
83927+ return ERR_PTR(error);
83928+
83929+ return res;
83930+}
83931+
83932+static char *
83933+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
83934+{
83935+ char *retval;
83936+
83937+ retval = __our_d_path(path, root, buf, buflen);
83938+ if (unlikely(IS_ERR(retval)))
83939+ retval = strcpy(buf, "<path too long>");
83940+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
83941+ retval[1] = '\0';
83942+
83943+ return retval;
83944+}
83945+
83946+static char *
83947+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
83948+ char *buf, int buflen)
83949+{
83950+ struct path path;
83951+ char *res;
83952+
83953+ path.dentry = (struct dentry *)dentry;
83954+ path.mnt = (struct vfsmount *)vfsmnt;
83955+
83956+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
83957+ by the RBAC system */
83958+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
83959+
83960+ return res;
83961+}
83962+
83963+static char *
83964+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
83965+ char *buf, int buflen)
83966+{
83967+ char *res;
83968+ struct path path;
83969+ struct path root;
83970+ struct task_struct *reaper = init_pid_ns.child_reaper;
83971+
83972+ path.dentry = (struct dentry *)dentry;
83973+ path.mnt = (struct vfsmount *)vfsmnt;
83974+
83975+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
83976+ get_fs_root(reaper->fs, &root);
83977+
83978+ read_seqlock_excl(&mount_lock);
83979+ write_seqlock(&rename_lock);
83980+ res = gen_full_path(&path, &root, buf, buflen);
83981+ write_sequnlock(&rename_lock);
83982+ read_sequnlock_excl(&mount_lock);
83983+
83984+ path_put(&root);
83985+ return res;
83986+}
83987+
83988+char *
83989+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
83990+{
83991+ char *ret;
83992+ read_seqlock_excl(&mount_lock);
83993+ write_seqlock(&rename_lock);
83994+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
83995+ PAGE_SIZE);
83996+ write_sequnlock(&rename_lock);
83997+ read_sequnlock_excl(&mount_lock);
83998+ return ret;
83999+}
84000+
84001+static char *
84002+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
84003+{
84004+ char *ret;
84005+ char *buf;
84006+ int buflen;
84007+
84008+ read_seqlock_excl(&mount_lock);
84009+ write_seqlock(&rename_lock);
84010+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
84011+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
84012+ buflen = (int)(ret - buf);
84013+ if (buflen >= 5)
84014+ prepend(&ret, &buflen, "/proc", 5);
84015+ else
84016+ ret = strcpy(buf, "<path too long>");
84017+ write_sequnlock(&rename_lock);
84018+ read_sequnlock_excl(&mount_lock);
84019+ return ret;
84020+}
84021+
84022+char *
84023+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
84024+{
84025+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
84026+ PAGE_SIZE);
84027+}
84028+
84029+char *
84030+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
84031+{
84032+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
84033+ PAGE_SIZE);
84034+}
84035+
84036+char *
84037+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
84038+{
84039+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
84040+ PAGE_SIZE);
84041+}
84042+
84043+char *
84044+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
84045+{
84046+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
84047+ PAGE_SIZE);
84048+}
84049+
84050+char *
84051+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
84052+{
84053+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
84054+ PAGE_SIZE);
84055+}
84056+
84057+__u32
84058+to_gr_audit(const __u32 reqmode)
84059+{
84060+ /* masks off auditable permission flags, then shifts them to create
84061+ auditing flags, and adds the special case of append auditing if
84062+ we're requesting write */
84063+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
84064+}
84065+
84066+struct acl_role_label *
84067+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
84068+ const gid_t gid)
84069+{
84070+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
84071+ struct acl_role_label *match;
84072+ struct role_allowed_ip *ipp;
84073+ unsigned int x;
84074+ u32 curr_ip = task->signal->saved_ip;
84075+
84076+ match = state->acl_role_set.r_hash[index];
84077+
84078+ while (match) {
84079+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
84080+ for (x = 0; x < match->domain_child_num; x++) {
84081+ if (match->domain_children[x] == uid)
84082+ goto found;
84083+ }
84084+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
84085+ break;
84086+ match = match->next;
84087+ }
84088+found:
84089+ if (match == NULL) {
84090+ try_group:
84091+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
84092+ match = state->acl_role_set.r_hash[index];
84093+
84094+ while (match) {
84095+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
84096+ for (x = 0; x < match->domain_child_num; x++) {
84097+ if (match->domain_children[x] == gid)
84098+ goto found2;
84099+ }
84100+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
84101+ break;
84102+ match = match->next;
84103+ }
84104+found2:
84105+ if (match == NULL)
84106+ match = state->default_role;
84107+ if (match->allowed_ips == NULL)
84108+ return match;
84109+ else {
84110+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
84111+ if (likely
84112+ ((ntohl(curr_ip) & ipp->netmask) ==
84113+ (ntohl(ipp->addr) & ipp->netmask)))
84114+ return match;
84115+ }
84116+ match = state->default_role;
84117+ }
84118+ } else if (match->allowed_ips == NULL) {
84119+ return match;
84120+ } else {
84121+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
84122+ if (likely
84123+ ((ntohl(curr_ip) & ipp->netmask) ==
84124+ (ntohl(ipp->addr) & ipp->netmask)))
84125+ return match;
84126+ }
84127+ goto try_group;
84128+ }
84129+
84130+ return match;
84131+}
84132+
84133+static struct acl_role_label *
84134+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
84135+ const gid_t gid)
84136+{
84137+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
84138+}
84139+
84140+struct acl_subject_label *
84141+lookup_acl_subj_label(const u64 ino, const dev_t dev,
84142+ const struct acl_role_label *role)
84143+{
84144+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
84145+ struct acl_subject_label *match;
84146+
84147+ match = role->subj_hash[index];
84148+
84149+ while (match && (match->inode != ino || match->device != dev ||
84150+ (match->mode & GR_DELETED))) {
84151+ match = match->next;
84152+ }
84153+
84154+ if (match && !(match->mode & GR_DELETED))
84155+ return match;
84156+ else
84157+ return NULL;
84158+}
84159+
84160+struct acl_subject_label *
84161+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
84162+ const struct acl_role_label *role)
84163+{
84164+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
84165+ struct acl_subject_label *match;
84166+
84167+ match = role->subj_hash[index];
84168+
84169+ while (match && (match->inode != ino || match->device != dev ||
84170+ !(match->mode & GR_DELETED))) {
84171+ match = match->next;
84172+ }
84173+
84174+ if (match && (match->mode & GR_DELETED))
84175+ return match;
84176+ else
84177+ return NULL;
84178+}
84179+
84180+static struct acl_object_label *
84181+lookup_acl_obj_label(const u64 ino, const dev_t dev,
84182+ const struct acl_subject_label *subj)
84183+{
84184+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
84185+ struct acl_object_label *match;
84186+
84187+ match = subj->obj_hash[index];
84188+
84189+ while (match && (match->inode != ino || match->device != dev ||
84190+ (match->mode & GR_DELETED))) {
84191+ match = match->next;
84192+ }
84193+
84194+ if (match && !(match->mode & GR_DELETED))
84195+ return match;
84196+ else
84197+ return NULL;
84198+}
84199+
84200+static struct acl_object_label *
84201+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
84202+ const struct acl_subject_label *subj)
84203+{
84204+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
84205+ struct acl_object_label *match;
84206+
84207+ match = subj->obj_hash[index];
84208+
84209+ while (match && (match->inode != ino || match->device != dev ||
84210+ !(match->mode & GR_DELETED))) {
84211+ match = match->next;
84212+ }
84213+
84214+ if (match && (match->mode & GR_DELETED))
84215+ return match;
84216+
84217+ match = subj->obj_hash[index];
84218+
84219+ while (match && (match->inode != ino || match->device != dev ||
84220+ (match->mode & GR_DELETED))) {
84221+ match = match->next;
84222+ }
84223+
84224+ if (match && !(match->mode & GR_DELETED))
84225+ return match;
84226+ else
84227+ return NULL;
84228+}
84229+
84230+struct name_entry *
84231+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
84232+{
84233+ unsigned int len = strlen(name);
84234+ unsigned int key = full_name_hash(name, len);
84235+ unsigned int index = key % state->name_set.n_size;
84236+ struct name_entry *match;
84237+
84238+ match = state->name_set.n_hash[index];
84239+
84240+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
84241+ match = match->next;
84242+
84243+ return match;
84244+}
84245+
84246+static struct name_entry *
84247+lookup_name_entry(const char *name)
84248+{
84249+ return __lookup_name_entry(&running_polstate, name);
84250+}
84251+
84252+static struct name_entry *
84253+lookup_name_entry_create(const char *name)
84254+{
84255+ unsigned int len = strlen(name);
84256+ unsigned int key = full_name_hash(name, len);
84257+ unsigned int index = key % running_polstate.name_set.n_size;
84258+ struct name_entry *match;
84259+
84260+ match = running_polstate.name_set.n_hash[index];
84261+
84262+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
84263+ !match->deleted))
84264+ match = match->next;
84265+
84266+ if (match && match->deleted)
84267+ return match;
84268+
84269+ match = running_polstate.name_set.n_hash[index];
84270+
84271+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
84272+ match->deleted))
84273+ match = match->next;
84274+
84275+ if (match && !match->deleted)
84276+ return match;
84277+ else
84278+ return NULL;
84279+}
84280+
84281+static struct inodev_entry *
84282+lookup_inodev_entry(const u64 ino, const dev_t dev)
84283+{
84284+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
84285+ struct inodev_entry *match;
84286+
84287+ match = running_polstate.inodev_set.i_hash[index];
84288+
84289+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
84290+ match = match->next;
84291+
84292+ return match;
84293+}
84294+
84295+void
84296+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
84297+{
84298+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
84299+ state->inodev_set.i_size);
84300+ struct inodev_entry **curr;
84301+
84302+ entry->prev = NULL;
84303+
84304+ curr = &state->inodev_set.i_hash[index];
84305+ if (*curr != NULL)
84306+ (*curr)->prev = entry;
84307+
84308+ entry->next = *curr;
84309+ *curr = entry;
84310+
84311+ return;
84312+}
84313+
84314+static void
84315+insert_inodev_entry(struct inodev_entry *entry)
84316+{
84317+ __insert_inodev_entry(&running_polstate, entry);
84318+}
84319+
84320+void
84321+insert_acl_obj_label(struct acl_object_label *obj,
84322+ struct acl_subject_label *subj)
84323+{
84324+ unsigned int index =
84325+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
84326+ struct acl_object_label **curr;
84327+
84328+ obj->prev = NULL;
84329+
84330+ curr = &subj->obj_hash[index];
84331+ if (*curr != NULL)
84332+ (*curr)->prev = obj;
84333+
84334+ obj->next = *curr;
84335+ *curr = obj;
84336+
84337+ return;
84338+}
84339+
84340+void
84341+insert_acl_subj_label(struct acl_subject_label *obj,
84342+ struct acl_role_label *role)
84343+{
84344+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
84345+ struct acl_subject_label **curr;
84346+
84347+ obj->prev = NULL;
84348+
84349+ curr = &role->subj_hash[index];
84350+ if (*curr != NULL)
84351+ (*curr)->prev = obj;
84352+
84353+ obj->next = *curr;
84354+ *curr = obj;
84355+
84356+ return;
84357+}
84358+
84359+/* derived from glibc fnmatch() 0: match, 1: no match*/
84360+
84361+static int
84362+glob_match(const char *p, const char *n)
84363+{
84364+ char c;
84365+
84366+ while ((c = *p++) != '\0') {
84367+ switch (c) {
84368+ case '?':
84369+ if (*n == '\0')
84370+ return 1;
84371+ else if (*n == '/')
84372+ return 1;
84373+ break;
84374+ case '\\':
84375+ if (*n != c)
84376+ return 1;
84377+ break;
84378+ case '*':
84379+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
84380+ if (*n == '/')
84381+ return 1;
84382+ else if (c == '?') {
84383+ if (*n == '\0')
84384+ return 1;
84385+ else
84386+ ++n;
84387+ }
84388+ }
84389+ if (c == '\0') {
84390+ return 0;
84391+ } else {
84392+ const char *endp;
84393+
84394+ if ((endp = strchr(n, '/')) == NULL)
84395+ endp = n + strlen(n);
84396+
84397+ if (c == '[') {
84398+ for (--p; n < endp; ++n)
84399+ if (!glob_match(p, n))
84400+ return 0;
84401+ } else if (c == '/') {
84402+ while (*n != '\0' && *n != '/')
84403+ ++n;
84404+ if (*n == '/' && !glob_match(p, n + 1))
84405+ return 0;
84406+ } else {
84407+ for (--p; n < endp; ++n)
84408+ if (*n == c && !glob_match(p, n))
84409+ return 0;
84410+ }
84411+
84412+ return 1;
84413+ }
84414+ case '[':
84415+ {
84416+ int not;
84417+ char cold;
84418+
84419+ if (*n == '\0' || *n == '/')
84420+ return 1;
84421+
84422+ not = (*p == '!' || *p == '^');
84423+ if (not)
84424+ ++p;
84425+
84426+ c = *p++;
84427+ for (;;) {
84428+ unsigned char fn = (unsigned char)*n;
84429+
84430+ if (c == '\0')
84431+ return 1;
84432+ else {
84433+ if (c == fn)
84434+ goto matched;
84435+ cold = c;
84436+ c = *p++;
84437+
84438+ if (c == '-' && *p != ']') {
84439+ unsigned char cend = *p++;
84440+
84441+ if (cend == '\0')
84442+ return 1;
84443+
84444+ if (cold <= fn && fn <= cend)
84445+ goto matched;
84446+
84447+ c = *p++;
84448+ }
84449+ }
84450+
84451+ if (c == ']')
84452+ break;
84453+ }
84454+ if (!not)
84455+ return 1;
84456+ break;
84457+ matched:
84458+ while (c != ']') {
84459+ if (c == '\0')
84460+ return 1;
84461+
84462+ c = *p++;
84463+ }
84464+ if (not)
84465+ return 1;
84466+ }
84467+ break;
84468+ default:
84469+ if (c != *n)
84470+ return 1;
84471+ }
84472+
84473+ ++n;
84474+ }
84475+
84476+ if (*n == '\0')
84477+ return 0;
84478+
84479+ if (*n == '/')
84480+ return 0;
84481+
84482+ return 1;
84483+}
84484+
84485+static struct acl_object_label *
84486+chk_glob_label(struct acl_object_label *globbed,
84487+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
84488+{
84489+ struct acl_object_label *tmp;
84490+
84491+ if (*path == NULL)
84492+ *path = gr_to_filename_nolock(dentry, mnt);
84493+
84494+ tmp = globbed;
84495+
84496+ while (tmp) {
84497+ if (!glob_match(tmp->filename, *path))
84498+ return tmp;
84499+ tmp = tmp->next;
84500+ }
84501+
84502+ return NULL;
84503+}
84504+
84505+static struct acl_object_label *
84506+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
84507+ const u64 curr_ino, const dev_t curr_dev,
84508+ const struct acl_subject_label *subj, char **path, const int checkglob)
84509+{
84510+ struct acl_subject_label *tmpsubj;
84511+ struct acl_object_label *retval;
84512+ struct acl_object_label *retval2;
84513+
84514+ tmpsubj = (struct acl_subject_label *) subj;
84515+ read_lock(&gr_inode_lock);
84516+ do {
84517+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
84518+ if (retval) {
84519+ if (checkglob && retval->globbed) {
84520+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
84521+ if (retval2)
84522+ retval = retval2;
84523+ }
84524+ break;
84525+ }
84526+ } while ((tmpsubj = tmpsubj->parent_subject));
84527+ read_unlock(&gr_inode_lock);
84528+
84529+ return retval;
84530+}
84531+
84532+static struct acl_object_label *
84533+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
84534+ struct dentry *curr_dentry,
84535+ const struct acl_subject_label *subj, char **path, const int checkglob)
84536+{
84537+ int newglob = checkglob;
84538+ u64 inode;
84539+ dev_t device;
84540+
84541+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
84542+ as we don't want a / * rule to match instead of the / object
84543+ don't do this for create lookups that call this function though, since they're looking up
84544+ on the parent and thus need globbing checks on all paths
84545+ */
84546+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
84547+ newglob = GR_NO_GLOB;
84548+
84549+ spin_lock(&curr_dentry->d_lock);
84550+ inode = __get_ino(curr_dentry);
84551+ device = __get_dev(curr_dentry);
84552+ spin_unlock(&curr_dentry->d_lock);
84553+
84554+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
84555+}
84556+
84557+#ifdef CONFIG_HUGETLBFS
84558+static inline bool
84559+is_hugetlbfs_mnt(const struct vfsmount *mnt)
84560+{
84561+ int i;
84562+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
84563+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
84564+ return true;
84565+ }
84566+
84567+ return false;
84568+}
84569+#endif
84570+
84571+static struct acl_object_label *
84572+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84573+ const struct acl_subject_label *subj, char *path, const int checkglob)
84574+{
84575+ struct dentry *dentry = (struct dentry *) l_dentry;
84576+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
84577+ struct inode * inode = d_backing_inode(dentry);
84578+ struct mount *real_mnt = real_mount(mnt);
84579+ struct acl_object_label *retval;
84580+ struct dentry *parent;
84581+
84582+ read_seqlock_excl(&mount_lock);
84583+ write_seqlock(&rename_lock);
84584+
84585+ if (unlikely((mnt == shm_mnt && inode->i_nlink == 0) || mnt == pipe_mnt ||
84586+#ifdef CONFIG_NET
84587+ mnt == sock_mnt ||
84588+#endif
84589+#ifdef CONFIG_HUGETLBFS
84590+ (is_hugetlbfs_mnt(mnt) && inode->i_nlink == 0) ||
84591+#endif
84592+ /* ignore Eric Biederman */
84593+ IS_PRIVATE(inode))) {
84594+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
84595+ goto out;
84596+ }
84597+
84598+ for (;;) {
84599+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
84600+ break;
84601+
84602+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
84603+ if (!mnt_has_parent(real_mnt))
84604+ break;
84605+
84606+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84607+ if (retval != NULL)
84608+ goto out;
84609+
84610+ dentry = real_mnt->mnt_mountpoint;
84611+ real_mnt = real_mnt->mnt_parent;
84612+ mnt = &real_mnt->mnt;
84613+ continue;
84614+ }
84615+
84616+ parent = dentry->d_parent;
84617+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84618+ if (retval != NULL)
84619+ goto out;
84620+
84621+ dentry = parent;
84622+ }
84623+
84624+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
84625+
84626+ /* gr_real_root is pinned so we don't have to hold a reference */
84627+ if (retval == NULL)
84628+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
84629+out:
84630+ write_sequnlock(&rename_lock);
84631+ read_sequnlock_excl(&mount_lock);
84632+
84633+ BUG_ON(retval == NULL);
84634+
84635+ return retval;
84636+}
84637+
84638+static struct acl_object_label *
84639+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84640+ const struct acl_subject_label *subj)
84641+{
84642+ char *path = NULL;
84643+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
84644+}
84645+
84646+static struct acl_object_label *
84647+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84648+ const struct acl_subject_label *subj)
84649+{
84650+ char *path = NULL;
84651+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
84652+}
84653+
84654+static struct acl_object_label *
84655+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84656+ const struct acl_subject_label *subj, char *path)
84657+{
84658+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
84659+}
84660+
84661+struct acl_subject_label *
84662+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
84663+ const struct acl_role_label *role)
84664+{
84665+ struct dentry *dentry = (struct dentry *) l_dentry;
84666+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
84667+ struct mount *real_mnt = real_mount(mnt);
84668+ struct acl_subject_label *retval;
84669+ struct dentry *parent;
84670+
84671+ read_seqlock_excl(&mount_lock);
84672+ write_seqlock(&rename_lock);
84673+
84674+ for (;;) {
84675+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
84676+ break;
84677+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
84678+ if (!mnt_has_parent(real_mnt))
84679+ break;
84680+
84681+ spin_lock(&dentry->d_lock);
84682+ read_lock(&gr_inode_lock);
84683+ retval =
84684+ lookup_acl_subj_label(__get_ino(dentry),
84685+ __get_dev(dentry), role);
84686+ read_unlock(&gr_inode_lock);
84687+ spin_unlock(&dentry->d_lock);
84688+ if (retval != NULL)
84689+ goto out;
84690+
84691+ dentry = real_mnt->mnt_mountpoint;
84692+ real_mnt = real_mnt->mnt_parent;
84693+ mnt = &real_mnt->mnt;
84694+ continue;
84695+ }
84696+
84697+ spin_lock(&dentry->d_lock);
84698+ read_lock(&gr_inode_lock);
84699+ retval = lookup_acl_subj_label(__get_ino(dentry),
84700+ __get_dev(dentry), role);
84701+ read_unlock(&gr_inode_lock);
84702+ parent = dentry->d_parent;
84703+ spin_unlock(&dentry->d_lock);
84704+
84705+ if (retval != NULL)
84706+ goto out;
84707+
84708+ dentry = parent;
84709+ }
84710+
84711+ spin_lock(&dentry->d_lock);
84712+ read_lock(&gr_inode_lock);
84713+ retval = lookup_acl_subj_label(__get_ino(dentry),
84714+ __get_dev(dentry), role);
84715+ read_unlock(&gr_inode_lock);
84716+ spin_unlock(&dentry->d_lock);
84717+
84718+ if (unlikely(retval == NULL)) {
84719+ /* gr_real_root is pinned, we don't need to hold a reference */
84720+ read_lock(&gr_inode_lock);
84721+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
84722+ __get_dev(gr_real_root.dentry), role);
84723+ read_unlock(&gr_inode_lock);
84724+ }
84725+out:
84726+ write_sequnlock(&rename_lock);
84727+ read_sequnlock_excl(&mount_lock);
84728+
84729+ BUG_ON(retval == NULL);
84730+
84731+ return retval;
84732+}
84733+
84734+void
84735+assign_special_role(const char *rolename)
84736+{
84737+ struct acl_object_label *obj;
84738+ struct acl_role_label *r;
84739+ struct acl_role_label *assigned = NULL;
84740+ struct task_struct *tsk;
84741+ struct file *filp;
84742+
84743+ FOR_EACH_ROLE_START(r)
84744+ if (!strcmp(rolename, r->rolename) &&
84745+ (r->roletype & GR_ROLE_SPECIAL)) {
84746+ assigned = r;
84747+ break;
84748+ }
84749+ FOR_EACH_ROLE_END(r)
84750+
84751+ if (!assigned)
84752+ return;
84753+
84754+ read_lock(&tasklist_lock);
84755+ read_lock(&grsec_exec_file_lock);
84756+
84757+ tsk = current->real_parent;
84758+ if (tsk == NULL)
84759+ goto out_unlock;
84760+
84761+ filp = tsk->exec_file;
84762+ if (filp == NULL)
84763+ goto out_unlock;
84764+
84765+ tsk->is_writable = 0;
84766+ tsk->inherited = 0;
84767+
84768+ tsk->acl_sp_role = 1;
84769+ tsk->acl_role_id = ++acl_sp_role_value;
84770+ tsk->role = assigned;
84771+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
84772+
84773+ /* ignore additional mmap checks for processes that are writable
84774+ by the default ACL */
84775+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
84776+ if (unlikely(obj->mode & GR_WRITE))
84777+ tsk->is_writable = 1;
84778+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
84779+ if (unlikely(obj->mode & GR_WRITE))
84780+ tsk->is_writable = 1;
84781+
84782+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
84783+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
84784+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
84785+#endif
84786+
84787+out_unlock:
84788+ read_unlock(&grsec_exec_file_lock);
84789+ read_unlock(&tasklist_lock);
84790+ return;
84791+}
84792+
84793+
84794+static void
84795+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
84796+{
84797+ struct task_struct *task = current;
84798+ const struct cred *cred = current_cred();
84799+
84800+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
84801+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84802+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84803+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
84804+
84805+ return;
84806+}
84807+
84808+static void
84809+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
84810+{
84811+ struct task_struct *task = current;
84812+ const struct cred *cred = current_cred();
84813+
84814+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
84815+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84816+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84817+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
84818+
84819+ return;
84820+}
84821+
84822+static void
84823+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
84824+{
84825+ struct task_struct *task = current;
84826+ const struct cred *cred = current_cred();
84827+
84828+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
84829+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
84830+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
84831+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
84832+
84833+ return;
84834+}
84835+
84836+static void
84837+gr_set_proc_res(struct task_struct *task)
84838+{
84839+ struct acl_subject_label *proc;
84840+ unsigned short i;
84841+
84842+ proc = task->acl;
84843+
84844+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
84845+ return;
84846+
84847+ for (i = 0; i < RLIM_NLIMITS; i++) {
84848+ unsigned long rlim_cur, rlim_max;
84849+
84850+ if (!(proc->resmask & (1U << i)))
84851+ continue;
84852+
84853+ rlim_cur = proc->res[i].rlim_cur;
84854+ rlim_max = proc->res[i].rlim_max;
84855+
84856+ if (i == RLIMIT_NOFILE) {
84857+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
84858+ if (rlim_cur > saved_sysctl_nr_open)
84859+ rlim_cur = saved_sysctl_nr_open;
84860+ if (rlim_max > saved_sysctl_nr_open)
84861+ rlim_max = saved_sysctl_nr_open;
84862+ }
84863+
84864+ task->signal->rlim[i].rlim_cur = rlim_cur;
84865+ task->signal->rlim[i].rlim_max = rlim_max;
84866+
84867+ if (i == RLIMIT_CPU)
84868+ update_rlimit_cpu(task, rlim_cur);
84869+ }
84870+
84871+ return;
84872+}
84873+
84874+/* both of the below must be called with
84875+ rcu_read_lock();
84876+ read_lock(&tasklist_lock);
84877+ read_lock(&grsec_exec_file_lock);
84878+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
84879+*/
84880+
84881+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
84882+{
84883+ char *tmpname;
84884+ struct acl_subject_label *tmpsubj;
84885+ struct file *filp;
84886+ struct name_entry *nmatch;
84887+
84888+ filp = task->exec_file;
84889+ if (filp == NULL)
84890+ return NULL;
84891+
84892+ /* the following is to apply the correct subject
84893+ on binaries running when the RBAC system
84894+ is enabled, when the binaries have been
84895+ replaced or deleted since their execution
84896+ -----
84897+ when the RBAC system starts, the inode/dev
84898+ from exec_file will be one the RBAC system
84899+ is unaware of. It only knows the inode/dev
84900+ of the present file on disk, or the absence
84901+ of it.
84902+ */
84903+
84904+ if (filename)
84905+ nmatch = __lookup_name_entry(state, filename);
84906+ else {
84907+ preempt_disable();
84908+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
84909+
84910+ nmatch = __lookup_name_entry(state, tmpname);
84911+ preempt_enable();
84912+ }
84913+ tmpsubj = NULL;
84914+ if (nmatch) {
84915+ if (nmatch->deleted)
84916+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
84917+ else
84918+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
84919+ }
84920+ /* this also works for the reload case -- if we don't match a potentially inherited subject
84921+ then we fall back to a normal lookup based on the binary's ino/dev
84922+ */
84923+ if (tmpsubj == NULL && fallback)
84924+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
84925+
84926+ return tmpsubj;
84927+}
84928+
84929+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
84930+{
84931+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
84932+}
84933+
84934+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
84935+{
84936+ struct acl_object_label *obj;
84937+ struct file *filp;
84938+
84939+ filp = task->exec_file;
84940+
84941+ task->acl = subj;
84942+ task->is_writable = 0;
84943+ /* ignore additional mmap checks for processes that are writable
84944+ by the default ACL */
84945+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
84946+ if (unlikely(obj->mode & GR_WRITE))
84947+ task->is_writable = 1;
84948+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
84949+ if (unlikely(obj->mode & GR_WRITE))
84950+ task->is_writable = 1;
84951+
84952+ gr_set_proc_res(task);
84953+
84954+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
84955+ 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);
84956+#endif
84957+}
84958+
84959+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
84960+{
84961+ __gr_apply_subject_to_task(&running_polstate, task, subj);
84962+}
84963+
84964+__u32
84965+gr_search_file(const struct dentry * dentry, const __u32 mode,
84966+ const struct vfsmount * mnt)
84967+{
84968+ __u32 retval = mode;
84969+ struct acl_subject_label *curracl;
84970+ struct acl_object_label *currobj;
84971+
84972+ if (unlikely(!(gr_status & GR_READY)))
84973+ return (mode & ~GR_AUDITS);
84974+
84975+ curracl = current->acl;
84976+
84977+ currobj = chk_obj_label(dentry, mnt, curracl);
84978+ retval = currobj->mode & mode;
84979+
84980+ /* if we're opening a specified transfer file for writing
84981+ (e.g. /dev/initctl), then transfer our role to init
84982+ */
84983+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
84984+ current->role->roletype & GR_ROLE_PERSIST)) {
84985+ struct task_struct *task = init_pid_ns.child_reaper;
84986+
84987+ if (task->role != current->role) {
84988+ struct acl_subject_label *subj;
84989+
84990+ task->acl_sp_role = 0;
84991+ task->acl_role_id = current->acl_role_id;
84992+ task->role = current->role;
84993+ rcu_read_lock();
84994+ read_lock(&grsec_exec_file_lock);
84995+ subj = gr_get_subject_for_task(task, NULL, 1);
84996+ gr_apply_subject_to_task(task, subj);
84997+ read_unlock(&grsec_exec_file_lock);
84998+ rcu_read_unlock();
84999+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
85000+ }
85001+ }
85002+
85003+ if (unlikely
85004+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
85005+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
85006+ __u32 new_mode = mode;
85007+
85008+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
85009+
85010+ retval = new_mode;
85011+
85012+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
85013+ new_mode |= GR_INHERIT;
85014+
85015+ if (!(mode & GR_NOLEARN))
85016+ gr_log_learn(dentry, mnt, new_mode);
85017+ }
85018+
85019+ return retval;
85020+}
85021+
85022+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
85023+ const struct dentry *parent,
85024+ const struct vfsmount *mnt)
85025+{
85026+ struct name_entry *match;
85027+ struct acl_object_label *matchpo;
85028+ struct acl_subject_label *curracl;
85029+ char *path;
85030+
85031+ if (unlikely(!(gr_status & GR_READY)))
85032+ return NULL;
85033+
85034+ preempt_disable();
85035+ path = gr_to_filename_rbac(new_dentry, mnt);
85036+ match = lookup_name_entry_create(path);
85037+
85038+ curracl = current->acl;
85039+
85040+ if (match) {
85041+ read_lock(&gr_inode_lock);
85042+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
85043+ read_unlock(&gr_inode_lock);
85044+
85045+ if (matchpo) {
85046+ preempt_enable();
85047+ return matchpo;
85048+ }
85049+ }
85050+
85051+ // lookup parent
85052+
85053+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
85054+
85055+ preempt_enable();
85056+ return matchpo;
85057+}
85058+
85059+__u32
85060+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
85061+ const struct vfsmount * mnt, const __u32 mode)
85062+{
85063+ struct acl_object_label *matchpo;
85064+ __u32 retval;
85065+
85066+ if (unlikely(!(gr_status & GR_READY)))
85067+ return (mode & ~GR_AUDITS);
85068+
85069+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
85070+
85071+ retval = matchpo->mode & mode;
85072+
85073+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
85074+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
85075+ __u32 new_mode = mode;
85076+
85077+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
85078+
85079+ gr_log_learn(new_dentry, mnt, new_mode);
85080+ return new_mode;
85081+ }
85082+
85083+ return retval;
85084+}
85085+
85086+__u32
85087+gr_check_link(const struct dentry * new_dentry,
85088+ const struct dentry * parent_dentry,
85089+ const struct vfsmount * parent_mnt,
85090+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
85091+{
85092+ struct acl_object_label *obj;
85093+ __u32 oldmode, newmode;
85094+ __u32 needmode;
85095+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
85096+ GR_DELETE | GR_INHERIT;
85097+
85098+ if (unlikely(!(gr_status & GR_READY)))
85099+ return (GR_CREATE | GR_LINK);
85100+
85101+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
85102+ oldmode = obj->mode;
85103+
85104+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
85105+ newmode = obj->mode;
85106+
85107+ needmode = newmode & checkmodes;
85108+
85109+ // old name for hardlink must have at least the permissions of the new name
85110+ if ((oldmode & needmode) != needmode)
85111+ goto bad;
85112+
85113+ // if old name had restrictions/auditing, make sure the new name does as well
85114+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
85115+
85116+ // don't allow hardlinking of suid/sgid/fcapped files without permission
85117+ if (is_privileged_binary(old_dentry))
85118+ needmode |= GR_SETID;
85119+
85120+ if ((newmode & needmode) != needmode)
85121+ goto bad;
85122+
85123+ // enforce minimum permissions
85124+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
85125+ return newmode;
85126+bad:
85127+ needmode = oldmode;
85128+ if (is_privileged_binary(old_dentry))
85129+ needmode |= GR_SETID;
85130+
85131+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
85132+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
85133+ return (GR_CREATE | GR_LINK);
85134+ } else if (newmode & GR_SUPPRESS)
85135+ return GR_SUPPRESS;
85136+ else
85137+ return 0;
85138+}
85139+
85140+int
85141+gr_check_hidden_task(const struct task_struct *task)
85142+{
85143+ if (unlikely(!(gr_status & GR_READY)))
85144+ return 0;
85145+
85146+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
85147+ return 1;
85148+
85149+ return 0;
85150+}
85151+
85152+int
85153+gr_check_protected_task(const struct task_struct *task)
85154+{
85155+ if (unlikely(!(gr_status & GR_READY) || !task))
85156+ return 0;
85157+
85158+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
85159+ task->acl != current->acl)
85160+ return 1;
85161+
85162+ return 0;
85163+}
85164+
85165+int
85166+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
85167+{
85168+ struct task_struct *p;
85169+ int ret = 0;
85170+
85171+ if (unlikely(!(gr_status & GR_READY) || !pid))
85172+ return ret;
85173+
85174+ read_lock(&tasklist_lock);
85175+ do_each_pid_task(pid, type, p) {
85176+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
85177+ p->acl != current->acl) {
85178+ ret = 1;
85179+ goto out;
85180+ }
85181+ } while_each_pid_task(pid, type, p);
85182+out:
85183+ read_unlock(&tasklist_lock);
85184+
85185+ return ret;
85186+}
85187+
85188+void
85189+gr_copy_label(struct task_struct *tsk)
85190+{
85191+ struct task_struct *p = current;
85192+
85193+ tsk->inherited = p->inherited;
85194+ tsk->acl_sp_role = 0;
85195+ tsk->acl_role_id = p->acl_role_id;
85196+ tsk->acl = p->acl;
85197+ tsk->role = p->role;
85198+ tsk->signal->used_accept = 0;
85199+ tsk->signal->curr_ip = p->signal->curr_ip;
85200+ tsk->signal->saved_ip = p->signal->saved_ip;
85201+ if (p->exec_file)
85202+ get_file(p->exec_file);
85203+ tsk->exec_file = p->exec_file;
85204+ tsk->is_writable = p->is_writable;
85205+ if (unlikely(p->signal->used_accept)) {
85206+ p->signal->curr_ip = 0;
85207+ p->signal->saved_ip = 0;
85208+ }
85209+
85210+ return;
85211+}
85212+
85213+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
85214+
85215+int
85216+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
85217+{
85218+ unsigned int i;
85219+ __u16 num;
85220+ uid_t *uidlist;
85221+ uid_t curuid;
85222+ int realok = 0;
85223+ int effectiveok = 0;
85224+ int fsok = 0;
85225+ uid_t globalreal, globaleffective, globalfs;
85226+
85227+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
85228+ struct user_struct *user;
85229+
85230+ if (!uid_valid(real))
85231+ goto skipit;
85232+
85233+ /* find user based on global namespace */
85234+
85235+ globalreal = GR_GLOBAL_UID(real);
85236+
85237+ user = find_user(make_kuid(&init_user_ns, globalreal));
85238+ if (user == NULL)
85239+ goto skipit;
85240+
85241+ if (gr_process_kernel_setuid_ban(user)) {
85242+ /* for find_user */
85243+ free_uid(user);
85244+ return 1;
85245+ }
85246+
85247+ /* for find_user */
85248+ free_uid(user);
85249+
85250+skipit:
85251+#endif
85252+
85253+ if (unlikely(!(gr_status & GR_READY)))
85254+ return 0;
85255+
85256+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
85257+ gr_log_learn_uid_change(real, effective, fs);
85258+
85259+ num = current->acl->user_trans_num;
85260+ uidlist = current->acl->user_transitions;
85261+
85262+ if (uidlist == NULL)
85263+ return 0;
85264+
85265+ if (!uid_valid(real)) {
85266+ realok = 1;
85267+ globalreal = (uid_t)-1;
85268+ } else {
85269+ globalreal = GR_GLOBAL_UID(real);
85270+ }
85271+ if (!uid_valid(effective)) {
85272+ effectiveok = 1;
85273+ globaleffective = (uid_t)-1;
85274+ } else {
85275+ globaleffective = GR_GLOBAL_UID(effective);
85276+ }
85277+ if (!uid_valid(fs)) {
85278+ fsok = 1;
85279+ globalfs = (uid_t)-1;
85280+ } else {
85281+ globalfs = GR_GLOBAL_UID(fs);
85282+ }
85283+
85284+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
85285+ for (i = 0; i < num; i++) {
85286+ curuid = uidlist[i];
85287+ if (globalreal == curuid)
85288+ realok = 1;
85289+ if (globaleffective == curuid)
85290+ effectiveok = 1;
85291+ if (globalfs == curuid)
85292+ fsok = 1;
85293+ }
85294+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
85295+ for (i = 0; i < num; i++) {
85296+ curuid = uidlist[i];
85297+ if (globalreal == curuid)
85298+ break;
85299+ if (globaleffective == curuid)
85300+ break;
85301+ if (globalfs == curuid)
85302+ break;
85303+ }
85304+ /* not in deny list */
85305+ if (i == num) {
85306+ realok = 1;
85307+ effectiveok = 1;
85308+ fsok = 1;
85309+ }
85310+ }
85311+
85312+ if (realok && effectiveok && fsok)
85313+ return 0;
85314+ else {
85315+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
85316+ return 1;
85317+ }
85318+}
85319+
85320+int
85321+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
85322+{
85323+ unsigned int i;
85324+ __u16 num;
85325+ gid_t *gidlist;
85326+ gid_t curgid;
85327+ int realok = 0;
85328+ int effectiveok = 0;
85329+ int fsok = 0;
85330+ gid_t globalreal, globaleffective, globalfs;
85331+
85332+ if (unlikely(!(gr_status & GR_READY)))
85333+ return 0;
85334+
85335+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
85336+ gr_log_learn_gid_change(real, effective, fs);
85337+
85338+ num = current->acl->group_trans_num;
85339+ gidlist = current->acl->group_transitions;
85340+
85341+ if (gidlist == NULL)
85342+ return 0;
85343+
85344+ if (!gid_valid(real)) {
85345+ realok = 1;
85346+ globalreal = (gid_t)-1;
85347+ } else {
85348+ globalreal = GR_GLOBAL_GID(real);
85349+ }
85350+ if (!gid_valid(effective)) {
85351+ effectiveok = 1;
85352+ globaleffective = (gid_t)-1;
85353+ } else {
85354+ globaleffective = GR_GLOBAL_GID(effective);
85355+ }
85356+ if (!gid_valid(fs)) {
85357+ fsok = 1;
85358+ globalfs = (gid_t)-1;
85359+ } else {
85360+ globalfs = GR_GLOBAL_GID(fs);
85361+ }
85362+
85363+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
85364+ for (i = 0; i < num; i++) {
85365+ curgid = gidlist[i];
85366+ if (globalreal == curgid)
85367+ realok = 1;
85368+ if (globaleffective == curgid)
85369+ effectiveok = 1;
85370+ if (globalfs == curgid)
85371+ fsok = 1;
85372+ }
85373+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
85374+ for (i = 0; i < num; i++) {
85375+ curgid = gidlist[i];
85376+ if (globalreal == curgid)
85377+ break;
85378+ if (globaleffective == curgid)
85379+ break;
85380+ if (globalfs == curgid)
85381+ break;
85382+ }
85383+ /* not in deny list */
85384+ if (i == num) {
85385+ realok = 1;
85386+ effectiveok = 1;
85387+ fsok = 1;
85388+ }
85389+ }
85390+
85391+ if (realok && effectiveok && fsok)
85392+ return 0;
85393+ else {
85394+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
85395+ return 1;
85396+ }
85397+}
85398+
85399+extern int gr_acl_is_capable(const int cap);
85400+
85401+void
85402+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
85403+{
85404+ struct acl_role_label *role = task->role;
85405+ struct acl_role_label *origrole = role;
85406+ struct acl_subject_label *subj = NULL;
85407+ struct acl_object_label *obj;
85408+ struct file *filp;
85409+ uid_t uid;
85410+ gid_t gid;
85411+
85412+ if (unlikely(!(gr_status & GR_READY)))
85413+ return;
85414+
85415+ uid = GR_GLOBAL_UID(kuid);
85416+ gid = GR_GLOBAL_GID(kgid);
85417+
85418+ filp = task->exec_file;
85419+
85420+ /* kernel process, we'll give them the kernel role */
85421+ if (unlikely(!filp)) {
85422+ task->role = running_polstate.kernel_role;
85423+ task->acl = running_polstate.kernel_role->root_label;
85424+ return;
85425+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
85426+ /* save the current ip at time of role lookup so that the proper
85427+ IP will be learned for role_allowed_ip */
85428+ task->signal->saved_ip = task->signal->curr_ip;
85429+ role = lookup_acl_role_label(task, uid, gid);
85430+ }
85431+
85432+ /* don't change the role if we're not a privileged process */
85433+ if (role && task->role != role &&
85434+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
85435+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
85436+ return;
85437+
85438+ task->role = role;
85439+
85440+ if (task->inherited) {
85441+ /* if we reached our subject through inheritance, then first see
85442+ if there's a subject of the same name in the new role that has
85443+ an object that would result in the same inherited subject
85444+ */
85445+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
85446+ if (subj) {
85447+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
85448+ if (!(obj->mode & GR_INHERIT))
85449+ subj = NULL;
85450+ }
85451+
85452+ }
85453+ if (subj == NULL) {
85454+ /* otherwise:
85455+ perform subject lookup in possibly new role
85456+ we can use this result below in the case where role == task->role
85457+ */
85458+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
85459+ }
85460+
85461+ /* if we changed uid/gid, but result in the same role
85462+ and are using inheritance, don't lose the inherited subject
85463+ if current subject is other than what normal lookup
85464+ would result in, we arrived via inheritance, don't
85465+ lose subject
85466+ */
85467+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
85468+ (subj == task->acl)))
85469+ task->acl = subj;
85470+
85471+ /* leave task->inherited unaffected */
85472+
85473+ task->is_writable = 0;
85474+
85475+ /* ignore additional mmap checks for processes that are writable
85476+ by the default ACL */
85477+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
85478+ if (unlikely(obj->mode & GR_WRITE))
85479+ task->is_writable = 1;
85480+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
85481+ if (unlikely(obj->mode & GR_WRITE))
85482+ task->is_writable = 1;
85483+
85484+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85485+ 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);
85486+#endif
85487+
85488+ gr_set_proc_res(task);
85489+
85490+ return;
85491+}
85492+
85493+int
85494+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
85495+ const int unsafe_flags)
85496+{
85497+ struct task_struct *task = current;
85498+ struct acl_subject_label *newacl;
85499+ struct acl_object_label *obj;
85500+ __u32 retmode;
85501+
85502+ if (unlikely(!(gr_status & GR_READY)))
85503+ return 0;
85504+
85505+ newacl = chk_subj_label(dentry, mnt, task->role);
85506+
85507+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
85508+ did an exec
85509+ */
85510+ rcu_read_lock();
85511+ read_lock(&tasklist_lock);
85512+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
85513+ (task->parent->acl->mode & GR_POVERRIDE))) {
85514+ read_unlock(&tasklist_lock);
85515+ rcu_read_unlock();
85516+ goto skip_check;
85517+ }
85518+ read_unlock(&tasklist_lock);
85519+ rcu_read_unlock();
85520+
85521+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
85522+ !(task->role->roletype & GR_ROLE_GOD) &&
85523+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
85524+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
85525+ if (unsafe_flags & LSM_UNSAFE_SHARE)
85526+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
85527+ else
85528+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
85529+ return -EACCES;
85530+ }
85531+
85532+skip_check:
85533+
85534+ obj = chk_obj_label(dentry, mnt, task->acl);
85535+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
85536+
85537+ if (!(task->acl->mode & GR_INHERITLEARN) &&
85538+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
85539+ if (obj->nested)
85540+ task->acl = obj->nested;
85541+ else
85542+ task->acl = newacl;
85543+ task->inherited = 0;
85544+ } else {
85545+ task->inherited = 1;
85546+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
85547+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
85548+ }
85549+
85550+ task->is_writable = 0;
85551+
85552+ /* ignore additional mmap checks for processes that are writable
85553+ by the default ACL */
85554+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
85555+ if (unlikely(obj->mode & GR_WRITE))
85556+ task->is_writable = 1;
85557+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
85558+ if (unlikely(obj->mode & GR_WRITE))
85559+ task->is_writable = 1;
85560+
85561+ gr_set_proc_res(task);
85562+
85563+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
85564+ 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);
85565+#endif
85566+ return 0;
85567+}
85568+
85569+/* always called with valid inodev ptr */
85570+static void
85571+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
85572+{
85573+ struct acl_object_label *matchpo;
85574+ struct acl_subject_label *matchps;
85575+ struct acl_subject_label *subj;
85576+ struct acl_role_label *role;
85577+ unsigned int x;
85578+
85579+ FOR_EACH_ROLE_START(role)
85580+ FOR_EACH_SUBJECT_START(role, subj, x)
85581+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
85582+ matchpo->mode |= GR_DELETED;
85583+ FOR_EACH_SUBJECT_END(subj,x)
85584+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
85585+ /* nested subjects aren't in the role's subj_hash table */
85586+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
85587+ matchpo->mode |= GR_DELETED;
85588+ FOR_EACH_NESTED_SUBJECT_END(subj)
85589+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
85590+ matchps->mode |= GR_DELETED;
85591+ FOR_EACH_ROLE_END(role)
85592+
85593+ inodev->nentry->deleted = 1;
85594+
85595+ return;
85596+}
85597+
85598+void
85599+gr_handle_delete(const u64 ino, const dev_t dev)
85600+{
85601+ struct inodev_entry *inodev;
85602+
85603+ if (unlikely(!(gr_status & GR_READY)))
85604+ return;
85605+
85606+ write_lock(&gr_inode_lock);
85607+ inodev = lookup_inodev_entry(ino, dev);
85608+ if (inodev != NULL)
85609+ do_handle_delete(inodev, ino, dev);
85610+ write_unlock(&gr_inode_lock);
85611+
85612+ return;
85613+}
85614+
85615+static void
85616+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
85617+ const u64 newinode, const dev_t newdevice,
85618+ struct acl_subject_label *subj)
85619+{
85620+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
85621+ struct acl_object_label *match;
85622+
85623+ match = subj->obj_hash[index];
85624+
85625+ while (match && (match->inode != oldinode ||
85626+ match->device != olddevice ||
85627+ !(match->mode & GR_DELETED)))
85628+ match = match->next;
85629+
85630+ if (match && (match->inode == oldinode)
85631+ && (match->device == olddevice)
85632+ && (match->mode & GR_DELETED)) {
85633+ if (match->prev == NULL) {
85634+ subj->obj_hash[index] = match->next;
85635+ if (match->next != NULL)
85636+ match->next->prev = NULL;
85637+ } else {
85638+ match->prev->next = match->next;
85639+ if (match->next != NULL)
85640+ match->next->prev = match->prev;
85641+ }
85642+ match->prev = NULL;
85643+ match->next = NULL;
85644+ match->inode = newinode;
85645+ match->device = newdevice;
85646+ match->mode &= ~GR_DELETED;
85647+
85648+ insert_acl_obj_label(match, subj);
85649+ }
85650+
85651+ return;
85652+}
85653+
85654+static void
85655+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
85656+ const u64 newinode, const dev_t newdevice,
85657+ struct acl_role_label *role)
85658+{
85659+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
85660+ struct acl_subject_label *match;
85661+
85662+ match = role->subj_hash[index];
85663+
85664+ while (match && (match->inode != oldinode ||
85665+ match->device != olddevice ||
85666+ !(match->mode & GR_DELETED)))
85667+ match = match->next;
85668+
85669+ if (match && (match->inode == oldinode)
85670+ && (match->device == olddevice)
85671+ && (match->mode & GR_DELETED)) {
85672+ if (match->prev == NULL) {
85673+ role->subj_hash[index] = match->next;
85674+ if (match->next != NULL)
85675+ match->next->prev = NULL;
85676+ } else {
85677+ match->prev->next = match->next;
85678+ if (match->next != NULL)
85679+ match->next->prev = match->prev;
85680+ }
85681+ match->prev = NULL;
85682+ match->next = NULL;
85683+ match->inode = newinode;
85684+ match->device = newdevice;
85685+ match->mode &= ~GR_DELETED;
85686+
85687+ insert_acl_subj_label(match, role);
85688+ }
85689+
85690+ return;
85691+}
85692+
85693+static void
85694+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
85695+ const u64 newinode, const dev_t newdevice)
85696+{
85697+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
85698+ struct inodev_entry *match;
85699+
85700+ match = running_polstate.inodev_set.i_hash[index];
85701+
85702+ while (match && (match->nentry->inode != oldinode ||
85703+ match->nentry->device != olddevice || !match->nentry->deleted))
85704+ match = match->next;
85705+
85706+ if (match && (match->nentry->inode == oldinode)
85707+ && (match->nentry->device == olddevice) &&
85708+ match->nentry->deleted) {
85709+ if (match->prev == NULL) {
85710+ running_polstate.inodev_set.i_hash[index] = match->next;
85711+ if (match->next != NULL)
85712+ match->next->prev = NULL;
85713+ } else {
85714+ match->prev->next = match->next;
85715+ if (match->next != NULL)
85716+ match->next->prev = match->prev;
85717+ }
85718+ match->prev = NULL;
85719+ match->next = NULL;
85720+ match->nentry->inode = newinode;
85721+ match->nentry->device = newdevice;
85722+ match->nentry->deleted = 0;
85723+
85724+ insert_inodev_entry(match);
85725+ }
85726+
85727+ return;
85728+}
85729+
85730+static void
85731+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
85732+{
85733+ struct acl_subject_label *subj;
85734+ struct acl_role_label *role;
85735+ unsigned int x;
85736+
85737+ FOR_EACH_ROLE_START(role)
85738+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
85739+
85740+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
85741+ if ((subj->inode == ino) && (subj->device == dev)) {
85742+ subj->inode = ino;
85743+ subj->device = dev;
85744+ }
85745+ /* nested subjects aren't in the role's subj_hash table */
85746+ update_acl_obj_label(matchn->inode, matchn->device,
85747+ ino, dev, subj);
85748+ FOR_EACH_NESTED_SUBJECT_END(subj)
85749+ FOR_EACH_SUBJECT_START(role, subj, x)
85750+ update_acl_obj_label(matchn->inode, matchn->device,
85751+ ino, dev, subj);
85752+ FOR_EACH_SUBJECT_END(subj,x)
85753+ FOR_EACH_ROLE_END(role)
85754+
85755+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
85756+
85757+ return;
85758+}
85759+
85760+static void
85761+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
85762+ const struct vfsmount *mnt)
85763+{
85764+ u64 ino = __get_ino(dentry);
85765+ dev_t dev = __get_dev(dentry);
85766+
85767+ __do_handle_create(matchn, ino, dev);
85768+
85769+ return;
85770+}
85771+
85772+void
85773+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
85774+{
85775+ struct name_entry *matchn;
85776+
85777+ if (unlikely(!(gr_status & GR_READY)))
85778+ return;
85779+
85780+ preempt_disable();
85781+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
85782+
85783+ if (unlikely((unsigned long)matchn)) {
85784+ write_lock(&gr_inode_lock);
85785+ do_handle_create(matchn, dentry, mnt);
85786+ write_unlock(&gr_inode_lock);
85787+ }
85788+ preempt_enable();
85789+
85790+ return;
85791+}
85792+
85793+void
85794+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
85795+{
85796+ struct name_entry *matchn;
85797+
85798+ if (unlikely(!(gr_status & GR_READY)))
85799+ return;
85800+
85801+ preempt_disable();
85802+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
85803+
85804+ if (unlikely((unsigned long)matchn)) {
85805+ write_lock(&gr_inode_lock);
85806+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
85807+ write_unlock(&gr_inode_lock);
85808+ }
85809+ preempt_enable();
85810+
85811+ return;
85812+}
85813+
85814+void
85815+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
85816+ struct dentry *old_dentry,
85817+ struct dentry *new_dentry,
85818+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
85819+{
85820+ struct name_entry *matchn;
85821+ struct name_entry *matchn2 = NULL;
85822+ struct inodev_entry *inodev;
85823+ struct inode *inode = d_backing_inode(new_dentry);
85824+ struct inode *old_inode = d_backing_inode(old_dentry);
85825+ u64 old_ino = __get_ino(old_dentry);
85826+ dev_t old_dev = __get_dev(old_dentry);
85827+ unsigned int exchange = flags & RENAME_EXCHANGE;
85828+
85829+ /* vfs_rename swaps the name and parent link for old_dentry and
85830+ new_dentry
85831+ at this point, old_dentry has the new name, parent link, and inode
85832+ for the renamed file
85833+ if a file is being replaced by a rename, new_dentry has the inode
85834+ and name for the replaced file
85835+ */
85836+
85837+ if (unlikely(!(gr_status & GR_READY)))
85838+ return;
85839+
85840+ preempt_disable();
85841+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
85842+
85843+ /* exchange cases:
85844+ a filename exists for the source, but not dest
85845+ do a recreate on source
85846+ a filename exists for the dest, but not source
85847+ do a recreate on dest
85848+ a filename exists for both source and dest
85849+ delete source and dest, then create source and dest
85850+ a filename exists for neither source nor dest
85851+ no updates needed
85852+
85853+ the name entry lookups get us the old inode/dev associated with
85854+ each name, so do the deletes first (if possible) so that when
85855+ we do the create, we pick up on the right entries
85856+ */
85857+
85858+ if (exchange)
85859+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
85860+
85861+ /* we wouldn't have to check d_inode if it weren't for
85862+ NFS silly-renaming
85863+ */
85864+
85865+ write_lock(&gr_inode_lock);
85866+ if (unlikely((replace || exchange) && inode)) {
85867+ u64 new_ino = __get_ino(new_dentry);
85868+ dev_t new_dev = __get_dev(new_dentry);
85869+
85870+ inodev = lookup_inodev_entry(new_ino, new_dev);
85871+ if (inodev != NULL && ((inode->i_nlink <= 1) || d_is_dir(new_dentry)))
85872+ do_handle_delete(inodev, new_ino, new_dev);
85873+ }
85874+
85875+ inodev = lookup_inodev_entry(old_ino, old_dev);
85876+ if (inodev != NULL && ((old_inode->i_nlink <= 1) || d_is_dir(old_dentry)))
85877+ do_handle_delete(inodev, old_ino, old_dev);
85878+
85879+ if (unlikely(matchn != NULL))
85880+ do_handle_create(matchn, old_dentry, mnt);
85881+
85882+ if (unlikely(matchn2 != NULL))
85883+ do_handle_create(matchn2, new_dentry, mnt);
85884+
85885+ write_unlock(&gr_inode_lock);
85886+ preempt_enable();
85887+
85888+ return;
85889+}
85890+
85891+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
85892+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
85893+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
85894+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
85895+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
85896+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
85897+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
85898+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
85899+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
85900+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
85901+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
85902+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
85903+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
85904+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
85905+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
85906+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
85907+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
85908+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
85909+};
85910+
85911+void
85912+gr_learn_resource(const struct task_struct *task,
85913+ const int res, const unsigned long wanted, const int gt)
85914+{
85915+ struct acl_subject_label *acl;
85916+ const struct cred *cred;
85917+
85918+ if (unlikely((gr_status & GR_READY) &&
85919+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
85920+ goto skip_reslog;
85921+
85922+ gr_log_resource(task, res, wanted, gt);
85923+skip_reslog:
85924+
85925+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
85926+ return;
85927+
85928+ acl = task->acl;
85929+
85930+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
85931+ !(acl->resmask & (1U << (unsigned short) res))))
85932+ return;
85933+
85934+ if (wanted >= acl->res[res].rlim_cur) {
85935+ unsigned long res_add;
85936+
85937+ res_add = wanted + res_learn_bumps[res];
85938+
85939+ acl->res[res].rlim_cur = res_add;
85940+
85941+ if (wanted > acl->res[res].rlim_max)
85942+ acl->res[res].rlim_max = res_add;
85943+
85944+ /* only log the subject filename, since resource logging is supported for
85945+ single-subject learning only */
85946+ rcu_read_lock();
85947+ cred = __task_cred(task);
85948+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
85949+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
85950+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
85951+ "", (unsigned long) res, &task->signal->saved_ip);
85952+ rcu_read_unlock();
85953+ }
85954+
85955+ return;
85956+}
85957+EXPORT_SYMBOL_GPL(gr_learn_resource);
85958+#endif
85959+
85960+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
85961+void
85962+pax_set_initial_flags(struct linux_binprm *bprm)
85963+{
85964+ struct task_struct *task = current;
85965+ struct acl_subject_label *proc;
85966+ unsigned long flags;
85967+
85968+ if (unlikely(!(gr_status & GR_READY)))
85969+ return;
85970+
85971+ flags = pax_get_flags(task);
85972+
85973+ proc = task->acl;
85974+
85975+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
85976+ flags &= ~MF_PAX_PAGEEXEC;
85977+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
85978+ flags &= ~MF_PAX_SEGMEXEC;
85979+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
85980+ flags &= ~MF_PAX_RANDMMAP;
85981+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
85982+ flags &= ~MF_PAX_EMUTRAMP;
85983+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
85984+ flags &= ~MF_PAX_MPROTECT;
85985+
85986+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
85987+ flags |= MF_PAX_PAGEEXEC;
85988+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
85989+ flags |= MF_PAX_SEGMEXEC;
85990+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
85991+ flags |= MF_PAX_RANDMMAP;
85992+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
85993+ flags |= MF_PAX_EMUTRAMP;
85994+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
85995+ flags |= MF_PAX_MPROTECT;
85996+
85997+ pax_set_flags(task, flags);
85998+
85999+ return;
86000+}
86001+#endif
86002+
86003+int
86004+gr_handle_proc_ptrace(struct task_struct *task)
86005+{
86006+ struct file *filp;
86007+ struct task_struct *tmp = task;
86008+ struct task_struct *curtemp = current;
86009+ __u32 retmode;
86010+
86011+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
86012+ if (unlikely(!(gr_status & GR_READY)))
86013+ return 0;
86014+#endif
86015+
86016+ read_lock(&tasklist_lock);
86017+ read_lock(&grsec_exec_file_lock);
86018+ filp = task->exec_file;
86019+
86020+ while (task_pid_nr(tmp) > 0) {
86021+ if (tmp == curtemp)
86022+ break;
86023+ tmp = tmp->real_parent;
86024+ }
86025+
86026+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
86027+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
86028+ read_unlock(&grsec_exec_file_lock);
86029+ read_unlock(&tasklist_lock);
86030+ return 1;
86031+ }
86032+
86033+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
86034+ if (!(gr_status & GR_READY)) {
86035+ read_unlock(&grsec_exec_file_lock);
86036+ read_unlock(&tasklist_lock);
86037+ return 0;
86038+ }
86039+#endif
86040+
86041+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
86042+ read_unlock(&grsec_exec_file_lock);
86043+ read_unlock(&tasklist_lock);
86044+
86045+ if (retmode & GR_NOPTRACE)
86046+ return 1;
86047+
86048+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
86049+ && (current->acl != task->acl || (current->acl != current->role->root_label
86050+ && task_pid_nr(current) != task_pid_nr(task))))
86051+ return 1;
86052+
86053+ return 0;
86054+}
86055+
86056+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
86057+{
86058+ if (unlikely(!(gr_status & GR_READY)))
86059+ return;
86060+
86061+ if (!(current->role->roletype & GR_ROLE_GOD))
86062+ return;
86063+
86064+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
86065+ p->role->rolename, gr_task_roletype_to_char(p),
86066+ p->acl->filename);
86067+}
86068+
86069+int
86070+gr_handle_ptrace(struct task_struct *task, const long request)
86071+{
86072+ struct task_struct *tmp = task;
86073+ struct task_struct *curtemp = current;
86074+ __u32 retmode;
86075+
86076+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
86077+ if (unlikely(!(gr_status & GR_READY)))
86078+ return 0;
86079+#endif
86080+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
86081+ read_lock(&tasklist_lock);
86082+ while (task_pid_nr(tmp) > 0) {
86083+ if (tmp == curtemp)
86084+ break;
86085+ tmp = tmp->real_parent;
86086+ }
86087+
86088+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
86089+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
86090+ read_unlock(&tasklist_lock);
86091+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86092+ return 1;
86093+ }
86094+ read_unlock(&tasklist_lock);
86095+ }
86096+
86097+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
86098+ if (!(gr_status & GR_READY))
86099+ return 0;
86100+#endif
86101+
86102+ read_lock(&grsec_exec_file_lock);
86103+ if (unlikely(!task->exec_file)) {
86104+ read_unlock(&grsec_exec_file_lock);
86105+ return 0;
86106+ }
86107+
86108+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
86109+ read_unlock(&grsec_exec_file_lock);
86110+
86111+ if (retmode & GR_NOPTRACE) {
86112+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86113+ return 1;
86114+ }
86115+
86116+ if (retmode & GR_PTRACERD) {
86117+ switch (request) {
86118+ case PTRACE_SEIZE:
86119+ case PTRACE_POKETEXT:
86120+ case PTRACE_POKEDATA:
86121+ case PTRACE_POKEUSR:
86122+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
86123+ case PTRACE_SETREGS:
86124+ case PTRACE_SETFPREGS:
86125+#endif
86126+#ifdef CONFIG_X86
86127+ case PTRACE_SETFPXREGS:
86128+#endif
86129+#ifdef CONFIG_ALTIVEC
86130+ case PTRACE_SETVRREGS:
86131+#endif
86132+ return 1;
86133+ default:
86134+ return 0;
86135+ }
86136+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
86137+ !(current->role->roletype & GR_ROLE_GOD) &&
86138+ (current->acl != task->acl)) {
86139+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
86140+ return 1;
86141+ }
86142+
86143+ return 0;
86144+}
86145+
86146+static int is_writable_mmap(const struct file *filp)
86147+{
86148+ struct task_struct *task = current;
86149+ struct acl_object_label *obj, *obj2;
86150+ struct dentry *dentry = filp->f_path.dentry;
86151+ struct vfsmount *mnt = filp->f_path.mnt;
86152+ struct inode *inode = d_backing_inode(dentry);
86153+
86154+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
86155+ !task->is_writable && d_is_reg(dentry) && (mnt != shm_mnt || (inode->i_nlink > 0))) {
86156+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
86157+ obj2 = chk_obj_label(dentry, mnt, task->role->root_label);
86158+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
86159+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, dentry, mnt);
86160+ return 1;
86161+ }
86162+ }
86163+ return 0;
86164+}
86165+
86166+int
86167+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
86168+{
86169+ __u32 mode;
86170+
86171+ if (unlikely(!file || !(prot & PROT_EXEC)))
86172+ return 1;
86173+
86174+ if (is_writable_mmap(file))
86175+ return 0;
86176+
86177+ mode =
86178+ gr_search_file(file->f_path.dentry,
86179+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
86180+ file->f_path.mnt);
86181+
86182+ if (!gr_tpe_allow(file))
86183+ return 0;
86184+
86185+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
86186+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86187+ return 0;
86188+ } else if (unlikely(!(mode & GR_EXEC))) {
86189+ return 0;
86190+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
86191+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86192+ return 1;
86193+ }
86194+
86195+ return 1;
86196+}
86197+
86198+int
86199+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
86200+{
86201+ __u32 mode;
86202+
86203+ if (unlikely(!file || !(prot & PROT_EXEC)))
86204+ return 1;
86205+
86206+ if (is_writable_mmap(file))
86207+ return 0;
86208+
86209+ mode =
86210+ gr_search_file(file->f_path.dentry,
86211+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
86212+ file->f_path.mnt);
86213+
86214+ if (!gr_tpe_allow(file))
86215+ return 0;
86216+
86217+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
86218+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86219+ return 0;
86220+ } else if (unlikely(!(mode & GR_EXEC))) {
86221+ return 0;
86222+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
86223+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
86224+ return 1;
86225+ }
86226+
86227+ return 1;
86228+}
86229+
86230+void
86231+gr_acl_handle_psacct(struct task_struct *task, const long code)
86232+{
86233+ unsigned long runtime, cputime;
86234+ cputime_t utime, stime;
86235+ unsigned int wday, cday;
86236+ __u8 whr, chr;
86237+ __u8 wmin, cmin;
86238+ __u8 wsec, csec;
86239+ struct timespec curtime, starttime;
86240+
86241+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
86242+ !(task->acl->mode & GR_PROCACCT)))
86243+ return;
86244+
86245+ curtime = ns_to_timespec(ktime_get_ns());
86246+ starttime = ns_to_timespec(task->start_time);
86247+ runtime = curtime.tv_sec - starttime.tv_sec;
86248+ wday = runtime / (60 * 60 * 24);
86249+ runtime -= wday * (60 * 60 * 24);
86250+ whr = runtime / (60 * 60);
86251+ runtime -= whr * (60 * 60);
86252+ wmin = runtime / 60;
86253+ runtime -= wmin * 60;
86254+ wsec = runtime;
86255+
86256+ task_cputime(task, &utime, &stime);
86257+ cputime = cputime_to_secs(utime + stime);
86258+ cday = cputime / (60 * 60 * 24);
86259+ cputime -= cday * (60 * 60 * 24);
86260+ chr = cputime / (60 * 60);
86261+ cputime -= chr * (60 * 60);
86262+ cmin = cputime / 60;
86263+ cputime -= cmin * 60;
86264+ csec = cputime;
86265+
86266+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
86267+
86268+ return;
86269+}
86270+
86271+#ifdef CONFIG_TASKSTATS
86272+int gr_is_taskstats_denied(int pid)
86273+{
86274+ struct task_struct *task;
86275+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86276+ const struct cred *cred;
86277+#endif
86278+ int ret = 0;
86279+
86280+ /* restrict taskstats viewing to un-chrooted root users
86281+ who have the 'view' subject flag if the RBAC system is enabled
86282+ */
86283+
86284+ rcu_read_lock();
86285+ read_lock(&tasklist_lock);
86286+ task = find_task_by_vpid(pid);
86287+ if (task) {
86288+#ifdef CONFIG_GRKERNSEC_CHROOT
86289+ if (proc_is_chrooted(task))
86290+ ret = -EACCES;
86291+#endif
86292+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86293+ cred = __task_cred(task);
86294+#ifdef CONFIG_GRKERNSEC_PROC_USER
86295+ if (gr_is_global_nonroot(cred->uid))
86296+ ret = -EACCES;
86297+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
86298+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
86299+ ret = -EACCES;
86300+#endif
86301+#endif
86302+ if (gr_status & GR_READY) {
86303+ if (!(task->acl->mode & GR_VIEW))
86304+ ret = -EACCES;
86305+ }
86306+ } else
86307+ ret = -ENOENT;
86308+
86309+ read_unlock(&tasklist_lock);
86310+ rcu_read_unlock();
86311+
86312+ return ret;
86313+}
86314+#endif
86315+
86316+/* AUXV entries are filled via a descendant of search_binary_handler
86317+ after we've already applied the subject for the target
86318+*/
86319+int gr_acl_enable_at_secure(void)
86320+{
86321+ if (unlikely(!(gr_status & GR_READY)))
86322+ return 0;
86323+
86324+ if (current->acl->mode & GR_ATSECURE)
86325+ return 1;
86326+
86327+ return 0;
86328+}
86329+
86330+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
86331+{
86332+ struct task_struct *task = current;
86333+ struct dentry *dentry = file->f_path.dentry;
86334+ struct vfsmount *mnt = file->f_path.mnt;
86335+ struct acl_object_label *obj, *tmp;
86336+ struct acl_subject_label *subj;
86337+ unsigned int bufsize;
86338+ int is_not_root;
86339+ char *path;
86340+ dev_t dev = __get_dev(dentry);
86341+
86342+ if (unlikely(!(gr_status & GR_READY)))
86343+ return 1;
86344+
86345+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
86346+ return 1;
86347+
86348+ /* ignore Eric Biederman */
86349+ if (IS_PRIVATE(d_backing_inode(dentry)))
86350+ return 1;
86351+
86352+ subj = task->acl;
86353+ read_lock(&gr_inode_lock);
86354+ do {
86355+ obj = lookup_acl_obj_label(ino, dev, subj);
86356+ if (obj != NULL) {
86357+ read_unlock(&gr_inode_lock);
86358+ return (obj->mode & GR_FIND) ? 1 : 0;
86359+ }
86360+ } while ((subj = subj->parent_subject));
86361+ read_unlock(&gr_inode_lock);
86362+
86363+ /* this is purely an optimization since we're looking for an object
86364+ for the directory we're doing a readdir on
86365+ if it's possible for any globbed object to match the entry we're
86366+ filling into the directory, then the object we find here will be
86367+ an anchor point with attached globbed objects
86368+ */
86369+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
86370+ if (obj->globbed == NULL)
86371+ return (obj->mode & GR_FIND) ? 1 : 0;
86372+
86373+ is_not_root = ((obj->filename[0] == '/') &&
86374+ (obj->filename[1] == '\0')) ? 0 : 1;
86375+ bufsize = PAGE_SIZE - namelen - is_not_root;
86376+
86377+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
86378+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
86379+ return 1;
86380+
86381+ preempt_disable();
86382+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
86383+ bufsize);
86384+
86385+ bufsize = strlen(path);
86386+
86387+ /* if base is "/", don't append an additional slash */
86388+ if (is_not_root)
86389+ *(path + bufsize) = '/';
86390+ memcpy(path + bufsize + is_not_root, name, namelen);
86391+ *(path + bufsize + namelen + is_not_root) = '\0';
86392+
86393+ tmp = obj->globbed;
86394+ while (tmp) {
86395+ if (!glob_match(tmp->filename, path)) {
86396+ preempt_enable();
86397+ return (tmp->mode & GR_FIND) ? 1 : 0;
86398+ }
86399+ tmp = tmp->next;
86400+ }
86401+ preempt_enable();
86402+ return (obj->mode & GR_FIND) ? 1 : 0;
86403+}
86404+
86405+void gr_put_exec_file(struct task_struct *task)
86406+{
86407+ struct file *filp;
86408+
86409+ write_lock(&grsec_exec_file_lock);
86410+ filp = task->exec_file;
86411+ task->exec_file = NULL;
86412+ write_unlock(&grsec_exec_file_lock);
86413+
86414+ if (filp)
86415+ fput(filp);
86416+
86417+ return;
86418+}
86419+
86420+
86421+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
86422+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
86423+#endif
86424+#ifdef CONFIG_SECURITY
86425+EXPORT_SYMBOL_GPL(gr_check_user_change);
86426+EXPORT_SYMBOL_GPL(gr_check_group_change);
86427+#endif
86428+
86429diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
86430new file mode 100644
86431index 0000000..9adc75c
86432--- /dev/null
86433+++ b/grsecurity/gracl_alloc.c
86434@@ -0,0 +1,105 @@
86435+#include <linux/kernel.h>
86436+#include <linux/mm.h>
86437+#include <linux/slab.h>
86438+#include <linux/vmalloc.h>
86439+#include <linux/gracl.h>
86440+#include <linux/grsecurity.h>
86441+
86442+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
86443+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
86444+
86445+static int
86446+alloc_pop(void)
86447+{
86448+ if (current_alloc_state->alloc_stack_next == 1)
86449+ return 0;
86450+
86451+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
86452+
86453+ current_alloc_state->alloc_stack_next--;
86454+
86455+ return 1;
86456+}
86457+
86458+static int
86459+alloc_push(void *buf)
86460+{
86461+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
86462+ return 1;
86463+
86464+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
86465+
86466+ current_alloc_state->alloc_stack_next++;
86467+
86468+ return 0;
86469+}
86470+
86471+void *
86472+acl_alloc(unsigned long len)
86473+{
86474+ void *ret = NULL;
86475+
86476+ if (!len || len > PAGE_SIZE)
86477+ goto out;
86478+
86479+ ret = kmalloc(len, GFP_KERNEL);
86480+
86481+ if (ret) {
86482+ if (alloc_push(ret)) {
86483+ kfree(ret);
86484+ ret = NULL;
86485+ }
86486+ }
86487+
86488+out:
86489+ return ret;
86490+}
86491+
86492+void *
86493+acl_alloc_num(unsigned long num, unsigned long len)
86494+{
86495+ if (!len || (num > (PAGE_SIZE / len)))
86496+ return NULL;
86497+
86498+ return acl_alloc(num * len);
86499+}
86500+
86501+void
86502+acl_free_all(void)
86503+{
86504+ if (!current_alloc_state->alloc_stack)
86505+ return;
86506+
86507+ while (alloc_pop()) ;
86508+
86509+ if (current_alloc_state->alloc_stack) {
86510+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
86511+ kfree(current_alloc_state->alloc_stack);
86512+ else
86513+ vfree(current_alloc_state->alloc_stack);
86514+ }
86515+
86516+ current_alloc_state->alloc_stack = NULL;
86517+ current_alloc_state->alloc_stack_size = 1;
86518+ current_alloc_state->alloc_stack_next = 1;
86519+
86520+ return;
86521+}
86522+
86523+int
86524+acl_alloc_stack_init(unsigned long size)
86525+{
86526+ if ((size * sizeof (void *)) <= PAGE_SIZE)
86527+ current_alloc_state->alloc_stack =
86528+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
86529+ else
86530+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
86531+
86532+ current_alloc_state->alloc_stack_size = size;
86533+ current_alloc_state->alloc_stack_next = 1;
86534+
86535+ if (!current_alloc_state->alloc_stack)
86536+ return 0;
86537+ else
86538+ return 1;
86539+}
86540diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
86541new file mode 100644
86542index 0000000..1a94c11
86543--- /dev/null
86544+++ b/grsecurity/gracl_cap.c
86545@@ -0,0 +1,127 @@
86546+#include <linux/kernel.h>
86547+#include <linux/module.h>
86548+#include <linux/sched.h>
86549+#include <linux/gracl.h>
86550+#include <linux/grsecurity.h>
86551+#include <linux/grinternal.h>
86552+
86553+extern const char *captab_log[];
86554+extern int captab_log_entries;
86555+
86556+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
86557+{
86558+ struct acl_subject_label *curracl;
86559+
86560+ if (!gr_acl_is_enabled())
86561+ return 1;
86562+
86563+ curracl = task->acl;
86564+
86565+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
86566+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
86567+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
86568+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
86569+ gr_to_filename(task->exec_file->f_path.dentry,
86570+ task->exec_file->f_path.mnt) : curracl->filename,
86571+ curracl->filename, 0UL,
86572+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
86573+ return 1;
86574+ }
86575+
86576+ return 0;
86577+}
86578+
86579+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
86580+{
86581+ struct acl_subject_label *curracl;
86582+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
86583+ kernel_cap_t cap_audit = __cap_empty_set;
86584+
86585+ if (!gr_acl_is_enabled())
86586+ return 1;
86587+
86588+ curracl = task->acl;
86589+
86590+ cap_drop = curracl->cap_lower;
86591+ cap_mask = curracl->cap_mask;
86592+ cap_audit = curracl->cap_invert_audit;
86593+
86594+ while ((curracl = curracl->parent_subject)) {
86595+ /* if the cap isn't specified in the current computed mask but is specified in the
86596+ current level subject, and is lowered in the current level subject, then add
86597+ it to the set of dropped capabilities
86598+ otherwise, add the current level subject's mask to the current computed mask
86599+ */
86600+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
86601+ cap_raise(cap_mask, cap);
86602+ if (cap_raised(curracl->cap_lower, cap))
86603+ cap_raise(cap_drop, cap);
86604+ if (cap_raised(curracl->cap_invert_audit, cap))
86605+ cap_raise(cap_audit, cap);
86606+ }
86607+ }
86608+
86609+ if (!cap_raised(cap_drop, cap)) {
86610+ if (cap_raised(cap_audit, cap))
86611+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
86612+ return 1;
86613+ }
86614+
86615+ /* only learn the capability use if the process has the capability in the
86616+ general case, the two uses in sys.c of gr_learn_cap are an exception
86617+ to this rule to ensure any role transition involves what the full-learned
86618+ policy believes in a privileged process
86619+ */
86620+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
86621+ return 1;
86622+
86623+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
86624+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
86625+
86626+ return 0;
86627+}
86628+
86629+int
86630+gr_acl_is_capable(const int cap)
86631+{
86632+ return gr_task_acl_is_capable(current, current_cred(), cap);
86633+}
86634+
86635+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
86636+{
86637+ struct acl_subject_label *curracl;
86638+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
86639+
86640+ if (!gr_acl_is_enabled())
86641+ return 1;
86642+
86643+ curracl = task->acl;
86644+
86645+ cap_drop = curracl->cap_lower;
86646+ cap_mask = curracl->cap_mask;
86647+
86648+ while ((curracl = curracl->parent_subject)) {
86649+ /* if the cap isn't specified in the current computed mask but is specified in the
86650+ current level subject, and is lowered in the current level subject, then add
86651+ it to the set of dropped capabilities
86652+ otherwise, add the current level subject's mask to the current computed mask
86653+ */
86654+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
86655+ cap_raise(cap_mask, cap);
86656+ if (cap_raised(curracl->cap_lower, cap))
86657+ cap_raise(cap_drop, cap);
86658+ }
86659+ }
86660+
86661+ if (!cap_raised(cap_drop, cap))
86662+ return 1;
86663+
86664+ return 0;
86665+}
86666+
86667+int
86668+gr_acl_is_capable_nolog(const int cap)
86669+{
86670+ return gr_task_acl_is_capable_nolog(current, cap);
86671+}
86672+
86673diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
86674new file mode 100644
86675index 0000000..a43dd06
86676--- /dev/null
86677+++ b/grsecurity/gracl_compat.c
86678@@ -0,0 +1,269 @@
86679+#include <linux/kernel.h>
86680+#include <linux/gracl.h>
86681+#include <linux/compat.h>
86682+#include <linux/gracl_compat.h>
86683+
86684+#include <asm/uaccess.h>
86685+
86686+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
86687+{
86688+ struct gr_arg_wrapper_compat uwrapcompat;
86689+
86690+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
86691+ return -EFAULT;
86692+
86693+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
86694+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
86695+ return -EINVAL;
86696+
86697+ uwrap->arg = compat_ptr(uwrapcompat.arg);
86698+ uwrap->version = uwrapcompat.version;
86699+ uwrap->size = sizeof(struct gr_arg);
86700+
86701+ return 0;
86702+}
86703+
86704+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
86705+{
86706+ struct gr_arg_compat argcompat;
86707+
86708+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
86709+ return -EFAULT;
86710+
86711+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
86712+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
86713+ arg->role_db.num_roles = argcompat.role_db.num_roles;
86714+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
86715+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
86716+ arg->role_db.num_objects = argcompat.role_db.num_objects;
86717+
86718+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
86719+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
86720+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
86721+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
86722+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
86723+ arg->segv_device = argcompat.segv_device;
86724+ arg->segv_inode = argcompat.segv_inode;
86725+ arg->segv_uid = argcompat.segv_uid;
86726+ arg->num_sprole_pws = argcompat.num_sprole_pws;
86727+ arg->mode = argcompat.mode;
86728+
86729+ return 0;
86730+}
86731+
86732+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
86733+{
86734+ struct acl_object_label_compat objcompat;
86735+
86736+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
86737+ return -EFAULT;
86738+
86739+ obj->filename = compat_ptr(objcompat.filename);
86740+ obj->inode = objcompat.inode;
86741+ obj->device = objcompat.device;
86742+ obj->mode = objcompat.mode;
86743+
86744+ obj->nested = compat_ptr(objcompat.nested);
86745+ obj->globbed = compat_ptr(objcompat.globbed);
86746+
86747+ obj->prev = compat_ptr(objcompat.prev);
86748+ obj->next = compat_ptr(objcompat.next);
86749+
86750+ return 0;
86751+}
86752+
86753+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
86754+{
86755+ unsigned int i;
86756+ struct acl_subject_label_compat subjcompat;
86757+
86758+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
86759+ return -EFAULT;
86760+
86761+ subj->filename = compat_ptr(subjcompat.filename);
86762+ subj->inode = subjcompat.inode;
86763+ subj->device = subjcompat.device;
86764+ subj->mode = subjcompat.mode;
86765+ subj->cap_mask = subjcompat.cap_mask;
86766+ subj->cap_lower = subjcompat.cap_lower;
86767+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
86768+
86769+ for (i = 0; i < GR_NLIMITS; i++) {
86770+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
86771+ subj->res[i].rlim_cur = RLIM_INFINITY;
86772+ else
86773+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
86774+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
86775+ subj->res[i].rlim_max = RLIM_INFINITY;
86776+ else
86777+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
86778+ }
86779+ subj->resmask = subjcompat.resmask;
86780+
86781+ subj->user_trans_type = subjcompat.user_trans_type;
86782+ subj->group_trans_type = subjcompat.group_trans_type;
86783+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
86784+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
86785+ subj->user_trans_num = subjcompat.user_trans_num;
86786+ subj->group_trans_num = subjcompat.group_trans_num;
86787+
86788+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
86789+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
86790+ subj->ip_type = subjcompat.ip_type;
86791+ subj->ips = compat_ptr(subjcompat.ips);
86792+ subj->ip_num = subjcompat.ip_num;
86793+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
86794+
86795+ subj->crashes = subjcompat.crashes;
86796+ subj->expires = subjcompat.expires;
86797+
86798+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
86799+ subj->hash = compat_ptr(subjcompat.hash);
86800+ subj->prev = compat_ptr(subjcompat.prev);
86801+ subj->next = compat_ptr(subjcompat.next);
86802+
86803+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
86804+ subj->obj_hash_size = subjcompat.obj_hash_size;
86805+ subj->pax_flags = subjcompat.pax_flags;
86806+
86807+ return 0;
86808+}
86809+
86810+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
86811+{
86812+ struct acl_role_label_compat rolecompat;
86813+
86814+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
86815+ return -EFAULT;
86816+
86817+ role->rolename = compat_ptr(rolecompat.rolename);
86818+ role->uidgid = rolecompat.uidgid;
86819+ role->roletype = rolecompat.roletype;
86820+
86821+ role->auth_attempts = rolecompat.auth_attempts;
86822+ role->expires = rolecompat.expires;
86823+
86824+ role->root_label = compat_ptr(rolecompat.root_label);
86825+ role->hash = compat_ptr(rolecompat.hash);
86826+
86827+ role->prev = compat_ptr(rolecompat.prev);
86828+ role->next = compat_ptr(rolecompat.next);
86829+
86830+ role->transitions = compat_ptr(rolecompat.transitions);
86831+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
86832+ role->domain_children = compat_ptr(rolecompat.domain_children);
86833+ role->domain_child_num = rolecompat.domain_child_num;
86834+
86835+ role->umask = rolecompat.umask;
86836+
86837+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
86838+ role->subj_hash_size = rolecompat.subj_hash_size;
86839+
86840+ return 0;
86841+}
86842+
86843+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
86844+{
86845+ struct role_allowed_ip_compat roleip_compat;
86846+
86847+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
86848+ return -EFAULT;
86849+
86850+ roleip->addr = roleip_compat.addr;
86851+ roleip->netmask = roleip_compat.netmask;
86852+
86853+ roleip->prev = compat_ptr(roleip_compat.prev);
86854+ roleip->next = compat_ptr(roleip_compat.next);
86855+
86856+ return 0;
86857+}
86858+
86859+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
86860+{
86861+ struct role_transition_compat trans_compat;
86862+
86863+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
86864+ return -EFAULT;
86865+
86866+ trans->rolename = compat_ptr(trans_compat.rolename);
86867+
86868+ trans->prev = compat_ptr(trans_compat.prev);
86869+ trans->next = compat_ptr(trans_compat.next);
86870+
86871+ return 0;
86872+
86873+}
86874+
86875+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
86876+{
86877+ struct gr_hash_struct_compat hash_compat;
86878+
86879+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
86880+ return -EFAULT;
86881+
86882+ hash->table = compat_ptr(hash_compat.table);
86883+ hash->nametable = compat_ptr(hash_compat.nametable);
86884+ hash->first = compat_ptr(hash_compat.first);
86885+
86886+ hash->table_size = hash_compat.table_size;
86887+ hash->used_size = hash_compat.used_size;
86888+
86889+ hash->type = hash_compat.type;
86890+
86891+ return 0;
86892+}
86893+
86894+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
86895+{
86896+ compat_uptr_t ptrcompat;
86897+
86898+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
86899+ return -EFAULT;
86900+
86901+ *(void **)ptr = compat_ptr(ptrcompat);
86902+
86903+ return 0;
86904+}
86905+
86906+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
86907+{
86908+ struct acl_ip_label_compat ip_compat;
86909+
86910+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
86911+ return -EFAULT;
86912+
86913+ ip->iface = compat_ptr(ip_compat.iface);
86914+ ip->addr = ip_compat.addr;
86915+ ip->netmask = ip_compat.netmask;
86916+ ip->low = ip_compat.low;
86917+ ip->high = ip_compat.high;
86918+ ip->mode = ip_compat.mode;
86919+ ip->type = ip_compat.type;
86920+
86921+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
86922+
86923+ ip->prev = compat_ptr(ip_compat.prev);
86924+ ip->next = compat_ptr(ip_compat.next);
86925+
86926+ return 0;
86927+}
86928+
86929+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
86930+{
86931+ struct sprole_pw_compat pw_compat;
86932+
86933+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
86934+ return -EFAULT;
86935+
86936+ pw->rolename = compat_ptr(pw_compat.rolename);
86937+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
86938+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
86939+
86940+ return 0;
86941+}
86942+
86943+size_t get_gr_arg_wrapper_size_compat(void)
86944+{
86945+ return sizeof(struct gr_arg_wrapper_compat);
86946+}
86947+
86948diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
86949new file mode 100644
86950index 0000000..fce7f71
86951--- /dev/null
86952+++ b/grsecurity/gracl_fs.c
86953@@ -0,0 +1,448 @@
86954+#include <linux/kernel.h>
86955+#include <linux/sched.h>
86956+#include <linux/types.h>
86957+#include <linux/fs.h>
86958+#include <linux/file.h>
86959+#include <linux/stat.h>
86960+#include <linux/grsecurity.h>
86961+#include <linux/grinternal.h>
86962+#include <linux/gracl.h>
86963+
86964+umode_t
86965+gr_acl_umask(void)
86966+{
86967+ if (unlikely(!gr_acl_is_enabled()))
86968+ return 0;
86969+
86970+ return current->role->umask;
86971+}
86972+
86973+__u32
86974+gr_acl_handle_hidden_file(const struct dentry * dentry,
86975+ const struct vfsmount * mnt)
86976+{
86977+ __u32 mode;
86978+
86979+ if (unlikely(d_is_negative(dentry)))
86980+ return GR_FIND;
86981+
86982+ mode =
86983+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
86984+
86985+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
86986+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
86987+ return mode;
86988+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
86989+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
86990+ return 0;
86991+ } else if (unlikely(!(mode & GR_FIND)))
86992+ return 0;
86993+
86994+ return GR_FIND;
86995+}
86996+
86997+__u32
86998+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
86999+ int acc_mode)
87000+{
87001+ __u32 reqmode = GR_FIND;
87002+ __u32 mode;
87003+
87004+ if (unlikely(d_is_negative(dentry)))
87005+ return reqmode;
87006+
87007+ if (acc_mode & MAY_APPEND)
87008+ reqmode |= GR_APPEND;
87009+ else if (acc_mode & MAY_WRITE)
87010+ reqmode |= GR_WRITE;
87011+ if ((acc_mode & MAY_READ) && !d_is_dir(dentry))
87012+ reqmode |= GR_READ;
87013+
87014+ mode =
87015+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
87016+ mnt);
87017+
87018+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
87019+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
87020+ reqmode & GR_READ ? " reading" : "",
87021+ reqmode & GR_WRITE ? " writing" : reqmode &
87022+ GR_APPEND ? " appending" : "");
87023+ return reqmode;
87024+ } else
87025+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
87026+ {
87027+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
87028+ reqmode & GR_READ ? " reading" : "",
87029+ reqmode & GR_WRITE ? " writing" : reqmode &
87030+ GR_APPEND ? " appending" : "");
87031+ return 0;
87032+ } else if (unlikely((mode & reqmode) != reqmode))
87033+ return 0;
87034+
87035+ return reqmode;
87036+}
87037+
87038+__u32
87039+gr_acl_handle_creat(const struct dentry * dentry,
87040+ const struct dentry * p_dentry,
87041+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
87042+ const int imode)
87043+{
87044+ __u32 reqmode = GR_WRITE | GR_CREATE;
87045+ __u32 mode;
87046+
87047+ if (acc_mode & MAY_APPEND)
87048+ reqmode |= GR_APPEND;
87049+ // if a directory was required or the directory already exists, then
87050+ // don't count this open as a read
87051+ if ((acc_mode & MAY_READ) &&
87052+ !((open_flags & O_DIRECTORY) || d_is_dir(dentry)))
87053+ reqmode |= GR_READ;
87054+ if ((open_flags & O_CREAT) &&
87055+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
87056+ reqmode |= GR_SETID;
87057+
87058+ mode =
87059+ gr_check_create(dentry, p_dentry, p_mnt,
87060+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
87061+
87062+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
87063+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
87064+ reqmode & GR_READ ? " reading" : "",
87065+ reqmode & GR_WRITE ? " writing" : reqmode &
87066+ GR_APPEND ? " appending" : "");
87067+ return reqmode;
87068+ } else
87069+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
87070+ {
87071+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
87072+ reqmode & GR_READ ? " reading" : "",
87073+ reqmode & GR_WRITE ? " writing" : reqmode &
87074+ GR_APPEND ? " appending" : "");
87075+ return 0;
87076+ } else if (unlikely((mode & reqmode) != reqmode))
87077+ return 0;
87078+
87079+ return reqmode;
87080+}
87081+
87082+__u32
87083+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
87084+ const int fmode)
87085+{
87086+ __u32 mode, reqmode = GR_FIND;
87087+
87088+ if ((fmode & S_IXOTH) && !d_is_dir(dentry))
87089+ reqmode |= GR_EXEC;
87090+ if (fmode & S_IWOTH)
87091+ reqmode |= GR_WRITE;
87092+ if (fmode & S_IROTH)
87093+ reqmode |= GR_READ;
87094+
87095+ mode =
87096+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
87097+ mnt);
87098+
87099+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
87100+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
87101+ reqmode & GR_READ ? " reading" : "",
87102+ reqmode & GR_WRITE ? " writing" : "",
87103+ reqmode & GR_EXEC ? " executing" : "");
87104+ return reqmode;
87105+ } else
87106+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
87107+ {
87108+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
87109+ reqmode & GR_READ ? " reading" : "",
87110+ reqmode & GR_WRITE ? " writing" : "",
87111+ reqmode & GR_EXEC ? " executing" : "");
87112+ return 0;
87113+ } else if (unlikely((mode & reqmode) != reqmode))
87114+ return 0;
87115+
87116+ return reqmode;
87117+}
87118+
87119+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
87120+{
87121+ __u32 mode;
87122+
87123+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
87124+
87125+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
87126+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
87127+ return mode;
87128+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
87129+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
87130+ return 0;
87131+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
87132+ return 0;
87133+
87134+ return (reqmode);
87135+}
87136+
87137+__u32
87138+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
87139+{
87140+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
87141+}
87142+
87143+__u32
87144+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
87145+{
87146+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
87147+}
87148+
87149+__u32
87150+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
87151+{
87152+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
87153+}
87154+
87155+__u32
87156+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
87157+{
87158+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
87159+}
87160+
87161+__u32
87162+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
87163+ umode_t *modeptr)
87164+{
87165+ umode_t mode;
87166+ struct inode *inode = d_backing_inode(dentry);
87167+
87168+ *modeptr &= ~gr_acl_umask();
87169+ mode = *modeptr;
87170+
87171+ if (unlikely(inode && S_ISSOCK(inode->i_mode)))
87172+ return 1;
87173+
87174+ if (unlikely(!d_is_dir(dentry) &&
87175+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
87176+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
87177+ GR_CHMOD_ACL_MSG);
87178+ } else {
87179+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
87180+ }
87181+}
87182+
87183+__u32
87184+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
87185+{
87186+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
87187+}
87188+
87189+__u32
87190+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
87191+{
87192+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
87193+}
87194+
87195+__u32
87196+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
87197+{
87198+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
87199+}
87200+
87201+__u32
87202+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
87203+{
87204+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
87205+}
87206+
87207+__u32
87208+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
87209+{
87210+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
87211+ GR_UNIXCONNECT_ACL_MSG);
87212+}
87213+
87214+/* hardlinks require at minimum create and link permission,
87215+ any additional privilege required is based on the
87216+ privilege of the file being linked to
87217+*/
87218+__u32
87219+gr_acl_handle_link(const struct dentry * new_dentry,
87220+ const struct dentry * parent_dentry,
87221+ const struct vfsmount * parent_mnt,
87222+ const struct dentry * old_dentry,
87223+ const struct vfsmount * old_mnt, const struct filename *to)
87224+{
87225+ __u32 mode;
87226+ __u32 needmode = GR_CREATE | GR_LINK;
87227+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
87228+
87229+ mode =
87230+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
87231+ old_mnt);
87232+
87233+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
87234+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
87235+ return mode;
87236+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
87237+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
87238+ return 0;
87239+ } else if (unlikely((mode & needmode) != needmode))
87240+ return 0;
87241+
87242+ return 1;
87243+}
87244+
87245+__u32
87246+gr_acl_handle_symlink(const struct dentry * new_dentry,
87247+ const struct dentry * parent_dentry,
87248+ const struct vfsmount * parent_mnt, const struct filename *from)
87249+{
87250+ __u32 needmode = GR_WRITE | GR_CREATE;
87251+ __u32 mode;
87252+
87253+ mode =
87254+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
87255+ GR_CREATE | GR_AUDIT_CREATE |
87256+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
87257+
87258+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
87259+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
87260+ return mode;
87261+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
87262+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
87263+ return 0;
87264+ } else if (unlikely((mode & needmode) != needmode))
87265+ return 0;
87266+
87267+ return (GR_WRITE | GR_CREATE);
87268+}
87269+
87270+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)
87271+{
87272+ __u32 mode;
87273+
87274+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
87275+
87276+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
87277+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
87278+ return mode;
87279+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
87280+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
87281+ return 0;
87282+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
87283+ return 0;
87284+
87285+ return (reqmode);
87286+}
87287+
87288+__u32
87289+gr_acl_handle_mknod(const struct dentry * new_dentry,
87290+ const struct dentry * parent_dentry,
87291+ const struct vfsmount * parent_mnt,
87292+ const int mode)
87293+{
87294+ __u32 reqmode = GR_WRITE | GR_CREATE;
87295+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
87296+ reqmode |= GR_SETID;
87297+
87298+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
87299+ reqmode, GR_MKNOD_ACL_MSG);
87300+}
87301+
87302+__u32
87303+gr_acl_handle_mkdir(const struct dentry *new_dentry,
87304+ const struct dentry *parent_dentry,
87305+ const struct vfsmount *parent_mnt)
87306+{
87307+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
87308+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
87309+}
87310+
87311+#define RENAME_CHECK_SUCCESS(old, new) \
87312+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
87313+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
87314+
87315+int
87316+gr_acl_handle_rename(struct dentry *new_dentry,
87317+ struct dentry *parent_dentry,
87318+ const struct vfsmount *parent_mnt,
87319+ struct dentry *old_dentry,
87320+ struct inode *old_parent_inode,
87321+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
87322+{
87323+ __u32 comp1, comp2;
87324+ int error = 0;
87325+
87326+ if (unlikely(!gr_acl_is_enabled()))
87327+ return 0;
87328+
87329+ if (flags & RENAME_EXCHANGE) {
87330+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
87331+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87332+ GR_SUPPRESS, parent_mnt);
87333+ comp2 =
87334+ gr_search_file(old_dentry,
87335+ GR_READ | GR_WRITE | GR_AUDIT_READ |
87336+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
87337+ } else if (d_is_negative(new_dentry)) {
87338+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
87339+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
87340+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
87341+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
87342+ GR_DELETE | GR_AUDIT_DELETE |
87343+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87344+ GR_SUPPRESS, old_mnt);
87345+ } else {
87346+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
87347+ GR_CREATE | GR_DELETE |
87348+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
87349+ GR_AUDIT_READ | GR_AUDIT_WRITE |
87350+ GR_SUPPRESS, parent_mnt);
87351+ comp2 =
87352+ gr_search_file(old_dentry,
87353+ GR_READ | GR_WRITE | GR_AUDIT_READ |
87354+ GR_DELETE | GR_AUDIT_DELETE |
87355+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
87356+ }
87357+
87358+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
87359+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
87360+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
87361+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
87362+ && !(comp2 & GR_SUPPRESS)) {
87363+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
87364+ error = -EACCES;
87365+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
87366+ error = -EACCES;
87367+
87368+ return error;
87369+}
87370+
87371+void
87372+gr_acl_handle_exit(void)
87373+{
87374+ u16 id;
87375+ char *rolename;
87376+
87377+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
87378+ !(current->role->roletype & GR_ROLE_PERSIST))) {
87379+ id = current->acl_role_id;
87380+ rolename = current->role->rolename;
87381+ gr_set_acls(1);
87382+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
87383+ }
87384+
87385+ gr_put_exec_file(current);
87386+ return;
87387+}
87388+
87389+int
87390+gr_acl_handle_procpidmem(const struct task_struct *task)
87391+{
87392+ if (unlikely(!gr_acl_is_enabled()))
87393+ return 0;
87394+
87395+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
87396+ !(current->acl->mode & GR_POVERRIDE) &&
87397+ !(current->role->roletype & GR_ROLE_GOD))
87398+ return -EACCES;
87399+
87400+ return 0;
87401+}
87402diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
87403new file mode 100644
87404index 0000000..ed6ee43
87405--- /dev/null
87406+++ b/grsecurity/gracl_ip.c
87407@@ -0,0 +1,386 @@
87408+#include <linux/kernel.h>
87409+#include <asm/uaccess.h>
87410+#include <asm/errno.h>
87411+#include <net/sock.h>
87412+#include <linux/file.h>
87413+#include <linux/fs.h>
87414+#include <linux/net.h>
87415+#include <linux/in.h>
87416+#include <linux/skbuff.h>
87417+#include <linux/ip.h>
87418+#include <linux/udp.h>
87419+#include <linux/types.h>
87420+#include <linux/sched.h>
87421+#include <linux/netdevice.h>
87422+#include <linux/inetdevice.h>
87423+#include <linux/gracl.h>
87424+#include <linux/grsecurity.h>
87425+#include <linux/grinternal.h>
87426+
87427+#define GR_BIND 0x01
87428+#define GR_CONNECT 0x02
87429+#define GR_INVERT 0x04
87430+#define GR_BINDOVERRIDE 0x08
87431+#define GR_CONNECTOVERRIDE 0x10
87432+#define GR_SOCK_FAMILY 0x20
87433+
87434+static const char * gr_protocols[IPPROTO_MAX] = {
87435+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
87436+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
87437+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
87438+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
87439+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
87440+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
87441+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
87442+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
87443+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
87444+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
87445+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
87446+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
87447+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
87448+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
87449+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
87450+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
87451+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
87452+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
87453+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
87454+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
87455+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
87456+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
87457+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
87458+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
87459+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
87460+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
87461+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
87462+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
87463+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
87464+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
87465+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
87466+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
87467+ };
87468+
87469+static const char * gr_socktypes[SOCK_MAX] = {
87470+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
87471+ "unknown:7", "unknown:8", "unknown:9", "packet"
87472+ };
87473+
87474+static const char * gr_sockfamilies[AF_MAX+1] = {
87475+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
87476+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
87477+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
87478+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf", "alg", "nfc", "vsock"
87479+ };
87480+
87481+const char *
87482+gr_proto_to_name(unsigned char proto)
87483+{
87484+ return gr_protocols[proto];
87485+}
87486+
87487+const char *
87488+gr_socktype_to_name(unsigned char type)
87489+{
87490+ return gr_socktypes[type];
87491+}
87492+
87493+const char *
87494+gr_sockfamily_to_name(unsigned char family)
87495+{
87496+ return gr_sockfamilies[family];
87497+}
87498+
87499+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
87500+
87501+int
87502+gr_search_socket(const int domain, const int type, const int protocol)
87503+{
87504+ struct acl_subject_label *curr;
87505+ const struct cred *cred = current_cred();
87506+
87507+ if (unlikely(!gr_acl_is_enabled()))
87508+ goto exit;
87509+
87510+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
87511+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
87512+ goto exit; // let the kernel handle it
87513+
87514+ curr = current->acl;
87515+
87516+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
87517+ /* the family is allowed, if this is PF_INET allow it only if
87518+ the extra sock type/protocol checks pass */
87519+ if (domain == PF_INET)
87520+ goto inet_check;
87521+ goto exit;
87522+ } else {
87523+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87524+ __u32 fakeip = 0;
87525+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87526+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87527+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87528+ gr_to_filename(current->exec_file->f_path.dentry,
87529+ current->exec_file->f_path.mnt) :
87530+ curr->filename, curr->filename,
87531+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
87532+ &current->signal->saved_ip);
87533+ goto exit;
87534+ }
87535+ goto exit_fail;
87536+ }
87537+
87538+inet_check:
87539+ /* the rest of this checking is for IPv4 only */
87540+ if (!curr->ips)
87541+ goto exit;
87542+
87543+ if ((curr->ip_type & (1U << type)) &&
87544+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
87545+ goto exit;
87546+
87547+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87548+ /* we don't place acls on raw sockets , and sometimes
87549+ dgram/ip sockets are opened for ioctl and not
87550+ bind/connect, so we'll fake a bind learn log */
87551+ if (type == SOCK_RAW || type == SOCK_PACKET) {
87552+ __u32 fakeip = 0;
87553+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87554+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87555+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87556+ gr_to_filename(current->exec_file->f_path.dentry,
87557+ current->exec_file->f_path.mnt) :
87558+ curr->filename, curr->filename,
87559+ &fakeip, 0, type,
87560+ protocol, GR_CONNECT, &current->signal->saved_ip);
87561+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
87562+ __u32 fakeip = 0;
87563+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87564+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87565+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87566+ gr_to_filename(current->exec_file->f_path.dentry,
87567+ current->exec_file->f_path.mnt) :
87568+ curr->filename, curr->filename,
87569+ &fakeip, 0, type,
87570+ protocol, GR_BIND, &current->signal->saved_ip);
87571+ }
87572+ /* we'll log when they use connect or bind */
87573+ goto exit;
87574+ }
87575+
87576+exit_fail:
87577+ if (domain == PF_INET)
87578+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
87579+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
87580+ else if (rcu_access_pointer(net_families[domain]) != NULL)
87581+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
87582+ gr_socktype_to_name(type), protocol);
87583+
87584+ return 0;
87585+exit:
87586+ return 1;
87587+}
87588+
87589+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)
87590+{
87591+ if ((ip->mode & mode) &&
87592+ (ip_port >= ip->low) &&
87593+ (ip_port <= ip->high) &&
87594+ ((ntohl(ip_addr) & our_netmask) ==
87595+ (ntohl(our_addr) & our_netmask))
87596+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
87597+ && (ip->type & (1U << type))) {
87598+ if (ip->mode & GR_INVERT)
87599+ return 2; // specifically denied
87600+ else
87601+ return 1; // allowed
87602+ }
87603+
87604+ return 0; // not specifically allowed, may continue parsing
87605+}
87606+
87607+static int
87608+gr_search_connectbind(const int full_mode, struct sock *sk,
87609+ struct sockaddr_in *addr, const int type)
87610+{
87611+ char iface[IFNAMSIZ] = {0};
87612+ struct acl_subject_label *curr;
87613+ struct acl_ip_label *ip;
87614+ struct inet_sock *isk;
87615+ struct net_device *dev;
87616+ struct in_device *idev;
87617+ unsigned long i;
87618+ int ret;
87619+ int mode = full_mode & (GR_BIND | GR_CONNECT);
87620+ __u32 ip_addr = 0;
87621+ __u32 our_addr;
87622+ __u32 our_netmask;
87623+ char *p;
87624+ __u16 ip_port = 0;
87625+ const struct cred *cred = current_cred();
87626+
87627+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
87628+ return 0;
87629+
87630+ curr = current->acl;
87631+ isk = inet_sk(sk);
87632+
87633+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
87634+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
87635+ addr->sin_addr.s_addr = curr->inaddr_any_override;
87636+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
87637+ struct sockaddr_in saddr;
87638+ int err;
87639+
87640+ saddr.sin_family = AF_INET;
87641+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
87642+ saddr.sin_port = isk->inet_sport;
87643+
87644+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
87645+ if (err)
87646+ return err;
87647+
87648+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
87649+ if (err)
87650+ return err;
87651+ }
87652+
87653+ if (!curr->ips)
87654+ return 0;
87655+
87656+ ip_addr = addr->sin_addr.s_addr;
87657+ ip_port = ntohs(addr->sin_port);
87658+
87659+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
87660+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
87661+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
87662+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
87663+ gr_to_filename(current->exec_file->f_path.dentry,
87664+ current->exec_file->f_path.mnt) :
87665+ curr->filename, curr->filename,
87666+ &ip_addr, ip_port, type,
87667+ sk->sk_protocol, mode, &current->signal->saved_ip);
87668+ return 0;
87669+ }
87670+
87671+ for (i = 0; i < curr->ip_num; i++) {
87672+ ip = *(curr->ips + i);
87673+ if (ip->iface != NULL) {
87674+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
87675+ p = strchr(iface, ':');
87676+ if (p != NULL)
87677+ *p = '\0';
87678+ dev = dev_get_by_name(sock_net(sk), iface);
87679+ if (dev == NULL)
87680+ continue;
87681+ idev = in_dev_get(dev);
87682+ if (idev == NULL) {
87683+ dev_put(dev);
87684+ continue;
87685+ }
87686+ rcu_read_lock();
87687+ for_ifa(idev) {
87688+ if (!strcmp(ip->iface, ifa->ifa_label)) {
87689+ our_addr = ifa->ifa_address;
87690+ our_netmask = 0xffffffff;
87691+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
87692+ if (ret == 1) {
87693+ rcu_read_unlock();
87694+ in_dev_put(idev);
87695+ dev_put(dev);
87696+ return 0;
87697+ } else if (ret == 2) {
87698+ rcu_read_unlock();
87699+ in_dev_put(idev);
87700+ dev_put(dev);
87701+ goto denied;
87702+ }
87703+ }
87704+ } endfor_ifa(idev);
87705+ rcu_read_unlock();
87706+ in_dev_put(idev);
87707+ dev_put(dev);
87708+ } else {
87709+ our_addr = ip->addr;
87710+ our_netmask = ip->netmask;
87711+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
87712+ if (ret == 1)
87713+ return 0;
87714+ else if (ret == 2)
87715+ goto denied;
87716+ }
87717+ }
87718+
87719+denied:
87720+ if (mode == GR_BIND)
87721+ 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));
87722+ else if (mode == GR_CONNECT)
87723+ 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));
87724+
87725+ return -EACCES;
87726+}
87727+
87728+int
87729+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
87730+{
87731+ /* always allow disconnection of dgram sockets with connect */
87732+ if (addr->sin_family == AF_UNSPEC)
87733+ return 0;
87734+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
87735+}
87736+
87737+int
87738+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
87739+{
87740+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
87741+}
87742+
87743+int gr_search_listen(struct socket *sock)
87744+{
87745+ struct sock *sk = sock->sk;
87746+ struct sockaddr_in addr;
87747+
87748+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
87749+ addr.sin_port = inet_sk(sk)->inet_sport;
87750+
87751+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
87752+}
87753+
87754+int gr_search_accept(struct socket *sock)
87755+{
87756+ struct sock *sk = sock->sk;
87757+ struct sockaddr_in addr;
87758+
87759+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
87760+ addr.sin_port = inet_sk(sk)->inet_sport;
87761+
87762+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
87763+}
87764+
87765+int
87766+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
87767+{
87768+ if (addr)
87769+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
87770+ else {
87771+ struct sockaddr_in sin;
87772+ const struct inet_sock *inet = inet_sk(sk);
87773+
87774+ sin.sin_addr.s_addr = inet->inet_daddr;
87775+ sin.sin_port = inet->inet_dport;
87776+
87777+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
87778+ }
87779+}
87780+
87781+int
87782+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
87783+{
87784+ struct sockaddr_in sin;
87785+
87786+ if (unlikely(skb->len < sizeof (struct udphdr)))
87787+ return 0; // skip this packet
87788+
87789+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
87790+ sin.sin_port = udp_hdr(skb)->source;
87791+
87792+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
87793+}
87794diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
87795new file mode 100644
87796index 0000000..25f54ef
87797--- /dev/null
87798+++ b/grsecurity/gracl_learn.c
87799@@ -0,0 +1,207 @@
87800+#include <linux/kernel.h>
87801+#include <linux/mm.h>
87802+#include <linux/sched.h>
87803+#include <linux/poll.h>
87804+#include <linux/string.h>
87805+#include <linux/file.h>
87806+#include <linux/types.h>
87807+#include <linux/vmalloc.h>
87808+#include <linux/grinternal.h>
87809+
87810+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
87811+ size_t count, loff_t *ppos);
87812+extern int gr_acl_is_enabled(void);
87813+
87814+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
87815+static int gr_learn_attached;
87816+
87817+/* use a 512k buffer */
87818+#define LEARN_BUFFER_SIZE (512 * 1024)
87819+
87820+static DEFINE_SPINLOCK(gr_learn_lock);
87821+static DEFINE_MUTEX(gr_learn_user_mutex);
87822+
87823+/* we need to maintain two buffers, so that the kernel context of grlearn
87824+ uses a semaphore around the userspace copying, and the other kernel contexts
87825+ use a spinlock when copying into the buffer, since they cannot sleep
87826+*/
87827+static char *learn_buffer;
87828+static char *learn_buffer_user;
87829+static int learn_buffer_len;
87830+static int learn_buffer_user_len;
87831+
87832+static ssize_t
87833+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
87834+{
87835+ DECLARE_WAITQUEUE(wait, current);
87836+ ssize_t retval = 0;
87837+
87838+ add_wait_queue(&learn_wait, &wait);
87839+ set_current_state(TASK_INTERRUPTIBLE);
87840+ do {
87841+ mutex_lock(&gr_learn_user_mutex);
87842+ spin_lock(&gr_learn_lock);
87843+ if (learn_buffer_len)
87844+ break;
87845+ spin_unlock(&gr_learn_lock);
87846+ mutex_unlock(&gr_learn_user_mutex);
87847+ if (file->f_flags & O_NONBLOCK) {
87848+ retval = -EAGAIN;
87849+ goto out;
87850+ }
87851+ if (signal_pending(current)) {
87852+ retval = -ERESTARTSYS;
87853+ goto out;
87854+ }
87855+
87856+ schedule();
87857+ } while (1);
87858+
87859+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
87860+ learn_buffer_user_len = learn_buffer_len;
87861+ retval = learn_buffer_len;
87862+ learn_buffer_len = 0;
87863+
87864+ spin_unlock(&gr_learn_lock);
87865+
87866+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
87867+ retval = -EFAULT;
87868+
87869+ mutex_unlock(&gr_learn_user_mutex);
87870+out:
87871+ set_current_state(TASK_RUNNING);
87872+ remove_wait_queue(&learn_wait, &wait);
87873+ return retval;
87874+}
87875+
87876+static unsigned int
87877+poll_learn(struct file * file, poll_table * wait)
87878+{
87879+ poll_wait(file, &learn_wait, wait);
87880+
87881+ if (learn_buffer_len)
87882+ return (POLLIN | POLLRDNORM);
87883+
87884+ return 0;
87885+}
87886+
87887+void
87888+gr_clear_learn_entries(void)
87889+{
87890+ char *tmp;
87891+
87892+ mutex_lock(&gr_learn_user_mutex);
87893+ spin_lock(&gr_learn_lock);
87894+ tmp = learn_buffer;
87895+ learn_buffer = NULL;
87896+ spin_unlock(&gr_learn_lock);
87897+ if (tmp)
87898+ vfree(tmp);
87899+ if (learn_buffer_user != NULL) {
87900+ vfree(learn_buffer_user);
87901+ learn_buffer_user = NULL;
87902+ }
87903+ learn_buffer_len = 0;
87904+ mutex_unlock(&gr_learn_user_mutex);
87905+
87906+ return;
87907+}
87908+
87909+void
87910+gr_add_learn_entry(const char *fmt, ...)
87911+{
87912+ va_list args;
87913+ unsigned int len;
87914+
87915+ if (!gr_learn_attached)
87916+ return;
87917+
87918+ spin_lock(&gr_learn_lock);
87919+
87920+ /* leave a gap at the end so we know when it's "full" but don't have to
87921+ compute the exact length of the string we're trying to append
87922+ */
87923+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
87924+ spin_unlock(&gr_learn_lock);
87925+ wake_up_interruptible(&learn_wait);
87926+ return;
87927+ }
87928+ if (learn_buffer == NULL) {
87929+ spin_unlock(&gr_learn_lock);
87930+ return;
87931+ }
87932+
87933+ va_start(args, fmt);
87934+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
87935+ va_end(args);
87936+
87937+ learn_buffer_len += len + 1;
87938+
87939+ spin_unlock(&gr_learn_lock);
87940+ wake_up_interruptible(&learn_wait);
87941+
87942+ return;
87943+}
87944+
87945+static int
87946+open_learn(struct inode *inode, struct file *file)
87947+{
87948+ if (file->f_mode & FMODE_READ && gr_learn_attached)
87949+ return -EBUSY;
87950+ if (file->f_mode & FMODE_READ) {
87951+ int retval = 0;
87952+ mutex_lock(&gr_learn_user_mutex);
87953+ if (learn_buffer == NULL)
87954+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
87955+ if (learn_buffer_user == NULL)
87956+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
87957+ if (learn_buffer == NULL) {
87958+ retval = -ENOMEM;
87959+ goto out_error;
87960+ }
87961+ if (learn_buffer_user == NULL) {
87962+ retval = -ENOMEM;
87963+ goto out_error;
87964+ }
87965+ learn_buffer_len = 0;
87966+ learn_buffer_user_len = 0;
87967+ gr_learn_attached = 1;
87968+out_error:
87969+ mutex_unlock(&gr_learn_user_mutex);
87970+ return retval;
87971+ }
87972+ return 0;
87973+}
87974+
87975+static int
87976+close_learn(struct inode *inode, struct file *file)
87977+{
87978+ if (file->f_mode & FMODE_READ) {
87979+ char *tmp = NULL;
87980+ mutex_lock(&gr_learn_user_mutex);
87981+ spin_lock(&gr_learn_lock);
87982+ tmp = learn_buffer;
87983+ learn_buffer = NULL;
87984+ spin_unlock(&gr_learn_lock);
87985+ if (tmp)
87986+ vfree(tmp);
87987+ if (learn_buffer_user != NULL) {
87988+ vfree(learn_buffer_user);
87989+ learn_buffer_user = NULL;
87990+ }
87991+ learn_buffer_len = 0;
87992+ learn_buffer_user_len = 0;
87993+ gr_learn_attached = 0;
87994+ mutex_unlock(&gr_learn_user_mutex);
87995+ }
87996+
87997+ return 0;
87998+}
87999+
88000+const struct file_operations grsec_fops = {
88001+ .read = read_learn,
88002+ .write = write_grsec_handler,
88003+ .open = open_learn,
88004+ .release = close_learn,
88005+ .poll = poll_learn,
88006+};
88007diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
88008new file mode 100644
88009index 0000000..0773423
88010--- /dev/null
88011+++ b/grsecurity/gracl_policy.c
88012@@ -0,0 +1,1786 @@
88013+#include <linux/kernel.h>
88014+#include <linux/module.h>
88015+#include <linux/sched.h>
88016+#include <linux/mm.h>
88017+#include <linux/file.h>
88018+#include <linux/fs.h>
88019+#include <linux/namei.h>
88020+#include <linux/mount.h>
88021+#include <linux/tty.h>
88022+#include <linux/proc_fs.h>
88023+#include <linux/lglock.h>
88024+#include <linux/slab.h>
88025+#include <linux/vmalloc.h>
88026+#include <linux/types.h>
88027+#include <linux/sysctl.h>
88028+#include <linux/netdevice.h>
88029+#include <linux/ptrace.h>
88030+#include <linux/gracl.h>
88031+#include <linux/gralloc.h>
88032+#include <linux/security.h>
88033+#include <linux/grinternal.h>
88034+#include <linux/pid_namespace.h>
88035+#include <linux/stop_machine.h>
88036+#include <linux/fdtable.h>
88037+#include <linux/percpu.h>
88038+#include <linux/lglock.h>
88039+#include <linux/hugetlb.h>
88040+#include <linux/posix-timers.h>
88041+#include "../fs/mount.h"
88042+
88043+#include <asm/uaccess.h>
88044+#include <asm/errno.h>
88045+#include <asm/mman.h>
88046+
88047+extern struct gr_policy_state *polstate;
88048+
88049+#define FOR_EACH_ROLE_START(role) \
88050+ role = polstate->role_list; \
88051+ while (role) {
88052+
88053+#define FOR_EACH_ROLE_END(role) \
88054+ role = role->prev; \
88055+ }
88056+
88057+struct path gr_real_root;
88058+
88059+extern struct gr_alloc_state *current_alloc_state;
88060+
88061+u16 acl_sp_role_value;
88062+
88063+static DEFINE_MUTEX(gr_dev_mutex);
88064+
88065+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
88066+extern void gr_clear_learn_entries(void);
88067+
88068+struct gr_arg *gr_usermode __read_only;
88069+unsigned char *gr_system_salt __read_only;
88070+unsigned char *gr_system_sum __read_only;
88071+
88072+static unsigned int gr_auth_attempts = 0;
88073+static unsigned long gr_auth_expires = 0UL;
88074+
88075+struct acl_object_label *fakefs_obj_rw;
88076+struct acl_object_label *fakefs_obj_rwx;
88077+
88078+extern int gr_init_uidset(void);
88079+extern void gr_free_uidset(void);
88080+extern void gr_remove_uid(uid_t uid);
88081+extern int gr_find_uid(uid_t uid);
88082+
88083+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);
88084+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
88085+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
88086+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
88087+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);
88088+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
88089+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
88090+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
88091+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
88092+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
88093+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
88094+extern void assign_special_role(const char *rolename);
88095+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
88096+extern int gr_rbac_disable(void *unused);
88097+extern void gr_enable_rbac_system(void);
88098+
88099+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
88100+{
88101+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
88102+ return -EFAULT;
88103+
88104+ return 0;
88105+}
88106+
88107+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
88108+{
88109+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
88110+ return -EFAULT;
88111+
88112+ return 0;
88113+}
88114+
88115+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
88116+{
88117+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
88118+ return -EFAULT;
88119+
88120+ return 0;
88121+}
88122+
88123+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
88124+{
88125+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
88126+ return -EFAULT;
88127+
88128+ return 0;
88129+}
88130+
88131+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
88132+{
88133+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
88134+ return -EFAULT;
88135+
88136+ return 0;
88137+}
88138+
88139+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
88140+{
88141+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
88142+ return -EFAULT;
88143+
88144+ return 0;
88145+}
88146+
88147+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
88148+{
88149+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
88150+ return -EFAULT;
88151+
88152+ return 0;
88153+}
88154+
88155+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
88156+{
88157+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
88158+ return -EFAULT;
88159+
88160+ return 0;
88161+}
88162+
88163+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
88164+{
88165+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
88166+ return -EFAULT;
88167+
88168+ return 0;
88169+}
88170+
88171+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
88172+{
88173+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
88174+ return -EFAULT;
88175+
88176+ if ((uwrap->version != GRSECURITY_VERSION) ||
88177+ (uwrap->size != sizeof(struct gr_arg)))
88178+ return -EINVAL;
88179+
88180+ return 0;
88181+}
88182+
88183+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
88184+{
88185+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
88186+ return -EFAULT;
88187+
88188+ return 0;
88189+}
88190+
88191+static size_t get_gr_arg_wrapper_size_normal(void)
88192+{
88193+ return sizeof(struct gr_arg_wrapper);
88194+}
88195+
88196+#ifdef CONFIG_COMPAT
88197+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
88198+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
88199+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
88200+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
88201+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
88202+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
88203+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
88204+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
88205+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
88206+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
88207+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
88208+extern size_t get_gr_arg_wrapper_size_compat(void);
88209+
88210+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
88211+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
88212+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
88213+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
88214+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
88215+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
88216+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
88217+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
88218+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
88219+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
88220+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
88221+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
88222+
88223+#else
88224+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
88225+#define copy_gr_arg copy_gr_arg_normal
88226+#define copy_gr_hash_struct copy_gr_hash_struct_normal
88227+#define copy_acl_object_label copy_acl_object_label_normal
88228+#define copy_acl_subject_label copy_acl_subject_label_normal
88229+#define copy_acl_role_label copy_acl_role_label_normal
88230+#define copy_acl_ip_label copy_acl_ip_label_normal
88231+#define copy_pointer_from_array copy_pointer_from_array_normal
88232+#define copy_sprole_pw copy_sprole_pw_normal
88233+#define copy_role_transition copy_role_transition_normal
88234+#define copy_role_allowed_ip copy_role_allowed_ip_normal
88235+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
88236+#endif
88237+
88238+static struct acl_subject_label *
88239+lookup_subject_map(const struct acl_subject_label *userp)
88240+{
88241+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
88242+ struct subject_map *match;
88243+
88244+ match = polstate->subj_map_set.s_hash[index];
88245+
88246+ while (match && match->user != userp)
88247+ match = match->next;
88248+
88249+ if (match != NULL)
88250+ return match->kernel;
88251+ else
88252+ return NULL;
88253+}
88254+
88255+static void
88256+insert_subj_map_entry(struct subject_map *subjmap)
88257+{
88258+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
88259+ struct subject_map **curr;
88260+
88261+ subjmap->prev = NULL;
88262+
88263+ curr = &polstate->subj_map_set.s_hash[index];
88264+ if (*curr != NULL)
88265+ (*curr)->prev = subjmap;
88266+
88267+ subjmap->next = *curr;
88268+ *curr = subjmap;
88269+
88270+ return;
88271+}
88272+
88273+static void
88274+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
88275+{
88276+ unsigned int index =
88277+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
88278+ struct acl_role_label **curr;
88279+ struct acl_role_label *tmp, *tmp2;
88280+
88281+ curr = &polstate->acl_role_set.r_hash[index];
88282+
88283+ /* simple case, slot is empty, just set it to our role */
88284+ if (*curr == NULL) {
88285+ *curr = role;
88286+ } else {
88287+ /* example:
88288+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
88289+ 2 -> 3
88290+ */
88291+ /* first check to see if we can already be reached via this slot */
88292+ tmp = *curr;
88293+ while (tmp && tmp != role)
88294+ tmp = tmp->next;
88295+ if (tmp == role) {
88296+ /* we don't need to add ourselves to this slot's chain */
88297+ return;
88298+ }
88299+ /* we need to add ourselves to this chain, two cases */
88300+ if (role->next == NULL) {
88301+ /* simple case, append the current chain to our role */
88302+ role->next = *curr;
88303+ *curr = role;
88304+ } else {
88305+ /* 1 -> 2 -> 3 -> 4
88306+ 2 -> 3 -> 4
88307+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
88308+ */
88309+ /* trickier case: walk our role's chain until we find
88310+ the role for the start of the current slot's chain */
88311+ tmp = role;
88312+ tmp2 = *curr;
88313+ while (tmp->next && tmp->next != tmp2)
88314+ tmp = tmp->next;
88315+ if (tmp->next == tmp2) {
88316+ /* from example above, we found 3, so just
88317+ replace this slot's chain with ours */
88318+ *curr = role;
88319+ } else {
88320+ /* we didn't find a subset of our role's chain
88321+ in the current slot's chain, so append their
88322+ chain to ours, and set us as the first role in
88323+ the slot's chain
88324+
88325+ we could fold this case with the case above,
88326+ but making it explicit for clarity
88327+ */
88328+ tmp->next = tmp2;
88329+ *curr = role;
88330+ }
88331+ }
88332+ }
88333+
88334+ return;
88335+}
88336+
88337+static void
88338+insert_acl_role_label(struct acl_role_label *role)
88339+{
88340+ int i;
88341+
88342+ if (polstate->role_list == NULL) {
88343+ polstate->role_list = role;
88344+ role->prev = NULL;
88345+ } else {
88346+ role->prev = polstate->role_list;
88347+ polstate->role_list = role;
88348+ }
88349+
88350+ /* used for hash chains */
88351+ role->next = NULL;
88352+
88353+ if (role->roletype & GR_ROLE_DOMAIN) {
88354+ for (i = 0; i < role->domain_child_num; i++)
88355+ __insert_acl_role_label(role, role->domain_children[i]);
88356+ } else
88357+ __insert_acl_role_label(role, role->uidgid);
88358+}
88359+
88360+static int
88361+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
88362+{
88363+ struct name_entry **curr, *nentry;
88364+ struct inodev_entry *ientry;
88365+ unsigned int len = strlen(name);
88366+ unsigned int key = full_name_hash(name, len);
88367+ unsigned int index = key % polstate->name_set.n_size;
88368+
88369+ curr = &polstate->name_set.n_hash[index];
88370+
88371+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
88372+ curr = &((*curr)->next);
88373+
88374+ if (*curr != NULL)
88375+ return 1;
88376+
88377+ nentry = acl_alloc(sizeof (struct name_entry));
88378+ if (nentry == NULL)
88379+ return 0;
88380+ ientry = acl_alloc(sizeof (struct inodev_entry));
88381+ if (ientry == NULL)
88382+ return 0;
88383+ ientry->nentry = nentry;
88384+
88385+ nentry->key = key;
88386+ nentry->name = name;
88387+ nentry->inode = inode;
88388+ nentry->device = device;
88389+ nentry->len = len;
88390+ nentry->deleted = deleted;
88391+
88392+ nentry->prev = NULL;
88393+ curr = &polstate->name_set.n_hash[index];
88394+ if (*curr != NULL)
88395+ (*curr)->prev = nentry;
88396+ nentry->next = *curr;
88397+ *curr = nentry;
88398+
88399+ /* insert us into the table searchable by inode/dev */
88400+ __insert_inodev_entry(polstate, ientry);
88401+
88402+ return 1;
88403+}
88404+
88405+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
88406+
88407+static void *
88408+create_table(__u32 * len, int elementsize)
88409+{
88410+ unsigned int table_sizes[] = {
88411+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
88412+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
88413+ 4194301, 8388593, 16777213, 33554393, 67108859
88414+ };
88415+ void *newtable = NULL;
88416+ unsigned int pwr = 0;
88417+
88418+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
88419+ table_sizes[pwr] <= *len)
88420+ pwr++;
88421+
88422+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
88423+ return newtable;
88424+
88425+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
88426+ newtable =
88427+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
88428+ else
88429+ newtable = vmalloc(table_sizes[pwr] * elementsize);
88430+
88431+ *len = table_sizes[pwr];
88432+
88433+ return newtable;
88434+}
88435+
88436+static int
88437+init_variables(const struct gr_arg *arg, bool reload)
88438+{
88439+ struct task_struct *reaper = init_pid_ns.child_reaper;
88440+ unsigned int stacksize;
88441+
88442+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
88443+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
88444+ polstate->name_set.n_size = arg->role_db.num_objects;
88445+ polstate->inodev_set.i_size = arg->role_db.num_objects;
88446+
88447+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
88448+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
88449+ return 1;
88450+
88451+ if (!reload) {
88452+ if (!gr_init_uidset())
88453+ return 1;
88454+ }
88455+
88456+ /* set up the stack that holds allocation info */
88457+
88458+ stacksize = arg->role_db.num_pointers + 5;
88459+
88460+ if (!acl_alloc_stack_init(stacksize))
88461+ return 1;
88462+
88463+ if (!reload) {
88464+ /* grab reference for the real root dentry and vfsmount */
88465+ get_fs_root(reaper->fs, &gr_real_root);
88466+
88467+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
88468+ 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));
88469+#endif
88470+
88471+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
88472+ if (fakefs_obj_rw == NULL)
88473+ return 1;
88474+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
88475+
88476+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
88477+ if (fakefs_obj_rwx == NULL)
88478+ return 1;
88479+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
88480+ }
88481+
88482+ polstate->subj_map_set.s_hash =
88483+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
88484+ polstate->acl_role_set.r_hash =
88485+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
88486+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
88487+ polstate->inodev_set.i_hash =
88488+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
88489+
88490+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
88491+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
88492+ return 1;
88493+
88494+ memset(polstate->subj_map_set.s_hash, 0,
88495+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
88496+ memset(polstate->acl_role_set.r_hash, 0,
88497+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
88498+ memset(polstate->name_set.n_hash, 0,
88499+ sizeof (struct name_entry *) * polstate->name_set.n_size);
88500+ memset(polstate->inodev_set.i_hash, 0,
88501+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
88502+
88503+ return 0;
88504+}
88505+
88506+/* free information not needed after startup
88507+ currently contains user->kernel pointer mappings for subjects
88508+*/
88509+
88510+static void
88511+free_init_variables(void)
88512+{
88513+ __u32 i;
88514+
88515+ if (polstate->subj_map_set.s_hash) {
88516+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
88517+ if (polstate->subj_map_set.s_hash[i]) {
88518+ kfree(polstate->subj_map_set.s_hash[i]);
88519+ polstate->subj_map_set.s_hash[i] = NULL;
88520+ }
88521+ }
88522+
88523+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
88524+ PAGE_SIZE)
88525+ kfree(polstate->subj_map_set.s_hash);
88526+ else
88527+ vfree(polstate->subj_map_set.s_hash);
88528+ }
88529+
88530+ return;
88531+}
88532+
88533+static void
88534+free_variables(bool reload)
88535+{
88536+ struct acl_subject_label *s;
88537+ struct acl_role_label *r;
88538+ struct task_struct *task, *task2;
88539+ unsigned int x;
88540+
88541+ if (!reload) {
88542+ gr_clear_learn_entries();
88543+
88544+ read_lock(&tasklist_lock);
88545+ do_each_thread(task2, task) {
88546+ task->acl_sp_role = 0;
88547+ task->acl_role_id = 0;
88548+ task->inherited = 0;
88549+ task->acl = NULL;
88550+ task->role = NULL;
88551+ } while_each_thread(task2, task);
88552+ read_unlock(&tasklist_lock);
88553+
88554+ kfree(fakefs_obj_rw);
88555+ fakefs_obj_rw = NULL;
88556+ kfree(fakefs_obj_rwx);
88557+ fakefs_obj_rwx = NULL;
88558+
88559+ /* release the reference to the real root dentry and vfsmount */
88560+ path_put(&gr_real_root);
88561+ memset(&gr_real_root, 0, sizeof(gr_real_root));
88562+ }
88563+
88564+ /* free all object hash tables */
88565+
88566+ FOR_EACH_ROLE_START(r)
88567+ if (r->subj_hash == NULL)
88568+ goto next_role;
88569+ FOR_EACH_SUBJECT_START(r, s, x)
88570+ if (s->obj_hash == NULL)
88571+ break;
88572+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
88573+ kfree(s->obj_hash);
88574+ else
88575+ vfree(s->obj_hash);
88576+ FOR_EACH_SUBJECT_END(s, x)
88577+ FOR_EACH_NESTED_SUBJECT_START(r, s)
88578+ if (s->obj_hash == NULL)
88579+ break;
88580+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
88581+ kfree(s->obj_hash);
88582+ else
88583+ vfree(s->obj_hash);
88584+ FOR_EACH_NESTED_SUBJECT_END(s)
88585+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
88586+ kfree(r->subj_hash);
88587+ else
88588+ vfree(r->subj_hash);
88589+ r->subj_hash = NULL;
88590+next_role:
88591+ FOR_EACH_ROLE_END(r)
88592+
88593+ acl_free_all();
88594+
88595+ if (polstate->acl_role_set.r_hash) {
88596+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
88597+ PAGE_SIZE)
88598+ kfree(polstate->acl_role_set.r_hash);
88599+ else
88600+ vfree(polstate->acl_role_set.r_hash);
88601+ }
88602+ if (polstate->name_set.n_hash) {
88603+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
88604+ PAGE_SIZE)
88605+ kfree(polstate->name_set.n_hash);
88606+ else
88607+ vfree(polstate->name_set.n_hash);
88608+ }
88609+
88610+ if (polstate->inodev_set.i_hash) {
88611+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
88612+ PAGE_SIZE)
88613+ kfree(polstate->inodev_set.i_hash);
88614+ else
88615+ vfree(polstate->inodev_set.i_hash);
88616+ }
88617+
88618+ if (!reload)
88619+ gr_free_uidset();
88620+
88621+ memset(&polstate->name_set, 0, sizeof (struct name_db));
88622+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
88623+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
88624+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
88625+
88626+ polstate->default_role = NULL;
88627+ polstate->kernel_role = NULL;
88628+ polstate->role_list = NULL;
88629+
88630+ return;
88631+}
88632+
88633+static struct acl_subject_label *
88634+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
88635+
88636+static int alloc_and_copy_string(char **name, unsigned int maxlen)
88637+{
88638+ unsigned int len = strnlen_user(*name, maxlen);
88639+ char *tmp;
88640+
88641+ if (!len || len >= maxlen)
88642+ return -EINVAL;
88643+
88644+ if ((tmp = (char *) acl_alloc(len)) == NULL)
88645+ return -ENOMEM;
88646+
88647+ if (copy_from_user(tmp, *name, len))
88648+ return -EFAULT;
88649+
88650+ tmp[len-1] = '\0';
88651+ *name = tmp;
88652+
88653+ return 0;
88654+}
88655+
88656+static int
88657+copy_user_glob(struct acl_object_label *obj)
88658+{
88659+ struct acl_object_label *g_tmp, **guser;
88660+ int error;
88661+
88662+ if (obj->globbed == NULL)
88663+ return 0;
88664+
88665+ guser = &obj->globbed;
88666+ while (*guser) {
88667+ g_tmp = (struct acl_object_label *)
88668+ acl_alloc(sizeof (struct acl_object_label));
88669+ if (g_tmp == NULL)
88670+ return -ENOMEM;
88671+
88672+ if (copy_acl_object_label(g_tmp, *guser))
88673+ return -EFAULT;
88674+
88675+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
88676+ if (error)
88677+ return error;
88678+
88679+ *guser = g_tmp;
88680+ guser = &(g_tmp->next);
88681+ }
88682+
88683+ return 0;
88684+}
88685+
88686+static int
88687+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
88688+ struct acl_role_label *role)
88689+{
88690+ struct acl_object_label *o_tmp;
88691+ int ret;
88692+
88693+ while (userp) {
88694+ if ((o_tmp = (struct acl_object_label *)
88695+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
88696+ return -ENOMEM;
88697+
88698+ if (copy_acl_object_label(o_tmp, userp))
88699+ return -EFAULT;
88700+
88701+ userp = o_tmp->prev;
88702+
88703+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
88704+ if (ret)
88705+ return ret;
88706+
88707+ insert_acl_obj_label(o_tmp, subj);
88708+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
88709+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
88710+ return -ENOMEM;
88711+
88712+ ret = copy_user_glob(o_tmp);
88713+ if (ret)
88714+ return ret;
88715+
88716+ if (o_tmp->nested) {
88717+ int already_copied;
88718+
88719+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
88720+ if (IS_ERR(o_tmp->nested))
88721+ return PTR_ERR(o_tmp->nested);
88722+
88723+ /* insert into nested subject list if we haven't copied this one yet
88724+ to prevent duplicate entries */
88725+ if (!already_copied) {
88726+ o_tmp->nested->next = role->hash->first;
88727+ role->hash->first = o_tmp->nested;
88728+ }
88729+ }
88730+ }
88731+
88732+ return 0;
88733+}
88734+
88735+static __u32
88736+count_user_subjs(struct acl_subject_label *userp)
88737+{
88738+ struct acl_subject_label s_tmp;
88739+ __u32 num = 0;
88740+
88741+ while (userp) {
88742+ if (copy_acl_subject_label(&s_tmp, userp))
88743+ break;
88744+
88745+ userp = s_tmp.prev;
88746+ }
88747+
88748+ return num;
88749+}
88750+
88751+static int
88752+copy_user_allowedips(struct acl_role_label *rolep)
88753+{
88754+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
88755+
88756+ ruserip = rolep->allowed_ips;
88757+
88758+ while (ruserip) {
88759+ rlast = rtmp;
88760+
88761+ if ((rtmp = (struct role_allowed_ip *)
88762+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
88763+ return -ENOMEM;
88764+
88765+ if (copy_role_allowed_ip(rtmp, ruserip))
88766+ return -EFAULT;
88767+
88768+ ruserip = rtmp->prev;
88769+
88770+ if (!rlast) {
88771+ rtmp->prev = NULL;
88772+ rolep->allowed_ips = rtmp;
88773+ } else {
88774+ rlast->next = rtmp;
88775+ rtmp->prev = rlast;
88776+ }
88777+
88778+ if (!ruserip)
88779+ rtmp->next = NULL;
88780+ }
88781+
88782+ return 0;
88783+}
88784+
88785+static int
88786+copy_user_transitions(struct acl_role_label *rolep)
88787+{
88788+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
88789+ int error;
88790+
88791+ rusertp = rolep->transitions;
88792+
88793+ while (rusertp) {
88794+ rlast = rtmp;
88795+
88796+ if ((rtmp = (struct role_transition *)
88797+ acl_alloc(sizeof (struct role_transition))) == NULL)
88798+ return -ENOMEM;
88799+
88800+ if (copy_role_transition(rtmp, rusertp))
88801+ return -EFAULT;
88802+
88803+ rusertp = rtmp->prev;
88804+
88805+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
88806+ if (error)
88807+ return error;
88808+
88809+ if (!rlast) {
88810+ rtmp->prev = NULL;
88811+ rolep->transitions = rtmp;
88812+ } else {
88813+ rlast->next = rtmp;
88814+ rtmp->prev = rlast;
88815+ }
88816+
88817+ if (!rusertp)
88818+ rtmp->next = NULL;
88819+ }
88820+
88821+ return 0;
88822+}
88823+
88824+static __u32 count_user_objs(const struct acl_object_label __user *userp)
88825+{
88826+ struct acl_object_label o_tmp;
88827+ __u32 num = 0;
88828+
88829+ while (userp) {
88830+ if (copy_acl_object_label(&o_tmp, userp))
88831+ break;
88832+
88833+ userp = o_tmp.prev;
88834+ num++;
88835+ }
88836+
88837+ return num;
88838+}
88839+
88840+static struct acl_subject_label *
88841+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
88842+{
88843+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
88844+ __u32 num_objs;
88845+ struct acl_ip_label **i_tmp, *i_utmp2;
88846+ struct gr_hash_struct ghash;
88847+ struct subject_map *subjmap;
88848+ unsigned int i_num;
88849+ int err;
88850+
88851+ if (already_copied != NULL)
88852+ *already_copied = 0;
88853+
88854+ s_tmp = lookup_subject_map(userp);
88855+
88856+ /* we've already copied this subject into the kernel, just return
88857+ the reference to it, and don't copy it over again
88858+ */
88859+ if (s_tmp) {
88860+ if (already_copied != NULL)
88861+ *already_copied = 1;
88862+ return(s_tmp);
88863+ }
88864+
88865+ if ((s_tmp = (struct acl_subject_label *)
88866+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
88867+ return ERR_PTR(-ENOMEM);
88868+
88869+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
88870+ if (subjmap == NULL)
88871+ return ERR_PTR(-ENOMEM);
88872+
88873+ subjmap->user = userp;
88874+ subjmap->kernel = s_tmp;
88875+ insert_subj_map_entry(subjmap);
88876+
88877+ if (copy_acl_subject_label(s_tmp, userp))
88878+ return ERR_PTR(-EFAULT);
88879+
88880+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
88881+ if (err)
88882+ return ERR_PTR(err);
88883+
88884+ if (!strcmp(s_tmp->filename, "/"))
88885+ role->root_label = s_tmp;
88886+
88887+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
88888+ return ERR_PTR(-EFAULT);
88889+
88890+ /* copy user and group transition tables */
88891+
88892+ if (s_tmp->user_trans_num) {
88893+ uid_t *uidlist;
88894+
88895+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
88896+ if (uidlist == NULL)
88897+ return ERR_PTR(-ENOMEM);
88898+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
88899+ return ERR_PTR(-EFAULT);
88900+
88901+ s_tmp->user_transitions = uidlist;
88902+ }
88903+
88904+ if (s_tmp->group_trans_num) {
88905+ gid_t *gidlist;
88906+
88907+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
88908+ if (gidlist == NULL)
88909+ return ERR_PTR(-ENOMEM);
88910+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
88911+ return ERR_PTR(-EFAULT);
88912+
88913+ s_tmp->group_transitions = gidlist;
88914+ }
88915+
88916+ /* set up object hash table */
88917+ num_objs = count_user_objs(ghash.first);
88918+
88919+ s_tmp->obj_hash_size = num_objs;
88920+ s_tmp->obj_hash =
88921+ (struct acl_object_label **)
88922+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
88923+
88924+ if (!s_tmp->obj_hash)
88925+ return ERR_PTR(-ENOMEM);
88926+
88927+ memset(s_tmp->obj_hash, 0,
88928+ s_tmp->obj_hash_size *
88929+ sizeof (struct acl_object_label *));
88930+
88931+ /* add in objects */
88932+ err = copy_user_objs(ghash.first, s_tmp, role);
88933+
88934+ if (err)
88935+ return ERR_PTR(err);
88936+
88937+ /* set pointer for parent subject */
88938+ if (s_tmp->parent_subject) {
88939+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
88940+
88941+ if (IS_ERR(s_tmp2))
88942+ return s_tmp2;
88943+
88944+ s_tmp->parent_subject = s_tmp2;
88945+ }
88946+
88947+ /* add in ip acls */
88948+
88949+ if (!s_tmp->ip_num) {
88950+ s_tmp->ips = NULL;
88951+ goto insert;
88952+ }
88953+
88954+ i_tmp =
88955+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
88956+ sizeof (struct acl_ip_label *));
88957+
88958+ if (!i_tmp)
88959+ return ERR_PTR(-ENOMEM);
88960+
88961+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
88962+ *(i_tmp + i_num) =
88963+ (struct acl_ip_label *)
88964+ acl_alloc(sizeof (struct acl_ip_label));
88965+ if (!*(i_tmp + i_num))
88966+ return ERR_PTR(-ENOMEM);
88967+
88968+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
88969+ return ERR_PTR(-EFAULT);
88970+
88971+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
88972+ return ERR_PTR(-EFAULT);
88973+
88974+ if ((*(i_tmp + i_num))->iface == NULL)
88975+ continue;
88976+
88977+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
88978+ if (err)
88979+ return ERR_PTR(err);
88980+ }
88981+
88982+ s_tmp->ips = i_tmp;
88983+
88984+insert:
88985+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
88986+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
88987+ return ERR_PTR(-ENOMEM);
88988+
88989+ return s_tmp;
88990+}
88991+
88992+static int
88993+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
88994+{
88995+ struct acl_subject_label s_pre;
88996+ struct acl_subject_label * ret;
88997+ int err;
88998+
88999+ while (userp) {
89000+ if (copy_acl_subject_label(&s_pre, userp))
89001+ return -EFAULT;
89002+
89003+ ret = do_copy_user_subj(userp, role, NULL);
89004+
89005+ err = PTR_ERR(ret);
89006+ if (IS_ERR(ret))
89007+ return err;
89008+
89009+ insert_acl_subj_label(ret, role);
89010+
89011+ userp = s_pre.prev;
89012+ }
89013+
89014+ return 0;
89015+}
89016+
89017+static int
89018+copy_user_acl(struct gr_arg *arg)
89019+{
89020+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
89021+ struct acl_subject_label *subj_list;
89022+ struct sprole_pw *sptmp;
89023+ struct gr_hash_struct *ghash;
89024+ uid_t *domainlist;
89025+ unsigned int r_num;
89026+ int err = 0;
89027+ __u16 i;
89028+ __u32 num_subjs;
89029+
89030+ /* we need a default and kernel role */
89031+ if (arg->role_db.num_roles < 2)
89032+ return -EINVAL;
89033+
89034+ /* copy special role authentication info from userspace */
89035+
89036+ polstate->num_sprole_pws = arg->num_sprole_pws;
89037+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
89038+
89039+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
89040+ return -ENOMEM;
89041+
89042+ for (i = 0; i < polstate->num_sprole_pws; i++) {
89043+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
89044+ if (!sptmp)
89045+ return -ENOMEM;
89046+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
89047+ return -EFAULT;
89048+
89049+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
89050+ if (err)
89051+ return err;
89052+
89053+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
89054+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
89055+#endif
89056+
89057+ polstate->acl_special_roles[i] = sptmp;
89058+ }
89059+
89060+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
89061+
89062+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
89063+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
89064+
89065+ if (!r_tmp)
89066+ return -ENOMEM;
89067+
89068+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
89069+ return -EFAULT;
89070+
89071+ if (copy_acl_role_label(r_tmp, r_utmp2))
89072+ return -EFAULT;
89073+
89074+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
89075+ if (err)
89076+ return err;
89077+
89078+ if (!strcmp(r_tmp->rolename, "default")
89079+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
89080+ polstate->default_role = r_tmp;
89081+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
89082+ polstate->kernel_role = r_tmp;
89083+ }
89084+
89085+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
89086+ return -ENOMEM;
89087+
89088+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
89089+ return -EFAULT;
89090+
89091+ r_tmp->hash = ghash;
89092+
89093+ num_subjs = count_user_subjs(r_tmp->hash->first);
89094+
89095+ r_tmp->subj_hash_size = num_subjs;
89096+ r_tmp->subj_hash =
89097+ (struct acl_subject_label **)
89098+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
89099+
89100+ if (!r_tmp->subj_hash)
89101+ return -ENOMEM;
89102+
89103+ err = copy_user_allowedips(r_tmp);
89104+ if (err)
89105+ return err;
89106+
89107+ /* copy domain info */
89108+ if (r_tmp->domain_children != NULL) {
89109+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
89110+ if (domainlist == NULL)
89111+ return -ENOMEM;
89112+
89113+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
89114+ return -EFAULT;
89115+
89116+ r_tmp->domain_children = domainlist;
89117+ }
89118+
89119+ err = copy_user_transitions(r_tmp);
89120+ if (err)
89121+ return err;
89122+
89123+ memset(r_tmp->subj_hash, 0,
89124+ r_tmp->subj_hash_size *
89125+ sizeof (struct acl_subject_label *));
89126+
89127+ /* acquire the list of subjects, then NULL out
89128+ the list prior to parsing the subjects for this role,
89129+ as during this parsing the list is replaced with a list
89130+ of *nested* subjects for the role
89131+ */
89132+ subj_list = r_tmp->hash->first;
89133+
89134+ /* set nested subject list to null */
89135+ r_tmp->hash->first = NULL;
89136+
89137+ err = copy_user_subjs(subj_list, r_tmp);
89138+
89139+ if (err)
89140+ return err;
89141+
89142+ insert_acl_role_label(r_tmp);
89143+ }
89144+
89145+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
89146+ return -EINVAL;
89147+
89148+ return err;
89149+}
89150+
89151+static int gracl_reload_apply_policies(void *reload)
89152+{
89153+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
89154+ struct task_struct *task, *task2;
89155+ struct acl_role_label *role, *rtmp;
89156+ struct acl_subject_label *subj;
89157+ const struct cred *cred;
89158+ int role_applied;
89159+ int ret = 0;
89160+
89161+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
89162+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
89163+
89164+ /* first make sure we'll be able to apply the new policy cleanly */
89165+ do_each_thread(task2, task) {
89166+ if (task->exec_file == NULL)
89167+ continue;
89168+ role_applied = 0;
89169+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
89170+ /* preserve special roles */
89171+ FOR_EACH_ROLE_START(role)
89172+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
89173+ rtmp = task->role;
89174+ task->role = role;
89175+ role_applied = 1;
89176+ break;
89177+ }
89178+ FOR_EACH_ROLE_END(role)
89179+ }
89180+ if (!role_applied) {
89181+ cred = __task_cred(task);
89182+ rtmp = task->role;
89183+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89184+ }
89185+ /* this handles non-nested inherited subjects, nested subjects will still
89186+ be dropped currently */
89187+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
89188+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
89189+ /* change the role back so that we've made no modifications to the policy */
89190+ task->role = rtmp;
89191+
89192+ if (subj == NULL || task->tmpacl == NULL) {
89193+ ret = -EINVAL;
89194+ goto out;
89195+ }
89196+ } while_each_thread(task2, task);
89197+
89198+ /* now actually apply the policy */
89199+
89200+ do_each_thread(task2, task) {
89201+ if (task->exec_file) {
89202+ role_applied = 0;
89203+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
89204+ /* preserve special roles */
89205+ FOR_EACH_ROLE_START(role)
89206+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
89207+ task->role = role;
89208+ role_applied = 1;
89209+ break;
89210+ }
89211+ FOR_EACH_ROLE_END(role)
89212+ }
89213+ if (!role_applied) {
89214+ cred = __task_cred(task);
89215+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89216+ }
89217+ /* this handles non-nested inherited subjects, nested subjects will still
89218+ be dropped currently */
89219+ if (!reload_state->oldmode && task->inherited)
89220+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
89221+ else {
89222+ /* looked up and tagged to the task previously */
89223+ subj = task->tmpacl;
89224+ }
89225+ /* subj will be non-null */
89226+ __gr_apply_subject_to_task(polstate, task, subj);
89227+ if (reload_state->oldmode) {
89228+ task->acl_role_id = 0;
89229+ task->acl_sp_role = 0;
89230+ task->inherited = 0;
89231+ }
89232+ } else {
89233+ // it's a kernel process
89234+ task->role = polstate->kernel_role;
89235+ task->acl = polstate->kernel_role->root_label;
89236+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
89237+ task->acl->mode &= ~GR_PROCFIND;
89238+#endif
89239+ }
89240+ } while_each_thread(task2, task);
89241+
89242+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
89243+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
89244+
89245+out:
89246+
89247+ return ret;
89248+}
89249+
89250+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
89251+{
89252+ struct gr_reload_state new_reload_state = { };
89253+ int err;
89254+
89255+ new_reload_state.oldpolicy_ptr = polstate;
89256+ new_reload_state.oldalloc_ptr = current_alloc_state;
89257+ new_reload_state.oldmode = oldmode;
89258+
89259+ current_alloc_state = &new_reload_state.newalloc;
89260+ polstate = &new_reload_state.newpolicy;
89261+
89262+ /* everything relevant is now saved off, copy in the new policy */
89263+ if (init_variables(args, true)) {
89264+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
89265+ err = -ENOMEM;
89266+ goto error;
89267+ }
89268+
89269+ err = copy_user_acl(args);
89270+ free_init_variables();
89271+ if (err)
89272+ goto error;
89273+ /* the new policy is copied in, with the old policy available via saved_state
89274+ first go through applying roles, making sure to preserve special roles
89275+ then apply new subjects, making sure to preserve inherited and nested subjects,
89276+ though currently only inherited subjects will be preserved
89277+ */
89278+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
89279+ if (err)
89280+ goto error;
89281+
89282+ /* we've now applied the new policy, so restore the old policy state to free it */
89283+ polstate = &new_reload_state.oldpolicy;
89284+ current_alloc_state = &new_reload_state.oldalloc;
89285+ free_variables(true);
89286+
89287+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
89288+ to running_polstate/current_alloc_state inside stop_machine
89289+ */
89290+ err = 0;
89291+ goto out;
89292+error:
89293+ /* on error of loading the new policy, we'll just keep the previous
89294+ policy set around
89295+ */
89296+ free_variables(true);
89297+
89298+ /* doesn't affect runtime, but maintains consistent state */
89299+out:
89300+ polstate = new_reload_state.oldpolicy_ptr;
89301+ current_alloc_state = new_reload_state.oldalloc_ptr;
89302+
89303+ return err;
89304+}
89305+
89306+static int
89307+gracl_init(struct gr_arg *args)
89308+{
89309+ int error = 0;
89310+
89311+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
89312+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
89313+
89314+ if (init_variables(args, false)) {
89315+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
89316+ error = -ENOMEM;
89317+ goto out;
89318+ }
89319+
89320+ error = copy_user_acl(args);
89321+ free_init_variables();
89322+ if (error)
89323+ goto out;
89324+
89325+ error = gr_set_acls(0);
89326+ if (error)
89327+ goto out;
89328+
89329+ gr_enable_rbac_system();
89330+
89331+ return 0;
89332+
89333+out:
89334+ free_variables(false);
89335+ return error;
89336+}
89337+
89338+static int
89339+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
89340+ unsigned char **sum)
89341+{
89342+ struct acl_role_label *r;
89343+ struct role_allowed_ip *ipp;
89344+ struct role_transition *trans;
89345+ unsigned int i;
89346+ int found = 0;
89347+ u32 curr_ip = current->signal->curr_ip;
89348+
89349+ current->signal->saved_ip = curr_ip;
89350+
89351+ /* check transition table */
89352+
89353+ for (trans = current->role->transitions; trans; trans = trans->next) {
89354+ if (!strcmp(rolename, trans->rolename)) {
89355+ found = 1;
89356+ break;
89357+ }
89358+ }
89359+
89360+ if (!found)
89361+ return 0;
89362+
89363+ /* handle special roles that do not require authentication
89364+ and check ip */
89365+
89366+ FOR_EACH_ROLE_START(r)
89367+ if (!strcmp(rolename, r->rolename) &&
89368+ (r->roletype & GR_ROLE_SPECIAL)) {
89369+ found = 0;
89370+ if (r->allowed_ips != NULL) {
89371+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
89372+ if ((ntohl(curr_ip) & ipp->netmask) ==
89373+ (ntohl(ipp->addr) & ipp->netmask))
89374+ found = 1;
89375+ }
89376+ } else
89377+ found = 2;
89378+ if (!found)
89379+ return 0;
89380+
89381+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
89382+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
89383+ *salt = NULL;
89384+ *sum = NULL;
89385+ return 1;
89386+ }
89387+ }
89388+ FOR_EACH_ROLE_END(r)
89389+
89390+ for (i = 0; i < polstate->num_sprole_pws; i++) {
89391+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
89392+ *salt = polstate->acl_special_roles[i]->salt;
89393+ *sum = polstate->acl_special_roles[i]->sum;
89394+ return 1;
89395+ }
89396+ }
89397+
89398+ return 0;
89399+}
89400+
89401+int gr_check_secure_terminal(struct task_struct *task)
89402+{
89403+ struct task_struct *p, *p2, *p3;
89404+ struct files_struct *files;
89405+ struct fdtable *fdt;
89406+ struct file *our_file = NULL, *file;
89407+ struct inode *our_inode = NULL;
89408+ int i;
89409+
89410+ if (task->signal->tty == NULL)
89411+ return 1;
89412+
89413+ files = get_files_struct(task);
89414+ if (files != NULL) {
89415+ rcu_read_lock();
89416+ fdt = files_fdtable(files);
89417+ for (i=0; i < fdt->max_fds; i++) {
89418+ file = fcheck_files(files, i);
89419+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
89420+ get_file(file);
89421+ our_file = file;
89422+ }
89423+ }
89424+ rcu_read_unlock();
89425+ put_files_struct(files);
89426+ }
89427+
89428+ if (our_file == NULL)
89429+ return 1;
89430+
89431+ our_inode = d_backing_inode(our_file->f_path.dentry);
89432+
89433+ read_lock(&tasklist_lock);
89434+ do_each_thread(p2, p) {
89435+ files = get_files_struct(p);
89436+ if (files == NULL ||
89437+ (p->signal && p->signal->tty == task->signal->tty)) {
89438+ if (files != NULL)
89439+ put_files_struct(files);
89440+ continue;
89441+ }
89442+ rcu_read_lock();
89443+ fdt = files_fdtable(files);
89444+ for (i=0; i < fdt->max_fds; i++) {
89445+ struct inode *inode = NULL;
89446+ file = fcheck_files(files, i);
89447+ if (file)
89448+ inode = d_backing_inode(file->f_path.dentry);
89449+ if (inode && S_ISCHR(inode->i_mode) && inode->i_rdev == our_inode->i_rdev) {
89450+ p3 = task;
89451+ while (task_pid_nr(p3) > 0) {
89452+ if (p3 == p)
89453+ break;
89454+ p3 = p3->real_parent;
89455+ }
89456+ if (p3 == p)
89457+ break;
89458+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
89459+ gr_handle_alertkill(p);
89460+ rcu_read_unlock();
89461+ put_files_struct(files);
89462+ read_unlock(&tasklist_lock);
89463+ fput(our_file);
89464+ return 0;
89465+ }
89466+ }
89467+ rcu_read_unlock();
89468+ put_files_struct(files);
89469+ } while_each_thread(p2, p);
89470+ read_unlock(&tasklist_lock);
89471+
89472+ fput(our_file);
89473+ return 1;
89474+}
89475+
89476+ssize_t
89477+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
89478+{
89479+ struct gr_arg_wrapper uwrap;
89480+ unsigned char *sprole_salt = NULL;
89481+ unsigned char *sprole_sum = NULL;
89482+ int error = 0;
89483+ int error2 = 0;
89484+ size_t req_count = 0;
89485+ unsigned char oldmode = 0;
89486+
89487+ mutex_lock(&gr_dev_mutex);
89488+
89489+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
89490+ error = -EPERM;
89491+ goto out;
89492+ }
89493+
89494+#ifdef CONFIG_COMPAT
89495+ pax_open_kernel();
89496+ if (is_compat_task()) {
89497+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
89498+ copy_gr_arg = &copy_gr_arg_compat;
89499+ copy_acl_object_label = &copy_acl_object_label_compat;
89500+ copy_acl_subject_label = &copy_acl_subject_label_compat;
89501+ copy_acl_role_label = &copy_acl_role_label_compat;
89502+ copy_acl_ip_label = &copy_acl_ip_label_compat;
89503+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
89504+ copy_role_transition = &copy_role_transition_compat;
89505+ copy_sprole_pw = &copy_sprole_pw_compat;
89506+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
89507+ copy_pointer_from_array = &copy_pointer_from_array_compat;
89508+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
89509+ } else {
89510+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
89511+ copy_gr_arg = &copy_gr_arg_normal;
89512+ copy_acl_object_label = &copy_acl_object_label_normal;
89513+ copy_acl_subject_label = &copy_acl_subject_label_normal;
89514+ copy_acl_role_label = &copy_acl_role_label_normal;
89515+ copy_acl_ip_label = &copy_acl_ip_label_normal;
89516+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
89517+ copy_role_transition = &copy_role_transition_normal;
89518+ copy_sprole_pw = &copy_sprole_pw_normal;
89519+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
89520+ copy_pointer_from_array = &copy_pointer_from_array_normal;
89521+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
89522+ }
89523+ pax_close_kernel();
89524+#endif
89525+
89526+ req_count = get_gr_arg_wrapper_size();
89527+
89528+ if (count != req_count) {
89529+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
89530+ error = -EINVAL;
89531+ goto out;
89532+ }
89533+
89534+
89535+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
89536+ gr_auth_expires = 0;
89537+ gr_auth_attempts = 0;
89538+ }
89539+
89540+ error = copy_gr_arg_wrapper(buf, &uwrap);
89541+ if (error)
89542+ goto out;
89543+
89544+ error = copy_gr_arg(uwrap.arg, gr_usermode);
89545+ if (error)
89546+ goto out;
89547+
89548+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
89549+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
89550+ time_after(gr_auth_expires, get_seconds())) {
89551+ error = -EBUSY;
89552+ goto out;
89553+ }
89554+
89555+ /* if non-root trying to do anything other than use a special role,
89556+ do not attempt authentication, do not count towards authentication
89557+ locking
89558+ */
89559+
89560+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
89561+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
89562+ gr_is_global_nonroot(current_uid())) {
89563+ error = -EPERM;
89564+ goto out;
89565+ }
89566+
89567+ /* ensure pw and special role name are null terminated */
89568+
89569+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
89570+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
89571+
89572+ /* Okay.
89573+ * We have our enough of the argument structure..(we have yet
89574+ * to copy_from_user the tables themselves) . Copy the tables
89575+ * only if we need them, i.e. for loading operations. */
89576+
89577+ switch (gr_usermode->mode) {
89578+ case GR_STATUS:
89579+ if (gr_acl_is_enabled()) {
89580+ error = 1;
89581+ if (!gr_check_secure_terminal(current))
89582+ error = 3;
89583+ } else
89584+ error = 2;
89585+ goto out;
89586+ case GR_SHUTDOWN:
89587+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89588+ stop_machine(gr_rbac_disable, NULL, NULL);
89589+ free_variables(false);
89590+ memset(gr_usermode, 0, sizeof(struct gr_arg));
89591+ memset(gr_system_salt, 0, GR_SALT_LEN);
89592+ memset(gr_system_sum, 0, GR_SHA_LEN);
89593+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
89594+ } else if (gr_acl_is_enabled()) {
89595+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
89596+ error = -EPERM;
89597+ } else {
89598+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
89599+ error = -EAGAIN;
89600+ }
89601+ break;
89602+ case GR_ENABLE:
89603+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
89604+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
89605+ else {
89606+ if (gr_acl_is_enabled())
89607+ error = -EAGAIN;
89608+ else
89609+ error = error2;
89610+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
89611+ }
89612+ break;
89613+ case GR_OLDRELOAD:
89614+ oldmode = 1;
89615+ case GR_RELOAD:
89616+ if (!gr_acl_is_enabled()) {
89617+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
89618+ error = -EAGAIN;
89619+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89620+ error2 = gracl_reload(gr_usermode, oldmode);
89621+ if (!error2)
89622+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
89623+ else {
89624+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
89625+ error = error2;
89626+ }
89627+ } else {
89628+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
89629+ error = -EPERM;
89630+ }
89631+ break;
89632+ case GR_SEGVMOD:
89633+ if (unlikely(!gr_acl_is_enabled())) {
89634+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
89635+ error = -EAGAIN;
89636+ break;
89637+ }
89638+
89639+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
89640+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
89641+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
89642+ struct acl_subject_label *segvacl;
89643+ segvacl =
89644+ lookup_acl_subj_label(gr_usermode->segv_inode,
89645+ gr_usermode->segv_device,
89646+ current->role);
89647+ if (segvacl) {
89648+ segvacl->crashes = 0;
89649+ segvacl->expires = 0;
89650+ }
89651+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
89652+ gr_remove_uid(gr_usermode->segv_uid);
89653+ }
89654+ } else {
89655+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
89656+ error = -EPERM;
89657+ }
89658+ break;
89659+ case GR_SPROLE:
89660+ case GR_SPROLEPAM:
89661+ if (unlikely(!gr_acl_is_enabled())) {
89662+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
89663+ error = -EAGAIN;
89664+ break;
89665+ }
89666+
89667+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
89668+ current->role->expires = 0;
89669+ current->role->auth_attempts = 0;
89670+ }
89671+
89672+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
89673+ time_after(current->role->expires, get_seconds())) {
89674+ error = -EBUSY;
89675+ goto out;
89676+ }
89677+
89678+ if (lookup_special_role_auth
89679+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
89680+ && ((!sprole_salt && !sprole_sum)
89681+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
89682+ char *p = "";
89683+ assign_special_role(gr_usermode->sp_role);
89684+ read_lock(&tasklist_lock);
89685+ if (current->real_parent)
89686+ p = current->real_parent->role->rolename;
89687+ read_unlock(&tasklist_lock);
89688+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
89689+ p, acl_sp_role_value);
89690+ } else {
89691+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
89692+ error = -EPERM;
89693+ if(!(current->role->auth_attempts++))
89694+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
89695+
89696+ goto out;
89697+ }
89698+ break;
89699+ case GR_UNSPROLE:
89700+ if (unlikely(!gr_acl_is_enabled())) {
89701+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
89702+ error = -EAGAIN;
89703+ break;
89704+ }
89705+
89706+ if (current->role->roletype & GR_ROLE_SPECIAL) {
89707+ char *p = "";
89708+ int i = 0;
89709+
89710+ read_lock(&tasklist_lock);
89711+ if (current->real_parent) {
89712+ p = current->real_parent->role->rolename;
89713+ i = current->real_parent->acl_role_id;
89714+ }
89715+ read_unlock(&tasklist_lock);
89716+
89717+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
89718+ gr_set_acls(1);
89719+ } else {
89720+ error = -EPERM;
89721+ goto out;
89722+ }
89723+ break;
89724+ default:
89725+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
89726+ error = -EINVAL;
89727+ break;
89728+ }
89729+
89730+ if (error != -EPERM)
89731+ goto out;
89732+
89733+ if(!(gr_auth_attempts++))
89734+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
89735+
89736+ out:
89737+ mutex_unlock(&gr_dev_mutex);
89738+
89739+ if (!error)
89740+ error = req_count;
89741+
89742+ return error;
89743+}
89744+
89745+int
89746+gr_set_acls(const int type)
89747+{
89748+ struct task_struct *task, *task2;
89749+ struct acl_role_label *role = current->role;
89750+ struct acl_subject_label *subj;
89751+ __u16 acl_role_id = current->acl_role_id;
89752+ const struct cred *cred;
89753+ int ret;
89754+
89755+ rcu_read_lock();
89756+ read_lock(&tasklist_lock);
89757+ read_lock(&grsec_exec_file_lock);
89758+ do_each_thread(task2, task) {
89759+ /* check to see if we're called from the exit handler,
89760+ if so, only replace ACLs that have inherited the admin
89761+ ACL */
89762+
89763+ if (type && (task->role != role ||
89764+ task->acl_role_id != acl_role_id))
89765+ continue;
89766+
89767+ task->acl_role_id = 0;
89768+ task->acl_sp_role = 0;
89769+ task->inherited = 0;
89770+
89771+ if (task->exec_file) {
89772+ cred = __task_cred(task);
89773+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
89774+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
89775+ if (subj == NULL) {
89776+ ret = -EINVAL;
89777+ read_unlock(&grsec_exec_file_lock);
89778+ read_unlock(&tasklist_lock);
89779+ rcu_read_unlock();
89780+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
89781+ return ret;
89782+ }
89783+ __gr_apply_subject_to_task(polstate, task, subj);
89784+ } else {
89785+ // it's a kernel process
89786+ task->role = polstate->kernel_role;
89787+ task->acl = polstate->kernel_role->root_label;
89788+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
89789+ task->acl->mode &= ~GR_PROCFIND;
89790+#endif
89791+ }
89792+ } while_each_thread(task2, task);
89793+ read_unlock(&grsec_exec_file_lock);
89794+ read_unlock(&tasklist_lock);
89795+ rcu_read_unlock();
89796+
89797+ return 0;
89798+}
89799diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
89800new file mode 100644
89801index 0000000..39645c9
89802--- /dev/null
89803+++ b/grsecurity/gracl_res.c
89804@@ -0,0 +1,68 @@
89805+#include <linux/kernel.h>
89806+#include <linux/sched.h>
89807+#include <linux/gracl.h>
89808+#include <linux/grinternal.h>
89809+
89810+static const char *restab_log[] = {
89811+ [RLIMIT_CPU] = "RLIMIT_CPU",
89812+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
89813+ [RLIMIT_DATA] = "RLIMIT_DATA",
89814+ [RLIMIT_STACK] = "RLIMIT_STACK",
89815+ [RLIMIT_CORE] = "RLIMIT_CORE",
89816+ [RLIMIT_RSS] = "RLIMIT_RSS",
89817+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
89818+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
89819+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
89820+ [RLIMIT_AS] = "RLIMIT_AS",
89821+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
89822+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
89823+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
89824+ [RLIMIT_NICE] = "RLIMIT_NICE",
89825+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
89826+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
89827+ [GR_CRASH_RES] = "RLIMIT_CRASH"
89828+};
89829+
89830+void
89831+gr_log_resource(const struct task_struct *task,
89832+ const int res, const unsigned long wanted, const int gt)
89833+{
89834+ const struct cred *cred;
89835+ unsigned long rlim;
89836+
89837+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
89838+ return;
89839+
89840+ // not yet supported resource
89841+ if (unlikely(!restab_log[res]))
89842+ return;
89843+
89844+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
89845+ rlim = task_rlimit_max(task, res);
89846+ else
89847+ rlim = task_rlimit(task, res);
89848+
89849+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
89850+ return;
89851+
89852+ rcu_read_lock();
89853+ cred = __task_cred(task);
89854+
89855+ if (res == RLIMIT_NPROC &&
89856+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
89857+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
89858+ goto out_rcu_unlock;
89859+ else if (res == RLIMIT_MEMLOCK &&
89860+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
89861+ goto out_rcu_unlock;
89862+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
89863+ goto out_rcu_unlock;
89864+ rcu_read_unlock();
89865+
89866+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
89867+
89868+ return;
89869+out_rcu_unlock:
89870+ rcu_read_unlock();
89871+ return;
89872+}
89873diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
89874new file mode 100644
89875index 0000000..21646aa
89876--- /dev/null
89877+++ b/grsecurity/gracl_segv.c
89878@@ -0,0 +1,304 @@
89879+#include <linux/kernel.h>
89880+#include <linux/mm.h>
89881+#include <asm/uaccess.h>
89882+#include <asm/errno.h>
89883+#include <asm/mman.h>
89884+#include <net/sock.h>
89885+#include <linux/file.h>
89886+#include <linux/fs.h>
89887+#include <linux/net.h>
89888+#include <linux/in.h>
89889+#include <linux/slab.h>
89890+#include <linux/types.h>
89891+#include <linux/sched.h>
89892+#include <linux/timer.h>
89893+#include <linux/gracl.h>
89894+#include <linux/grsecurity.h>
89895+#include <linux/grinternal.h>
89896+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
89897+#include <linux/magic.h>
89898+#include <linux/pagemap.h>
89899+#include "../fs/btrfs/async-thread.h"
89900+#include "../fs/btrfs/ctree.h"
89901+#include "../fs/btrfs/btrfs_inode.h"
89902+#endif
89903+
89904+static struct crash_uid *uid_set;
89905+static unsigned short uid_used;
89906+static DEFINE_SPINLOCK(gr_uid_lock);
89907+extern rwlock_t gr_inode_lock;
89908+extern struct acl_subject_label *
89909+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
89910+ struct acl_role_label *role);
89911+
89912+int
89913+gr_init_uidset(void)
89914+{
89915+ uid_set =
89916+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
89917+ uid_used = 0;
89918+
89919+ return uid_set ? 1 : 0;
89920+}
89921+
89922+void
89923+gr_free_uidset(void)
89924+{
89925+ if (uid_set) {
89926+ struct crash_uid *tmpset;
89927+ spin_lock(&gr_uid_lock);
89928+ tmpset = uid_set;
89929+ uid_set = NULL;
89930+ uid_used = 0;
89931+ spin_unlock(&gr_uid_lock);
89932+ if (tmpset)
89933+ kfree(tmpset);
89934+ }
89935+
89936+ return;
89937+}
89938+
89939+int
89940+gr_find_uid(const uid_t uid)
89941+{
89942+ struct crash_uid *tmp = uid_set;
89943+ uid_t buid;
89944+ int low = 0, high = uid_used - 1, mid;
89945+
89946+ while (high >= low) {
89947+ mid = (low + high) >> 1;
89948+ buid = tmp[mid].uid;
89949+ if (buid == uid)
89950+ return mid;
89951+ if (buid > uid)
89952+ high = mid - 1;
89953+ if (buid < uid)
89954+ low = mid + 1;
89955+ }
89956+
89957+ return -1;
89958+}
89959+
89960+static void
89961+gr_insertsort(void)
89962+{
89963+ unsigned short i, j;
89964+ struct crash_uid index;
89965+
89966+ for (i = 1; i < uid_used; i++) {
89967+ index = uid_set[i];
89968+ j = i;
89969+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
89970+ uid_set[j] = uid_set[j - 1];
89971+ j--;
89972+ }
89973+ uid_set[j] = index;
89974+ }
89975+
89976+ return;
89977+}
89978+
89979+static void
89980+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
89981+{
89982+ int loc;
89983+ uid_t uid = GR_GLOBAL_UID(kuid);
89984+
89985+ if (uid_used == GR_UIDTABLE_MAX)
89986+ return;
89987+
89988+ loc = gr_find_uid(uid);
89989+
89990+ if (loc >= 0) {
89991+ uid_set[loc].expires = expires;
89992+ return;
89993+ }
89994+
89995+ uid_set[uid_used].uid = uid;
89996+ uid_set[uid_used].expires = expires;
89997+ uid_used++;
89998+
89999+ gr_insertsort();
90000+
90001+ return;
90002+}
90003+
90004+void
90005+gr_remove_uid(const unsigned short loc)
90006+{
90007+ unsigned short i;
90008+
90009+ for (i = loc + 1; i < uid_used; i++)
90010+ uid_set[i - 1] = uid_set[i];
90011+
90012+ uid_used--;
90013+
90014+ return;
90015+}
90016+
90017+int
90018+gr_check_crash_uid(const kuid_t kuid)
90019+{
90020+ int loc;
90021+ int ret = 0;
90022+ uid_t uid;
90023+
90024+ if (unlikely(!gr_acl_is_enabled()))
90025+ return 0;
90026+
90027+ uid = GR_GLOBAL_UID(kuid);
90028+
90029+ spin_lock(&gr_uid_lock);
90030+ loc = gr_find_uid(uid);
90031+
90032+ if (loc < 0)
90033+ goto out_unlock;
90034+
90035+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
90036+ gr_remove_uid(loc);
90037+ else
90038+ ret = 1;
90039+
90040+out_unlock:
90041+ spin_unlock(&gr_uid_lock);
90042+ return ret;
90043+}
90044+
90045+static int
90046+proc_is_setxid(const struct cred *cred)
90047+{
90048+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
90049+ !uid_eq(cred->uid, cred->fsuid))
90050+ return 1;
90051+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
90052+ !gid_eq(cred->gid, cred->fsgid))
90053+ return 1;
90054+
90055+ return 0;
90056+}
90057+
90058+extern int gr_fake_force_sig(int sig, struct task_struct *t);
90059+
90060+void
90061+gr_handle_crash(struct task_struct *task, const int sig)
90062+{
90063+ struct acl_subject_label *curr;
90064+ struct task_struct *tsk, *tsk2;
90065+ const struct cred *cred;
90066+ const struct cred *cred2;
90067+
90068+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
90069+ return;
90070+
90071+ if (unlikely(!gr_acl_is_enabled()))
90072+ return;
90073+
90074+ curr = task->acl;
90075+
90076+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
90077+ return;
90078+
90079+ if (time_before_eq(curr->expires, get_seconds())) {
90080+ curr->expires = 0;
90081+ curr->crashes = 0;
90082+ }
90083+
90084+ curr->crashes++;
90085+
90086+ if (!curr->expires)
90087+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
90088+
90089+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
90090+ time_after(curr->expires, get_seconds())) {
90091+ rcu_read_lock();
90092+ cred = __task_cred(task);
90093+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
90094+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
90095+ spin_lock(&gr_uid_lock);
90096+ gr_insert_uid(cred->uid, curr->expires);
90097+ spin_unlock(&gr_uid_lock);
90098+ curr->expires = 0;
90099+ curr->crashes = 0;
90100+ read_lock(&tasklist_lock);
90101+ do_each_thread(tsk2, tsk) {
90102+ cred2 = __task_cred(tsk);
90103+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
90104+ gr_fake_force_sig(SIGKILL, tsk);
90105+ } while_each_thread(tsk2, tsk);
90106+ read_unlock(&tasklist_lock);
90107+ } else {
90108+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
90109+ read_lock(&tasklist_lock);
90110+ read_lock(&grsec_exec_file_lock);
90111+ do_each_thread(tsk2, tsk) {
90112+ if (likely(tsk != task)) {
90113+ // if this thread has the same subject as the one that triggered
90114+ // RES_CRASH and it's the same binary, kill it
90115+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
90116+ gr_fake_force_sig(SIGKILL, tsk);
90117+ }
90118+ } while_each_thread(tsk2, tsk);
90119+ read_unlock(&grsec_exec_file_lock);
90120+ read_unlock(&tasklist_lock);
90121+ }
90122+ rcu_read_unlock();
90123+ }
90124+
90125+ return;
90126+}
90127+
90128+int
90129+gr_check_crash_exec(const struct file *filp)
90130+{
90131+ struct acl_subject_label *curr;
90132+ struct dentry *dentry;
90133+
90134+ if (unlikely(!gr_acl_is_enabled()))
90135+ return 0;
90136+
90137+ read_lock(&gr_inode_lock);
90138+ dentry = filp->f_path.dentry;
90139+ curr = lookup_acl_subj_label(gr_get_ino_from_dentry(dentry), gr_get_dev_from_dentry(dentry),
90140+ current->role);
90141+ read_unlock(&gr_inode_lock);
90142+
90143+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
90144+ (!curr->crashes && !curr->expires))
90145+ return 0;
90146+
90147+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
90148+ time_after(curr->expires, get_seconds()))
90149+ return 1;
90150+ else if (time_before_eq(curr->expires, get_seconds())) {
90151+ curr->crashes = 0;
90152+ curr->expires = 0;
90153+ }
90154+
90155+ return 0;
90156+}
90157+
90158+void
90159+gr_handle_alertkill(struct task_struct *task)
90160+{
90161+ struct acl_subject_label *curracl;
90162+ __u32 curr_ip;
90163+ struct task_struct *p, *p2;
90164+
90165+ if (unlikely(!gr_acl_is_enabled()))
90166+ return;
90167+
90168+ curracl = task->acl;
90169+ curr_ip = task->signal->curr_ip;
90170+
90171+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
90172+ read_lock(&tasklist_lock);
90173+ do_each_thread(p2, p) {
90174+ if (p->signal->curr_ip == curr_ip)
90175+ gr_fake_force_sig(SIGKILL, p);
90176+ } while_each_thread(p2, p);
90177+ read_unlock(&tasklist_lock);
90178+ } else if (curracl->mode & GR_KILLPROC)
90179+ gr_fake_force_sig(SIGKILL, task);
90180+
90181+ return;
90182+}
90183diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
90184new file mode 100644
90185index 0000000..6b0c9cc
90186--- /dev/null
90187+++ b/grsecurity/gracl_shm.c
90188@@ -0,0 +1,40 @@
90189+#include <linux/kernel.h>
90190+#include <linux/mm.h>
90191+#include <linux/sched.h>
90192+#include <linux/file.h>
90193+#include <linux/ipc.h>
90194+#include <linux/gracl.h>
90195+#include <linux/grsecurity.h>
90196+#include <linux/grinternal.h>
90197+
90198+int
90199+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90200+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
90201+{
90202+ struct task_struct *task;
90203+
90204+ if (!gr_acl_is_enabled())
90205+ return 1;
90206+
90207+ rcu_read_lock();
90208+ read_lock(&tasklist_lock);
90209+
90210+ task = find_task_by_vpid(shm_cprid);
90211+
90212+ if (unlikely(!task))
90213+ task = find_task_by_vpid(shm_lapid);
90214+
90215+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
90216+ (task_pid_nr(task) == shm_lapid)) &&
90217+ (task->acl->mode & GR_PROTSHM) &&
90218+ (task->acl != current->acl))) {
90219+ read_unlock(&tasklist_lock);
90220+ rcu_read_unlock();
90221+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
90222+ return 0;
90223+ }
90224+ read_unlock(&tasklist_lock);
90225+ rcu_read_unlock();
90226+
90227+ return 1;
90228+}
90229diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
90230new file mode 100644
90231index 0000000..bc0be01
90232--- /dev/null
90233+++ b/grsecurity/grsec_chdir.c
90234@@ -0,0 +1,19 @@
90235+#include <linux/kernel.h>
90236+#include <linux/sched.h>
90237+#include <linux/fs.h>
90238+#include <linux/file.h>
90239+#include <linux/grsecurity.h>
90240+#include <linux/grinternal.h>
90241+
90242+void
90243+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
90244+{
90245+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
90246+ if ((grsec_enable_chdir && grsec_enable_group &&
90247+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
90248+ !grsec_enable_group)) {
90249+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
90250+ }
90251+#endif
90252+ return;
90253+}
90254diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
90255new file mode 100644
90256index 0000000..652ab45
90257--- /dev/null
90258+++ b/grsecurity/grsec_chroot.c
90259@@ -0,0 +1,467 @@
90260+#include <linux/kernel.h>
90261+#include <linux/module.h>
90262+#include <linux/sched.h>
90263+#include <linux/file.h>
90264+#include <linux/fs.h>
90265+#include <linux/mount.h>
90266+#include <linux/types.h>
90267+#include "../fs/mount.h"
90268+#include <linux/grsecurity.h>
90269+#include <linux/grinternal.h>
90270+
90271+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90272+int gr_init_ran;
90273+#endif
90274+
90275+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
90276+{
90277+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90278+ struct dentry *tmpd = dentry;
90279+
90280+ read_seqlock_excl(&mount_lock);
90281+ write_seqlock(&rename_lock);
90282+
90283+ while (tmpd != mnt->mnt_root) {
90284+ atomic_inc(&tmpd->chroot_refcnt);
90285+ tmpd = tmpd->d_parent;
90286+ }
90287+ atomic_inc(&tmpd->chroot_refcnt);
90288+
90289+ write_sequnlock(&rename_lock);
90290+ read_sequnlock_excl(&mount_lock);
90291+#endif
90292+}
90293+
90294+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
90295+{
90296+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90297+ struct dentry *tmpd = dentry;
90298+
90299+ read_seqlock_excl(&mount_lock);
90300+ write_seqlock(&rename_lock);
90301+
90302+ while (tmpd != mnt->mnt_root) {
90303+ atomic_dec(&tmpd->chroot_refcnt);
90304+ tmpd = tmpd->d_parent;
90305+ }
90306+ atomic_dec(&tmpd->chroot_refcnt);
90307+
90308+ write_sequnlock(&rename_lock);
90309+ read_sequnlock_excl(&mount_lock);
90310+#endif
90311+}
90312+
90313+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90314+static struct dentry *get_closest_chroot(struct dentry *dentry)
90315+{
90316+ write_seqlock(&rename_lock);
90317+ do {
90318+ if (atomic_read(&dentry->chroot_refcnt)) {
90319+ write_sequnlock(&rename_lock);
90320+ return dentry;
90321+ }
90322+ dentry = dentry->d_parent;
90323+ } while (!IS_ROOT(dentry));
90324+ write_sequnlock(&rename_lock);
90325+ return NULL;
90326+}
90327+#endif
90328+
90329+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
90330+ struct dentry *newdentry, struct vfsmount *newmnt)
90331+{
90332+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
90333+ struct dentry *chroot;
90334+
90335+ if (unlikely(!grsec_enable_chroot_rename))
90336+ return 0;
90337+
90338+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
90339+ return 0;
90340+
90341+ chroot = get_closest_chroot(olddentry);
90342+
90343+ if (chroot == NULL)
90344+ return 0;
90345+
90346+ if (is_subdir(newdentry, chroot))
90347+ return 0;
90348+
90349+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
90350+
90351+ return 1;
90352+#else
90353+ return 0;
90354+#endif
90355+}
90356+
90357+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
90358+{
90359+#ifdef CONFIG_GRKERNSEC
90360+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
90361+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
90362+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90363+ && gr_init_ran
90364+#endif
90365+ )
90366+ task->gr_is_chrooted = 1;
90367+ else {
90368+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
90369+ if (task_pid_nr(task) == 1 && !gr_init_ran)
90370+ gr_init_ran = 1;
90371+#endif
90372+ task->gr_is_chrooted = 0;
90373+ }
90374+
90375+ task->gr_chroot_dentry = path->dentry;
90376+#endif
90377+ return;
90378+}
90379+
90380+void gr_clear_chroot_entries(struct task_struct *task)
90381+{
90382+#ifdef CONFIG_GRKERNSEC
90383+ task->gr_is_chrooted = 0;
90384+ task->gr_chroot_dentry = NULL;
90385+#endif
90386+ return;
90387+}
90388+
90389+int
90390+gr_handle_chroot_unix(const pid_t pid)
90391+{
90392+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
90393+ struct task_struct *p;
90394+
90395+ if (unlikely(!grsec_enable_chroot_unix))
90396+ return 1;
90397+
90398+ if (likely(!proc_is_chrooted(current)))
90399+ return 1;
90400+
90401+ rcu_read_lock();
90402+ read_lock(&tasklist_lock);
90403+ p = find_task_by_vpid_unrestricted(pid);
90404+ if (unlikely(p && !have_same_root(current, p))) {
90405+ read_unlock(&tasklist_lock);
90406+ rcu_read_unlock();
90407+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
90408+ return 0;
90409+ }
90410+ read_unlock(&tasklist_lock);
90411+ rcu_read_unlock();
90412+#endif
90413+ return 1;
90414+}
90415+
90416+int
90417+gr_handle_chroot_nice(void)
90418+{
90419+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
90420+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
90421+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
90422+ return -EPERM;
90423+ }
90424+#endif
90425+ return 0;
90426+}
90427+
90428+int
90429+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
90430+{
90431+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
90432+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
90433+ && proc_is_chrooted(current)) {
90434+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
90435+ return -EACCES;
90436+ }
90437+#endif
90438+ return 0;
90439+}
90440+
90441+int
90442+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
90443+{
90444+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90445+ struct task_struct *p;
90446+ int ret = 0;
90447+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
90448+ return ret;
90449+
90450+ read_lock(&tasklist_lock);
90451+ do_each_pid_task(pid, type, p) {
90452+ if (!have_same_root(current, p)) {
90453+ ret = 1;
90454+ goto out;
90455+ }
90456+ } while_each_pid_task(pid, type, p);
90457+out:
90458+ read_unlock(&tasklist_lock);
90459+ return ret;
90460+#endif
90461+ return 0;
90462+}
90463+
90464+int
90465+gr_pid_is_chrooted(struct task_struct *p)
90466+{
90467+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
90468+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
90469+ return 0;
90470+
90471+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
90472+ !have_same_root(current, p)) {
90473+ return 1;
90474+ }
90475+#endif
90476+ return 0;
90477+}
90478+
90479+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
90480+
90481+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
90482+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
90483+{
90484+ struct path path, currentroot;
90485+ int ret = 0;
90486+
90487+ path.dentry = (struct dentry *)u_dentry;
90488+ path.mnt = (struct vfsmount *)u_mnt;
90489+ get_fs_root(current->fs, &currentroot);
90490+ if (path_is_under(&path, &currentroot))
90491+ ret = 1;
90492+ path_put(&currentroot);
90493+
90494+ return ret;
90495+}
90496+#endif
90497+
90498+int
90499+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
90500+{
90501+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
90502+ if (!grsec_enable_chroot_fchdir)
90503+ return 1;
90504+
90505+ if (!proc_is_chrooted(current))
90506+ return 1;
90507+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
90508+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
90509+ return 0;
90510+ }
90511+#endif
90512+ return 1;
90513+}
90514+
90515+int
90516+gr_chroot_fhandle(void)
90517+{
90518+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
90519+ if (!grsec_enable_chroot_fchdir)
90520+ return 1;
90521+
90522+ if (!proc_is_chrooted(current))
90523+ return 1;
90524+ else {
90525+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
90526+ return 0;
90527+ }
90528+#endif
90529+ return 1;
90530+}
90531+
90532+int
90533+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
90534+ const u64 shm_createtime)
90535+{
90536+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
90537+ struct task_struct *p;
90538+
90539+ if (unlikely(!grsec_enable_chroot_shmat))
90540+ return 1;
90541+
90542+ if (likely(!proc_is_chrooted(current)))
90543+ return 1;
90544+
90545+ rcu_read_lock();
90546+ read_lock(&tasklist_lock);
90547+
90548+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
90549+ if (time_before_eq64(p->start_time, shm_createtime)) {
90550+ if (have_same_root(current, p)) {
90551+ goto allow;
90552+ } else {
90553+ read_unlock(&tasklist_lock);
90554+ rcu_read_unlock();
90555+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
90556+ return 0;
90557+ }
90558+ }
90559+ /* creator exited, pid reuse, fall through to next check */
90560+ }
90561+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
90562+ if (unlikely(!have_same_root(current, p))) {
90563+ read_unlock(&tasklist_lock);
90564+ rcu_read_unlock();
90565+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
90566+ return 0;
90567+ }
90568+ }
90569+
90570+allow:
90571+ read_unlock(&tasklist_lock);
90572+ rcu_read_unlock();
90573+#endif
90574+ return 1;
90575+}
90576+
90577+void
90578+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
90579+{
90580+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
90581+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
90582+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
90583+#endif
90584+ return;
90585+}
90586+
90587+int
90588+gr_handle_chroot_mknod(const struct dentry *dentry,
90589+ const struct vfsmount *mnt, const int mode)
90590+{
90591+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
90592+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
90593+ proc_is_chrooted(current)) {
90594+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
90595+ return -EPERM;
90596+ }
90597+#endif
90598+ return 0;
90599+}
90600+
90601+int
90602+gr_handle_chroot_mount(const struct dentry *dentry,
90603+ const struct vfsmount *mnt, const char *dev_name)
90604+{
90605+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
90606+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
90607+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
90608+ return -EPERM;
90609+ }
90610+#endif
90611+ return 0;
90612+}
90613+
90614+int
90615+gr_handle_chroot_pivot(void)
90616+{
90617+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
90618+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
90619+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
90620+ return -EPERM;
90621+ }
90622+#endif
90623+ return 0;
90624+}
90625+
90626+int
90627+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
90628+{
90629+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
90630+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
90631+ !gr_is_outside_chroot(dentry, mnt)) {
90632+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
90633+ return -EPERM;
90634+ }
90635+#endif
90636+ return 0;
90637+}
90638+
90639+extern const char *captab_log[];
90640+extern int captab_log_entries;
90641+
90642+int
90643+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
90644+{
90645+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90646+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
90647+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
90648+ if (cap_raised(chroot_caps, cap)) {
90649+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
90650+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
90651+ }
90652+ return 0;
90653+ }
90654+ }
90655+#endif
90656+ return 1;
90657+}
90658+
90659+int
90660+gr_chroot_is_capable(const int cap)
90661+{
90662+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90663+ return gr_task_chroot_is_capable(current, current_cred(), cap);
90664+#endif
90665+ return 1;
90666+}
90667+
90668+int
90669+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
90670+{
90671+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90672+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
90673+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
90674+ if (cap_raised(chroot_caps, cap)) {
90675+ return 0;
90676+ }
90677+ }
90678+#endif
90679+ return 1;
90680+}
90681+
90682+int
90683+gr_chroot_is_capable_nolog(const int cap)
90684+{
90685+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
90686+ return gr_task_chroot_is_capable_nolog(current, cap);
90687+#endif
90688+ return 1;
90689+}
90690+
90691+int
90692+gr_handle_chroot_sysctl(const int op)
90693+{
90694+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
90695+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
90696+ proc_is_chrooted(current))
90697+ return -EACCES;
90698+#endif
90699+ return 0;
90700+}
90701+
90702+void
90703+gr_handle_chroot_chdir(const struct path *path)
90704+{
90705+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
90706+ if (grsec_enable_chroot_chdir)
90707+ set_fs_pwd(current->fs, path);
90708+#endif
90709+ return;
90710+}
90711+
90712+int
90713+gr_handle_chroot_chmod(const struct dentry *dentry,
90714+ const struct vfsmount *mnt, const int mode)
90715+{
90716+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
90717+ /* allow chmod +s on directories, but not files */
90718+ if (grsec_enable_chroot_chmod && !d_is_dir(dentry) &&
90719+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
90720+ proc_is_chrooted(current)) {
90721+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
90722+ return -EPERM;
90723+ }
90724+#endif
90725+ return 0;
90726+}
90727diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
90728new file mode 100644
90729index 0000000..e723c08
90730--- /dev/null
90731+++ b/grsecurity/grsec_disabled.c
90732@@ -0,0 +1,445 @@
90733+#include <linux/kernel.h>
90734+#include <linux/module.h>
90735+#include <linux/sched.h>
90736+#include <linux/file.h>
90737+#include <linux/fs.h>
90738+#include <linux/kdev_t.h>
90739+#include <linux/net.h>
90740+#include <linux/in.h>
90741+#include <linux/ip.h>
90742+#include <linux/skbuff.h>
90743+#include <linux/sysctl.h>
90744+
90745+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
90746+void
90747+pax_set_initial_flags(struct linux_binprm *bprm)
90748+{
90749+ return;
90750+}
90751+#endif
90752+
90753+#ifdef CONFIG_SYSCTL
90754+__u32
90755+gr_handle_sysctl(const struct ctl_table * table, const int op)
90756+{
90757+ return 0;
90758+}
90759+#endif
90760+
90761+#ifdef CONFIG_TASKSTATS
90762+int gr_is_taskstats_denied(int pid)
90763+{
90764+ return 0;
90765+}
90766+#endif
90767+
90768+int
90769+gr_acl_is_enabled(void)
90770+{
90771+ return 0;
90772+}
90773+
90774+int
90775+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
90776+{
90777+ return 0;
90778+}
90779+
90780+void
90781+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
90782+{
90783+ return;
90784+}
90785+
90786+int
90787+gr_handle_rawio(const struct inode *inode)
90788+{
90789+ return 0;
90790+}
90791+
90792+void
90793+gr_acl_handle_psacct(struct task_struct *task, const long code)
90794+{
90795+ return;
90796+}
90797+
90798+int
90799+gr_handle_ptrace(struct task_struct *task, const long request)
90800+{
90801+ return 0;
90802+}
90803+
90804+int
90805+gr_handle_proc_ptrace(struct task_struct *task)
90806+{
90807+ return 0;
90808+}
90809+
90810+int
90811+gr_set_acls(const int type)
90812+{
90813+ return 0;
90814+}
90815+
90816+int
90817+gr_check_hidden_task(const struct task_struct *tsk)
90818+{
90819+ return 0;
90820+}
90821+
90822+int
90823+gr_check_protected_task(const struct task_struct *task)
90824+{
90825+ return 0;
90826+}
90827+
90828+int
90829+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
90830+{
90831+ return 0;
90832+}
90833+
90834+void
90835+gr_copy_label(struct task_struct *tsk)
90836+{
90837+ return;
90838+}
90839+
90840+void
90841+gr_set_pax_flags(struct task_struct *task)
90842+{
90843+ return;
90844+}
90845+
90846+int
90847+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
90848+ const int unsafe_share)
90849+{
90850+ return 0;
90851+}
90852+
90853+void
90854+gr_handle_delete(const u64 ino, const dev_t dev)
90855+{
90856+ return;
90857+}
90858+
90859+void
90860+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
90861+{
90862+ return;
90863+}
90864+
90865+void
90866+gr_handle_crash(struct task_struct *task, const int sig)
90867+{
90868+ return;
90869+}
90870+
90871+int
90872+gr_check_crash_exec(const struct file *filp)
90873+{
90874+ return 0;
90875+}
90876+
90877+int
90878+gr_check_crash_uid(const kuid_t uid)
90879+{
90880+ return 0;
90881+}
90882+
90883+void
90884+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
90885+ struct dentry *old_dentry,
90886+ struct dentry *new_dentry,
90887+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
90888+{
90889+ return;
90890+}
90891+
90892+int
90893+gr_search_socket(const int family, const int type, const int protocol)
90894+{
90895+ return 1;
90896+}
90897+
90898+int
90899+gr_search_connectbind(const int mode, const struct socket *sock,
90900+ const struct sockaddr_in *addr)
90901+{
90902+ return 0;
90903+}
90904+
90905+void
90906+gr_handle_alertkill(struct task_struct *task)
90907+{
90908+ return;
90909+}
90910+
90911+__u32
90912+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
90913+{
90914+ return 1;
90915+}
90916+
90917+__u32
90918+gr_acl_handle_hidden_file(const struct dentry * dentry,
90919+ const struct vfsmount * mnt)
90920+{
90921+ return 1;
90922+}
90923+
90924+__u32
90925+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
90926+ int acc_mode)
90927+{
90928+ return 1;
90929+}
90930+
90931+__u32
90932+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
90933+{
90934+ return 1;
90935+}
90936+
90937+__u32
90938+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
90939+{
90940+ return 1;
90941+}
90942+
90943+int
90944+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
90945+ unsigned int *vm_flags)
90946+{
90947+ return 1;
90948+}
90949+
90950+__u32
90951+gr_acl_handle_truncate(const struct dentry * dentry,
90952+ const struct vfsmount * mnt)
90953+{
90954+ return 1;
90955+}
90956+
90957+__u32
90958+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
90959+{
90960+ return 1;
90961+}
90962+
90963+__u32
90964+gr_acl_handle_access(const struct dentry * dentry,
90965+ const struct vfsmount * mnt, const int fmode)
90966+{
90967+ return 1;
90968+}
90969+
90970+__u32
90971+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
90972+ umode_t *mode)
90973+{
90974+ return 1;
90975+}
90976+
90977+__u32
90978+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
90979+{
90980+ return 1;
90981+}
90982+
90983+__u32
90984+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
90985+{
90986+ return 1;
90987+}
90988+
90989+__u32
90990+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
90991+{
90992+ return 1;
90993+}
90994+
90995+void
90996+grsecurity_init(void)
90997+{
90998+ return;
90999+}
91000+
91001+umode_t gr_acl_umask(void)
91002+{
91003+ return 0;
91004+}
91005+
91006+__u32
91007+gr_acl_handle_mknod(const struct dentry * new_dentry,
91008+ const struct dentry * parent_dentry,
91009+ const struct vfsmount * parent_mnt,
91010+ const int mode)
91011+{
91012+ return 1;
91013+}
91014+
91015+__u32
91016+gr_acl_handle_mkdir(const struct dentry * new_dentry,
91017+ const struct dentry * parent_dentry,
91018+ const struct vfsmount * parent_mnt)
91019+{
91020+ return 1;
91021+}
91022+
91023+__u32
91024+gr_acl_handle_symlink(const struct dentry * new_dentry,
91025+ const struct dentry * parent_dentry,
91026+ const struct vfsmount * parent_mnt, const struct filename *from)
91027+{
91028+ return 1;
91029+}
91030+
91031+__u32
91032+gr_acl_handle_link(const struct dentry * new_dentry,
91033+ const struct dentry * parent_dentry,
91034+ const struct vfsmount * parent_mnt,
91035+ const struct dentry * old_dentry,
91036+ const struct vfsmount * old_mnt, const struct filename *to)
91037+{
91038+ return 1;
91039+}
91040+
91041+int
91042+gr_acl_handle_rename(const struct dentry *new_dentry,
91043+ const struct dentry *parent_dentry,
91044+ const struct vfsmount *parent_mnt,
91045+ const struct dentry *old_dentry,
91046+ const struct inode *old_parent_inode,
91047+ const struct vfsmount *old_mnt, const struct filename *newname,
91048+ unsigned int flags)
91049+{
91050+ return 0;
91051+}
91052+
91053+int
91054+gr_acl_handle_filldir(const struct file *file, const char *name,
91055+ const int namelen, const u64 ino)
91056+{
91057+ return 1;
91058+}
91059+
91060+int
91061+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
91062+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
91063+{
91064+ return 1;
91065+}
91066+
91067+int
91068+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
91069+{
91070+ return 0;
91071+}
91072+
91073+int
91074+gr_search_accept(const struct socket *sock)
91075+{
91076+ return 0;
91077+}
91078+
91079+int
91080+gr_search_listen(const struct socket *sock)
91081+{
91082+ return 0;
91083+}
91084+
91085+int
91086+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
91087+{
91088+ return 0;
91089+}
91090+
91091+__u32
91092+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
91093+{
91094+ return 1;
91095+}
91096+
91097+__u32
91098+gr_acl_handle_creat(const struct dentry * dentry,
91099+ const struct dentry * p_dentry,
91100+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
91101+ const int imode)
91102+{
91103+ return 1;
91104+}
91105+
91106+void
91107+gr_acl_handle_exit(void)
91108+{
91109+ return;
91110+}
91111+
91112+int
91113+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
91114+{
91115+ return 1;
91116+}
91117+
91118+void
91119+gr_set_role_label(const kuid_t uid, const kgid_t gid)
91120+{
91121+ return;
91122+}
91123+
91124+int
91125+gr_acl_handle_procpidmem(const struct task_struct *task)
91126+{
91127+ return 0;
91128+}
91129+
91130+int
91131+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
91132+{
91133+ return 0;
91134+}
91135+
91136+int
91137+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
91138+{
91139+ return 0;
91140+}
91141+
91142+int
91143+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
91144+{
91145+ return 0;
91146+}
91147+
91148+int
91149+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
91150+{
91151+ return 0;
91152+}
91153+
91154+int gr_acl_enable_at_secure(void)
91155+{
91156+ return 0;
91157+}
91158+
91159+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
91160+{
91161+ return d_backing_inode(dentry)->i_sb->s_dev;
91162+}
91163+
91164+u64 gr_get_ino_from_dentry(struct dentry *dentry)
91165+{
91166+ return d_backing_inode(dentry)->i_ino;
91167+}
91168+
91169+void gr_put_exec_file(struct task_struct *task)
91170+{
91171+ return;
91172+}
91173+
91174+#ifdef CONFIG_SECURITY
91175+EXPORT_SYMBOL_GPL(gr_check_user_change);
91176+EXPORT_SYMBOL_GPL(gr_check_group_change);
91177+#endif
91178diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
91179new file mode 100644
91180index 0000000..fb7531e
91181--- /dev/null
91182+++ b/grsecurity/grsec_exec.c
91183@@ -0,0 +1,189 @@
91184+#include <linux/kernel.h>
91185+#include <linux/sched.h>
91186+#include <linux/file.h>
91187+#include <linux/binfmts.h>
91188+#include <linux/fs.h>
91189+#include <linux/types.h>
91190+#include <linux/grdefs.h>
91191+#include <linux/grsecurity.h>
91192+#include <linux/grinternal.h>
91193+#include <linux/capability.h>
91194+#include <linux/module.h>
91195+#include <linux/compat.h>
91196+
91197+#include <asm/uaccess.h>
91198+
91199+#ifdef CONFIG_GRKERNSEC_EXECLOG
91200+static char gr_exec_arg_buf[132];
91201+static DEFINE_MUTEX(gr_exec_arg_mutex);
91202+#endif
91203+
91204+struct user_arg_ptr {
91205+#ifdef CONFIG_COMPAT
91206+ bool is_compat;
91207+#endif
91208+ union {
91209+ const char __user *const __user *native;
91210+#ifdef CONFIG_COMPAT
91211+ const compat_uptr_t __user *compat;
91212+#endif
91213+ } ptr;
91214+};
91215+
91216+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
91217+
91218+void
91219+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
91220+{
91221+#ifdef CONFIG_GRKERNSEC_EXECLOG
91222+ char *grarg = gr_exec_arg_buf;
91223+ unsigned int i, x, execlen = 0;
91224+ char c;
91225+
91226+ if (!((grsec_enable_execlog && grsec_enable_group &&
91227+ in_group_p(grsec_audit_gid))
91228+ || (grsec_enable_execlog && !grsec_enable_group)))
91229+ return;
91230+
91231+ mutex_lock(&gr_exec_arg_mutex);
91232+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
91233+
91234+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
91235+ const char __user *p;
91236+ unsigned int len;
91237+
91238+ p = get_user_arg_ptr(argv, i);
91239+ if (IS_ERR(p))
91240+ goto log;
91241+
91242+ len = strnlen_user(p, 128 - execlen);
91243+ if (len > 128 - execlen)
91244+ len = 128 - execlen;
91245+ else if (len > 0)
91246+ len--;
91247+ if (copy_from_user(grarg + execlen, p, len))
91248+ goto log;
91249+
91250+ /* rewrite unprintable characters */
91251+ for (x = 0; x < len; x++) {
91252+ c = *(grarg + execlen + x);
91253+ if (c < 32 || c > 126)
91254+ *(grarg + execlen + x) = ' ';
91255+ }
91256+
91257+ execlen += len;
91258+ *(grarg + execlen) = ' ';
91259+ *(grarg + execlen + 1) = '\0';
91260+ execlen++;
91261+ }
91262+
91263+ log:
91264+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
91265+ bprm->file->f_path.mnt, grarg);
91266+ mutex_unlock(&gr_exec_arg_mutex);
91267+#endif
91268+ return;
91269+}
91270+
91271+#ifdef CONFIG_GRKERNSEC
91272+extern int gr_acl_is_capable(const int cap);
91273+extern int gr_acl_is_capable_nolog(const int cap);
91274+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
91275+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
91276+extern int gr_chroot_is_capable(const int cap);
91277+extern int gr_chroot_is_capable_nolog(const int cap);
91278+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
91279+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
91280+#endif
91281+
91282+const char *captab_log[] = {
91283+ "CAP_CHOWN",
91284+ "CAP_DAC_OVERRIDE",
91285+ "CAP_DAC_READ_SEARCH",
91286+ "CAP_FOWNER",
91287+ "CAP_FSETID",
91288+ "CAP_KILL",
91289+ "CAP_SETGID",
91290+ "CAP_SETUID",
91291+ "CAP_SETPCAP",
91292+ "CAP_LINUX_IMMUTABLE",
91293+ "CAP_NET_BIND_SERVICE",
91294+ "CAP_NET_BROADCAST",
91295+ "CAP_NET_ADMIN",
91296+ "CAP_NET_RAW",
91297+ "CAP_IPC_LOCK",
91298+ "CAP_IPC_OWNER",
91299+ "CAP_SYS_MODULE",
91300+ "CAP_SYS_RAWIO",
91301+ "CAP_SYS_CHROOT",
91302+ "CAP_SYS_PTRACE",
91303+ "CAP_SYS_PACCT",
91304+ "CAP_SYS_ADMIN",
91305+ "CAP_SYS_BOOT",
91306+ "CAP_SYS_NICE",
91307+ "CAP_SYS_RESOURCE",
91308+ "CAP_SYS_TIME",
91309+ "CAP_SYS_TTY_CONFIG",
91310+ "CAP_MKNOD",
91311+ "CAP_LEASE",
91312+ "CAP_AUDIT_WRITE",
91313+ "CAP_AUDIT_CONTROL",
91314+ "CAP_SETFCAP",
91315+ "CAP_MAC_OVERRIDE",
91316+ "CAP_MAC_ADMIN",
91317+ "CAP_SYSLOG",
91318+ "CAP_WAKE_ALARM",
91319+ "CAP_BLOCK_SUSPEND",
91320+ "CAP_AUDIT_READ"
91321+};
91322+
91323+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
91324+
91325+int gr_is_capable(const int cap)
91326+{
91327+#ifdef CONFIG_GRKERNSEC
91328+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
91329+ return 1;
91330+ return 0;
91331+#else
91332+ return 1;
91333+#endif
91334+}
91335+
91336+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
91337+{
91338+#ifdef CONFIG_GRKERNSEC
91339+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
91340+ return 1;
91341+ return 0;
91342+#else
91343+ return 1;
91344+#endif
91345+}
91346+
91347+int gr_is_capable_nolog(const int cap)
91348+{
91349+#ifdef CONFIG_GRKERNSEC
91350+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
91351+ return 1;
91352+ return 0;
91353+#else
91354+ return 1;
91355+#endif
91356+}
91357+
91358+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
91359+{
91360+#ifdef CONFIG_GRKERNSEC
91361+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
91362+ return 1;
91363+ return 0;
91364+#else
91365+ return 1;
91366+#endif
91367+}
91368+
91369+EXPORT_SYMBOL_GPL(gr_is_capable);
91370+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
91371+EXPORT_SYMBOL_GPL(gr_task_is_capable);
91372+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
91373diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
91374new file mode 100644
91375index 0000000..cdec49b
91376--- /dev/null
91377+++ b/grsecurity/grsec_fifo.c
91378@@ -0,0 +1,26 @@
91379+#include <linux/kernel.h>
91380+#include <linux/sched.h>
91381+#include <linux/fs.h>
91382+#include <linux/file.h>
91383+#include <linux/grinternal.h>
91384+
91385+int
91386+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
91387+ const struct dentry *dir, const int flag, const int acc_mode)
91388+{
91389+#ifdef CONFIG_GRKERNSEC_FIFO
91390+ const struct cred *cred = current_cred();
91391+ struct inode *inode = d_backing_inode(dentry);
91392+ struct inode *dir_inode = d_backing_inode(dir);
91393+
91394+ if (grsec_enable_fifo && S_ISFIFO(inode->i_mode) &&
91395+ !(flag & O_EXCL) && (dir_inode->i_mode & S_ISVTX) &&
91396+ !uid_eq(inode->i_uid, dir_inode->i_uid) &&
91397+ !uid_eq(cred->fsuid, inode->i_uid)) {
91398+ if (!inode_permission(inode, acc_mode))
91399+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, GR_GLOBAL_UID(inode->i_uid), GR_GLOBAL_GID(inode->i_gid));
91400+ return -EACCES;
91401+ }
91402+#endif
91403+ return 0;
91404+}
91405diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
91406new file mode 100644
91407index 0000000..8ca18bf
91408--- /dev/null
91409+++ b/grsecurity/grsec_fork.c
91410@@ -0,0 +1,23 @@
91411+#include <linux/kernel.h>
91412+#include <linux/sched.h>
91413+#include <linux/grsecurity.h>
91414+#include <linux/grinternal.h>
91415+#include <linux/errno.h>
91416+
91417+void
91418+gr_log_forkfail(const int retval)
91419+{
91420+#ifdef CONFIG_GRKERNSEC_FORKFAIL
91421+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
91422+ switch (retval) {
91423+ case -EAGAIN:
91424+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
91425+ break;
91426+ case -ENOMEM:
91427+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
91428+ break;
91429+ }
91430+ }
91431+#endif
91432+ return;
91433+}
91434diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
91435new file mode 100644
91436index 0000000..a364c58
91437--- /dev/null
91438+++ b/grsecurity/grsec_init.c
91439@@ -0,0 +1,290 @@
91440+#include <linux/kernel.h>
91441+#include <linux/sched.h>
91442+#include <linux/mm.h>
91443+#include <linux/gracl.h>
91444+#include <linux/slab.h>
91445+#include <linux/vmalloc.h>
91446+#include <linux/percpu.h>
91447+#include <linux/module.h>
91448+
91449+int grsec_enable_ptrace_readexec __read_only;
91450+int grsec_enable_setxid __read_only;
91451+int grsec_enable_symlinkown __read_only;
91452+kgid_t grsec_symlinkown_gid __read_only;
91453+int grsec_enable_brute __read_only;
91454+int grsec_enable_link __read_only;
91455+int grsec_enable_dmesg __read_only;
91456+int grsec_enable_harden_ptrace __read_only;
91457+int grsec_enable_harden_ipc __read_only;
91458+int grsec_enable_fifo __read_only;
91459+int grsec_enable_execlog __read_only;
91460+int grsec_enable_signal __read_only;
91461+int grsec_enable_forkfail __read_only;
91462+int grsec_enable_audit_ptrace __read_only;
91463+int grsec_enable_time __read_only;
91464+int grsec_enable_group __read_only;
91465+kgid_t grsec_audit_gid __read_only;
91466+int grsec_enable_chdir __read_only;
91467+int grsec_enable_mount __read_only;
91468+int grsec_enable_rofs __read_only;
91469+int grsec_deny_new_usb __read_only;
91470+int grsec_enable_chroot_findtask __read_only;
91471+int grsec_enable_chroot_mount __read_only;
91472+int grsec_enable_chroot_shmat __read_only;
91473+int grsec_enable_chroot_fchdir __read_only;
91474+int grsec_enable_chroot_double __read_only;
91475+int grsec_enable_chroot_pivot __read_only;
91476+int grsec_enable_chroot_chdir __read_only;
91477+int grsec_enable_chroot_chmod __read_only;
91478+int grsec_enable_chroot_mknod __read_only;
91479+int grsec_enable_chroot_nice __read_only;
91480+int grsec_enable_chroot_execlog __read_only;
91481+int grsec_enable_chroot_caps __read_only;
91482+int grsec_enable_chroot_rename __read_only;
91483+int grsec_enable_chroot_sysctl __read_only;
91484+int grsec_enable_chroot_unix __read_only;
91485+int grsec_enable_tpe __read_only;
91486+kgid_t grsec_tpe_gid __read_only;
91487+int grsec_enable_blackhole __read_only;
91488+#ifdef CONFIG_IPV6_MODULE
91489+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
91490+#endif
91491+int grsec_lastack_retries __read_only;
91492+int grsec_enable_tpe_all __read_only;
91493+int grsec_enable_tpe_invert __read_only;
91494+int grsec_enable_socket_all __read_only;
91495+kgid_t grsec_socket_all_gid __read_only;
91496+int grsec_enable_socket_client __read_only;
91497+kgid_t grsec_socket_client_gid __read_only;
91498+int grsec_enable_socket_server __read_only;
91499+kgid_t grsec_socket_server_gid __read_only;
91500+int grsec_resource_logging __read_only;
91501+int grsec_disable_privio __read_only;
91502+int grsec_enable_log_rwxmaps __read_only;
91503+int grsec_lock __read_only;
91504+
91505+DEFINE_SPINLOCK(grsec_alert_lock);
91506+unsigned long grsec_alert_wtime = 0;
91507+unsigned long grsec_alert_fyet = 0;
91508+
91509+DEFINE_SPINLOCK(grsec_audit_lock);
91510+
91511+DEFINE_RWLOCK(grsec_exec_file_lock);
91512+
91513+char *gr_shared_page[4];
91514+
91515+char *gr_alert_log_fmt;
91516+char *gr_audit_log_fmt;
91517+char *gr_alert_log_buf;
91518+char *gr_audit_log_buf;
91519+
91520+extern struct gr_arg *gr_usermode;
91521+extern unsigned char *gr_system_salt;
91522+extern unsigned char *gr_system_sum;
91523+
91524+void __init
91525+grsecurity_init(void)
91526+{
91527+ int j;
91528+ /* create the per-cpu shared pages */
91529+
91530+#ifdef CONFIG_X86
91531+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
91532+#endif
91533+
91534+ for (j = 0; j < 4; j++) {
91535+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
91536+ if (gr_shared_page[j] == NULL) {
91537+ panic("Unable to allocate grsecurity shared page");
91538+ return;
91539+ }
91540+ }
91541+
91542+ /* allocate log buffers */
91543+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
91544+ if (!gr_alert_log_fmt) {
91545+ panic("Unable to allocate grsecurity alert log format buffer");
91546+ return;
91547+ }
91548+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
91549+ if (!gr_audit_log_fmt) {
91550+ panic("Unable to allocate grsecurity audit log format buffer");
91551+ return;
91552+ }
91553+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
91554+ if (!gr_alert_log_buf) {
91555+ panic("Unable to allocate grsecurity alert log buffer");
91556+ return;
91557+ }
91558+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
91559+ if (!gr_audit_log_buf) {
91560+ panic("Unable to allocate grsecurity audit log buffer");
91561+ return;
91562+ }
91563+
91564+ /* allocate memory for authentication structure */
91565+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
91566+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
91567+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
91568+
91569+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
91570+ panic("Unable to allocate grsecurity authentication structure");
91571+ return;
91572+ }
91573+
91574+#ifdef CONFIG_GRKERNSEC_IO
91575+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
91576+ grsec_disable_privio = 1;
91577+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
91578+ grsec_disable_privio = 1;
91579+#else
91580+ grsec_disable_privio = 0;
91581+#endif
91582+#endif
91583+
91584+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
91585+ /* for backward compatibility, tpe_invert always defaults to on if
91586+ enabled in the kernel
91587+ */
91588+ grsec_enable_tpe_invert = 1;
91589+#endif
91590+
91591+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
91592+#ifndef CONFIG_GRKERNSEC_SYSCTL
91593+ grsec_lock = 1;
91594+#endif
91595+
91596+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
91597+ grsec_enable_log_rwxmaps = 1;
91598+#endif
91599+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
91600+ grsec_enable_group = 1;
91601+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
91602+#endif
91603+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
91604+ grsec_enable_ptrace_readexec = 1;
91605+#endif
91606+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
91607+ grsec_enable_chdir = 1;
91608+#endif
91609+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
91610+ grsec_enable_harden_ptrace = 1;
91611+#endif
91612+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
91613+ grsec_enable_harden_ipc = 1;
91614+#endif
91615+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
91616+ grsec_enable_mount = 1;
91617+#endif
91618+#ifdef CONFIG_GRKERNSEC_LINK
91619+ grsec_enable_link = 1;
91620+#endif
91621+#ifdef CONFIG_GRKERNSEC_BRUTE
91622+ grsec_enable_brute = 1;
91623+#endif
91624+#ifdef CONFIG_GRKERNSEC_DMESG
91625+ grsec_enable_dmesg = 1;
91626+#endif
91627+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
91628+ grsec_enable_blackhole = 1;
91629+ grsec_lastack_retries = 4;
91630+#endif
91631+#ifdef CONFIG_GRKERNSEC_FIFO
91632+ grsec_enable_fifo = 1;
91633+#endif
91634+#ifdef CONFIG_GRKERNSEC_EXECLOG
91635+ grsec_enable_execlog = 1;
91636+#endif
91637+#ifdef CONFIG_GRKERNSEC_SETXID
91638+ grsec_enable_setxid = 1;
91639+#endif
91640+#ifdef CONFIG_GRKERNSEC_SIGNAL
91641+ grsec_enable_signal = 1;
91642+#endif
91643+#ifdef CONFIG_GRKERNSEC_FORKFAIL
91644+ grsec_enable_forkfail = 1;
91645+#endif
91646+#ifdef CONFIG_GRKERNSEC_TIME
91647+ grsec_enable_time = 1;
91648+#endif
91649+#ifdef CONFIG_GRKERNSEC_RESLOG
91650+ grsec_resource_logging = 1;
91651+#endif
91652+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
91653+ grsec_enable_chroot_findtask = 1;
91654+#endif
91655+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
91656+ grsec_enable_chroot_unix = 1;
91657+#endif
91658+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
91659+ grsec_enable_chroot_mount = 1;
91660+#endif
91661+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
91662+ grsec_enable_chroot_fchdir = 1;
91663+#endif
91664+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
91665+ grsec_enable_chroot_shmat = 1;
91666+#endif
91667+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
91668+ grsec_enable_audit_ptrace = 1;
91669+#endif
91670+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
91671+ grsec_enable_chroot_double = 1;
91672+#endif
91673+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
91674+ grsec_enable_chroot_pivot = 1;
91675+#endif
91676+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
91677+ grsec_enable_chroot_chdir = 1;
91678+#endif
91679+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
91680+ grsec_enable_chroot_chmod = 1;
91681+#endif
91682+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
91683+ grsec_enable_chroot_mknod = 1;
91684+#endif
91685+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
91686+ grsec_enable_chroot_nice = 1;
91687+#endif
91688+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
91689+ grsec_enable_chroot_execlog = 1;
91690+#endif
91691+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
91692+ grsec_enable_chroot_caps = 1;
91693+#endif
91694+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
91695+ grsec_enable_chroot_rename = 1;
91696+#endif
91697+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
91698+ grsec_enable_chroot_sysctl = 1;
91699+#endif
91700+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
91701+ grsec_enable_symlinkown = 1;
91702+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
91703+#endif
91704+#ifdef CONFIG_GRKERNSEC_TPE
91705+ grsec_enable_tpe = 1;
91706+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
91707+#ifdef CONFIG_GRKERNSEC_TPE_ALL
91708+ grsec_enable_tpe_all = 1;
91709+#endif
91710+#endif
91711+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
91712+ grsec_enable_socket_all = 1;
91713+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
91714+#endif
91715+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
91716+ grsec_enable_socket_client = 1;
91717+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
91718+#endif
91719+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
91720+ grsec_enable_socket_server = 1;
91721+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
91722+#endif
91723+#endif
91724+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
91725+ grsec_deny_new_usb = 1;
91726+#endif
91727+
91728+ return;
91729+}
91730diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
91731new file mode 100644
91732index 0000000..1773300
91733--- /dev/null
91734+++ b/grsecurity/grsec_ipc.c
91735@@ -0,0 +1,48 @@
91736+#include <linux/kernel.h>
91737+#include <linux/mm.h>
91738+#include <linux/sched.h>
91739+#include <linux/file.h>
91740+#include <linux/ipc.h>
91741+#include <linux/ipc_namespace.h>
91742+#include <linux/grsecurity.h>
91743+#include <linux/grinternal.h>
91744+
91745+int
91746+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
91747+{
91748+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
91749+ int write;
91750+ int orig_granted_mode;
91751+ kuid_t euid;
91752+ kgid_t egid;
91753+
91754+ if (!grsec_enable_harden_ipc)
91755+ return 1;
91756+
91757+ euid = current_euid();
91758+ egid = current_egid();
91759+
91760+ write = requested_mode & 00002;
91761+ orig_granted_mode = ipcp->mode;
91762+
91763+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
91764+ orig_granted_mode >>= 6;
91765+ else {
91766+ /* if likely wrong permissions, lock to user */
91767+ if (orig_granted_mode & 0007)
91768+ orig_granted_mode = 0;
91769+ /* otherwise do a egid-only check */
91770+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
91771+ orig_granted_mode >>= 3;
91772+ /* otherwise, no access */
91773+ else
91774+ orig_granted_mode = 0;
91775+ }
91776+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
91777+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
91778+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
91779+ return 0;
91780+ }
91781+#endif
91782+ return 1;
91783+}
91784diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
91785new file mode 100644
91786index 0000000..8ef2b75
91787--- /dev/null
91788+++ b/grsecurity/grsec_link.c
91789@@ -0,0 +1,59 @@
91790+#include <linux/kernel.h>
91791+#include <linux/sched.h>
91792+#include <linux/fs.h>
91793+#include <linux/file.h>
91794+#include <linux/grinternal.h>
91795+
91796+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
91797+{
91798+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
91799+ const struct inode *link_inode = d_backing_inode(link->dentry);
91800+
91801+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
91802+ /* ignore root-owned links, e.g. /proc/self */
91803+ gr_is_global_nonroot(link_inode->i_uid) && target &&
91804+ !uid_eq(link_inode->i_uid, target->i_uid)) {
91805+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
91806+ return 1;
91807+ }
91808+#endif
91809+ return 0;
91810+}
91811+
91812+int
91813+gr_handle_follow_link(const struct dentry *dentry, const struct vfsmount *mnt)
91814+{
91815+#ifdef CONFIG_GRKERNSEC_LINK
91816+ struct inode *inode = d_backing_inode(dentry);
91817+ struct inode *parent = d_backing_inode(dentry->d_parent);
91818+ const struct cred *cred = current_cred();
91819+
91820+ if (grsec_enable_link && d_is_symlink(dentry) &&
91821+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
91822+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
91823+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
91824+ return -EACCES;
91825+ }
91826+#endif
91827+ return 0;
91828+}
91829+
91830+int
91831+gr_handle_hardlink(const struct dentry *dentry,
91832+ const struct vfsmount *mnt,
91833+ const struct filename *to)
91834+{
91835+#ifdef CONFIG_GRKERNSEC_LINK
91836+ struct inode *inode = d_backing_inode(dentry);
91837+ const struct cred *cred = current_cred();
91838+
91839+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
91840+ (!d_is_reg(dentry) || is_privileged_binary(dentry) ||
91841+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
91842+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
91843+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
91844+ return -EPERM;
91845+ }
91846+#endif
91847+ return 0;
91848+}
91849diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
91850new file mode 100644
91851index 0000000..dbe0a6b
91852--- /dev/null
91853+++ b/grsecurity/grsec_log.c
91854@@ -0,0 +1,341 @@
91855+#include <linux/kernel.h>
91856+#include <linux/sched.h>
91857+#include <linux/file.h>
91858+#include <linux/tty.h>
91859+#include <linux/fs.h>
91860+#include <linux/mm.h>
91861+#include <linux/grinternal.h>
91862+
91863+#ifdef CONFIG_TREE_PREEMPT_RCU
91864+#define DISABLE_PREEMPT() preempt_disable()
91865+#define ENABLE_PREEMPT() preempt_enable()
91866+#else
91867+#define DISABLE_PREEMPT()
91868+#define ENABLE_PREEMPT()
91869+#endif
91870+
91871+#define BEGIN_LOCKS(x) \
91872+ DISABLE_PREEMPT(); \
91873+ rcu_read_lock(); \
91874+ read_lock(&tasklist_lock); \
91875+ read_lock(&grsec_exec_file_lock); \
91876+ if (x != GR_DO_AUDIT) \
91877+ spin_lock(&grsec_alert_lock); \
91878+ else \
91879+ spin_lock(&grsec_audit_lock)
91880+
91881+#define END_LOCKS(x) \
91882+ if (x != GR_DO_AUDIT) \
91883+ spin_unlock(&grsec_alert_lock); \
91884+ else \
91885+ spin_unlock(&grsec_audit_lock); \
91886+ read_unlock(&grsec_exec_file_lock); \
91887+ read_unlock(&tasklist_lock); \
91888+ rcu_read_unlock(); \
91889+ ENABLE_PREEMPT(); \
91890+ if (x == GR_DONT_AUDIT) \
91891+ gr_handle_alertkill(current)
91892+
91893+enum {
91894+ FLOODING,
91895+ NO_FLOODING
91896+};
91897+
91898+extern char *gr_alert_log_fmt;
91899+extern char *gr_audit_log_fmt;
91900+extern char *gr_alert_log_buf;
91901+extern char *gr_audit_log_buf;
91902+
91903+static int gr_log_start(int audit)
91904+{
91905+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
91906+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
91907+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91908+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
91909+ unsigned long curr_secs = get_seconds();
91910+
91911+ if (audit == GR_DO_AUDIT)
91912+ goto set_fmt;
91913+
91914+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
91915+ grsec_alert_wtime = curr_secs;
91916+ grsec_alert_fyet = 0;
91917+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
91918+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
91919+ grsec_alert_fyet++;
91920+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
91921+ grsec_alert_wtime = curr_secs;
91922+ grsec_alert_fyet++;
91923+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
91924+ return FLOODING;
91925+ }
91926+ else return FLOODING;
91927+
91928+set_fmt:
91929+#endif
91930+ memset(buf, 0, PAGE_SIZE);
91931+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
91932+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
91933+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
91934+ } else if (current->signal->curr_ip) {
91935+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
91936+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
91937+ } else if (gr_acl_is_enabled()) {
91938+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
91939+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
91940+ } else {
91941+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
91942+ strcpy(buf, fmt);
91943+ }
91944+
91945+ return NO_FLOODING;
91946+}
91947+
91948+static void gr_log_middle(int audit, const char *msg, va_list ap)
91949+ __attribute__ ((format (printf, 2, 0)));
91950+
91951+static void gr_log_middle(int audit, const char *msg, va_list ap)
91952+{
91953+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91954+ unsigned int len = strlen(buf);
91955+
91956+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
91957+
91958+ return;
91959+}
91960+
91961+static void gr_log_middle_varargs(int audit, const char *msg, ...)
91962+ __attribute__ ((format (printf, 2, 3)));
91963+
91964+static void gr_log_middle_varargs(int audit, const char *msg, ...)
91965+{
91966+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91967+ unsigned int len = strlen(buf);
91968+ va_list ap;
91969+
91970+ va_start(ap, msg);
91971+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
91972+ va_end(ap);
91973+
91974+ return;
91975+}
91976+
91977+static void gr_log_end(int audit, int append_default)
91978+{
91979+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
91980+ if (append_default) {
91981+ struct task_struct *task = current;
91982+ struct task_struct *parent = task->real_parent;
91983+ const struct cred *cred = __task_cred(task);
91984+ const struct cred *pcred = __task_cred(parent);
91985+ unsigned int len = strlen(buf);
91986+
91987+ 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));
91988+ }
91989+
91990+ printk("%s\n", buf);
91991+
91992+ return;
91993+}
91994+
91995+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
91996+{
91997+ int logtype;
91998+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
91999+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
92000+ void *voidptr = NULL;
92001+ int num1 = 0, num2 = 0;
92002+ unsigned long ulong1 = 0, ulong2 = 0;
92003+ struct dentry *dentry = NULL;
92004+ struct vfsmount *mnt = NULL;
92005+ struct file *file = NULL;
92006+ struct task_struct *task = NULL;
92007+ struct vm_area_struct *vma = NULL;
92008+ const struct cred *cred, *pcred;
92009+ va_list ap;
92010+
92011+ BEGIN_LOCKS(audit);
92012+ logtype = gr_log_start(audit);
92013+ if (logtype == FLOODING) {
92014+ END_LOCKS(audit);
92015+ return;
92016+ }
92017+ va_start(ap, argtypes);
92018+ switch (argtypes) {
92019+ case GR_TTYSNIFF:
92020+ task = va_arg(ap, struct task_struct *);
92021+ 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));
92022+ break;
92023+ case GR_SYSCTL_HIDDEN:
92024+ str1 = va_arg(ap, char *);
92025+ gr_log_middle_varargs(audit, msg, result, str1);
92026+ break;
92027+ case GR_RBAC:
92028+ dentry = va_arg(ap, struct dentry *);
92029+ mnt = va_arg(ap, struct vfsmount *);
92030+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
92031+ break;
92032+ case GR_RBAC_STR:
92033+ dentry = va_arg(ap, struct dentry *);
92034+ mnt = va_arg(ap, struct vfsmount *);
92035+ str1 = va_arg(ap, char *);
92036+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
92037+ break;
92038+ case GR_STR_RBAC:
92039+ str1 = va_arg(ap, char *);
92040+ dentry = va_arg(ap, struct dentry *);
92041+ mnt = va_arg(ap, struct vfsmount *);
92042+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
92043+ break;
92044+ case GR_RBAC_MODE2:
92045+ dentry = va_arg(ap, struct dentry *);
92046+ mnt = va_arg(ap, struct vfsmount *);
92047+ str1 = va_arg(ap, char *);
92048+ str2 = va_arg(ap, char *);
92049+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
92050+ break;
92051+ case GR_RBAC_MODE3:
92052+ dentry = va_arg(ap, struct dentry *);
92053+ mnt = va_arg(ap, struct vfsmount *);
92054+ str1 = va_arg(ap, char *);
92055+ str2 = va_arg(ap, char *);
92056+ str3 = va_arg(ap, char *);
92057+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
92058+ break;
92059+ case GR_FILENAME:
92060+ dentry = va_arg(ap, struct dentry *);
92061+ mnt = va_arg(ap, struct vfsmount *);
92062+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
92063+ break;
92064+ case GR_STR_FILENAME:
92065+ str1 = va_arg(ap, char *);
92066+ dentry = va_arg(ap, struct dentry *);
92067+ mnt = va_arg(ap, struct vfsmount *);
92068+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
92069+ break;
92070+ case GR_FILENAME_STR:
92071+ dentry = va_arg(ap, struct dentry *);
92072+ mnt = va_arg(ap, struct vfsmount *);
92073+ str1 = va_arg(ap, char *);
92074+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
92075+ break;
92076+ case GR_FILENAME_TWO_INT:
92077+ dentry = va_arg(ap, struct dentry *);
92078+ mnt = va_arg(ap, struct vfsmount *);
92079+ num1 = va_arg(ap, int);
92080+ num2 = va_arg(ap, int);
92081+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
92082+ break;
92083+ case GR_FILENAME_TWO_INT_STR:
92084+ dentry = va_arg(ap, struct dentry *);
92085+ mnt = va_arg(ap, struct vfsmount *);
92086+ num1 = va_arg(ap, int);
92087+ num2 = va_arg(ap, int);
92088+ str1 = va_arg(ap, char *);
92089+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
92090+ break;
92091+ case GR_TEXTREL:
92092+ file = va_arg(ap, struct file *);
92093+ ulong1 = va_arg(ap, unsigned long);
92094+ ulong2 = va_arg(ap, unsigned long);
92095+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
92096+ break;
92097+ case GR_PTRACE:
92098+ task = va_arg(ap, struct task_struct *);
92099+ 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));
92100+ break;
92101+ case GR_RESOURCE:
92102+ task = va_arg(ap, struct task_struct *);
92103+ cred = __task_cred(task);
92104+ pcred = __task_cred(task->real_parent);
92105+ ulong1 = va_arg(ap, unsigned long);
92106+ str1 = va_arg(ap, char *);
92107+ ulong2 = va_arg(ap, unsigned long);
92108+ 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));
92109+ break;
92110+ case GR_CAP:
92111+ task = va_arg(ap, struct task_struct *);
92112+ cred = __task_cred(task);
92113+ pcred = __task_cred(task->real_parent);
92114+ str1 = va_arg(ap, char *);
92115+ 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));
92116+ break;
92117+ case GR_SIG:
92118+ str1 = va_arg(ap, char *);
92119+ voidptr = va_arg(ap, void *);
92120+ gr_log_middle_varargs(audit, msg, str1, voidptr);
92121+ break;
92122+ case GR_SIG2:
92123+ task = va_arg(ap, struct task_struct *);
92124+ cred = __task_cred(task);
92125+ pcred = __task_cred(task->real_parent);
92126+ num1 = va_arg(ap, int);
92127+ 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));
92128+ break;
92129+ case GR_CRASH1:
92130+ task = va_arg(ap, struct task_struct *);
92131+ cred = __task_cred(task);
92132+ pcred = __task_cred(task->real_parent);
92133+ ulong1 = va_arg(ap, unsigned long);
92134+ 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);
92135+ break;
92136+ case GR_CRASH2:
92137+ task = va_arg(ap, struct task_struct *);
92138+ cred = __task_cred(task);
92139+ pcred = __task_cred(task->real_parent);
92140+ ulong1 = va_arg(ap, unsigned long);
92141+ 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);
92142+ break;
92143+ case GR_RWXMAP:
92144+ file = va_arg(ap, struct file *);
92145+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
92146+ break;
92147+ case GR_RWXMAPVMA:
92148+ vma = va_arg(ap, struct vm_area_struct *);
92149+ if (vma->vm_file)
92150+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
92151+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
92152+ str1 = "<stack>";
92153+ else if (vma->vm_start <= current->mm->brk &&
92154+ vma->vm_end >= current->mm->start_brk)
92155+ str1 = "<heap>";
92156+ else
92157+ str1 = "<anonymous mapping>";
92158+ gr_log_middle_varargs(audit, msg, str1);
92159+ break;
92160+ case GR_PSACCT:
92161+ {
92162+ unsigned int wday, cday;
92163+ __u8 whr, chr;
92164+ __u8 wmin, cmin;
92165+ __u8 wsec, csec;
92166+ char cur_tty[64] = { 0 };
92167+ char parent_tty[64] = { 0 };
92168+
92169+ task = va_arg(ap, struct task_struct *);
92170+ wday = va_arg(ap, unsigned int);
92171+ cday = va_arg(ap, unsigned int);
92172+ whr = va_arg(ap, int);
92173+ chr = va_arg(ap, int);
92174+ wmin = va_arg(ap, int);
92175+ cmin = va_arg(ap, int);
92176+ wsec = va_arg(ap, int);
92177+ csec = va_arg(ap, int);
92178+ ulong1 = va_arg(ap, unsigned long);
92179+ cred = __task_cred(task);
92180+ pcred = __task_cred(task->real_parent);
92181+
92182+ 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));
92183+ }
92184+ break;
92185+ default:
92186+ gr_log_middle(audit, msg, ap);
92187+ }
92188+ va_end(ap);
92189+ // these don't need DEFAULTSECARGS printed on the end
92190+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
92191+ gr_log_end(audit, 0);
92192+ else
92193+ gr_log_end(audit, 1);
92194+ END_LOCKS(audit);
92195+}
92196diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
92197new file mode 100644
92198index 0000000..0e39d8c7
92199--- /dev/null
92200+++ b/grsecurity/grsec_mem.c
92201@@ -0,0 +1,48 @@
92202+#include <linux/kernel.h>
92203+#include <linux/sched.h>
92204+#include <linux/mm.h>
92205+#include <linux/mman.h>
92206+#include <linux/module.h>
92207+#include <linux/grinternal.h>
92208+
92209+void gr_handle_msr_write(void)
92210+{
92211+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
92212+ return;
92213+}
92214+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
92215+
92216+void
92217+gr_handle_ioperm(void)
92218+{
92219+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
92220+ return;
92221+}
92222+
92223+void
92224+gr_handle_iopl(void)
92225+{
92226+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
92227+ return;
92228+}
92229+
92230+void
92231+gr_handle_mem_readwrite(u64 from, u64 to)
92232+{
92233+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
92234+ return;
92235+}
92236+
92237+void
92238+gr_handle_vm86(void)
92239+{
92240+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
92241+ return;
92242+}
92243+
92244+void
92245+gr_log_badprocpid(const char *entry)
92246+{
92247+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
92248+ return;
92249+}
92250diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
92251new file mode 100644
92252index 0000000..fe02bf4
92253--- /dev/null
92254+++ b/grsecurity/grsec_mount.c
92255@@ -0,0 +1,65 @@
92256+#include <linux/kernel.h>
92257+#include <linux/sched.h>
92258+#include <linux/mount.h>
92259+#include <linux/major.h>
92260+#include <linux/grsecurity.h>
92261+#include <linux/grinternal.h>
92262+
92263+void
92264+gr_log_remount(const char *devname, const int retval)
92265+{
92266+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92267+ if (grsec_enable_mount && (retval >= 0))
92268+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
92269+#endif
92270+ return;
92271+}
92272+
92273+void
92274+gr_log_unmount(const char *devname, const int retval)
92275+{
92276+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92277+ if (grsec_enable_mount && (retval >= 0))
92278+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
92279+#endif
92280+ return;
92281+}
92282+
92283+void
92284+gr_log_mount(const char *from, struct path *to, const int retval)
92285+{
92286+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
92287+ if (grsec_enable_mount && (retval >= 0))
92288+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
92289+#endif
92290+ return;
92291+}
92292+
92293+int
92294+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
92295+{
92296+#ifdef CONFIG_GRKERNSEC_ROFS
92297+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
92298+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
92299+ return -EPERM;
92300+ } else
92301+ return 0;
92302+#endif
92303+ return 0;
92304+}
92305+
92306+int
92307+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
92308+{
92309+#ifdef CONFIG_GRKERNSEC_ROFS
92310+ struct inode *inode = d_backing_inode(dentry);
92311+
92312+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
92313+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
92314+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
92315+ return -EPERM;
92316+ } else
92317+ return 0;
92318+#endif
92319+ return 0;
92320+}
92321diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
92322new file mode 100644
92323index 0000000..6ee9d50
92324--- /dev/null
92325+++ b/grsecurity/grsec_pax.c
92326@@ -0,0 +1,45 @@
92327+#include <linux/kernel.h>
92328+#include <linux/sched.h>
92329+#include <linux/mm.h>
92330+#include <linux/file.h>
92331+#include <linux/grinternal.h>
92332+#include <linux/grsecurity.h>
92333+
92334+void
92335+gr_log_textrel(struct vm_area_struct * vma)
92336+{
92337+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92338+ if (grsec_enable_log_rwxmaps)
92339+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
92340+#endif
92341+ return;
92342+}
92343+
92344+void gr_log_ptgnustack(struct file *file)
92345+{
92346+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92347+ if (grsec_enable_log_rwxmaps)
92348+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
92349+#endif
92350+ return;
92351+}
92352+
92353+void
92354+gr_log_rwxmmap(struct file *file)
92355+{
92356+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92357+ if (grsec_enable_log_rwxmaps)
92358+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
92359+#endif
92360+ return;
92361+}
92362+
92363+void
92364+gr_log_rwxmprotect(struct vm_area_struct *vma)
92365+{
92366+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
92367+ if (grsec_enable_log_rwxmaps)
92368+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
92369+#endif
92370+ return;
92371+}
92372diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
92373new file mode 100644
92374index 0000000..2005a3a
92375--- /dev/null
92376+++ b/grsecurity/grsec_proc.c
92377@@ -0,0 +1,20 @@
92378+#include <linux/kernel.h>
92379+#include <linux/sched.h>
92380+#include <linux/grsecurity.h>
92381+#include <linux/grinternal.h>
92382+
92383+int gr_proc_is_restricted(void)
92384+{
92385+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92386+ const struct cred *cred = current_cred();
92387+#endif
92388+
92389+#ifdef CONFIG_GRKERNSEC_PROC_USER
92390+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
92391+ return -EACCES;
92392+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92393+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
92394+ return -EACCES;
92395+#endif
92396+ return 0;
92397+}
92398diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
92399new file mode 100644
92400index 0000000..304c518
92401--- /dev/null
92402+++ b/grsecurity/grsec_ptrace.c
92403@@ -0,0 +1,30 @@
92404+#include <linux/kernel.h>
92405+#include <linux/sched.h>
92406+#include <linux/grinternal.h>
92407+#include <linux/security.h>
92408+
92409+void
92410+gr_audit_ptrace(struct task_struct *task)
92411+{
92412+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
92413+ if (grsec_enable_audit_ptrace)
92414+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
92415+#endif
92416+ return;
92417+}
92418+
92419+int
92420+gr_ptrace_readexec(struct file *file, int unsafe_flags)
92421+{
92422+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
92423+ const struct dentry *dentry = file->f_path.dentry;
92424+ const struct vfsmount *mnt = file->f_path.mnt;
92425+
92426+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
92427+ (inode_permission(d_backing_inode(dentry), MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
92428+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
92429+ return -EACCES;
92430+ }
92431+#endif
92432+ return 0;
92433+}
92434diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
92435new file mode 100644
92436index 0000000..3860c7e
92437--- /dev/null
92438+++ b/grsecurity/grsec_sig.c
92439@@ -0,0 +1,236 @@
92440+#include <linux/kernel.h>
92441+#include <linux/sched.h>
92442+#include <linux/fs.h>
92443+#include <linux/delay.h>
92444+#include <linux/grsecurity.h>
92445+#include <linux/grinternal.h>
92446+#include <linux/hardirq.h>
92447+
92448+char *signames[] = {
92449+ [SIGSEGV] = "Segmentation fault",
92450+ [SIGILL] = "Illegal instruction",
92451+ [SIGABRT] = "Abort",
92452+ [SIGBUS] = "Invalid alignment/Bus error"
92453+};
92454+
92455+void
92456+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
92457+{
92458+#ifdef CONFIG_GRKERNSEC_SIGNAL
92459+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
92460+ (sig == SIGABRT) || (sig == SIGBUS))) {
92461+ if (task_pid_nr(t) == task_pid_nr(current)) {
92462+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
92463+ } else {
92464+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
92465+ }
92466+ }
92467+#endif
92468+ return;
92469+}
92470+
92471+int
92472+gr_handle_signal(const struct task_struct *p, const int sig)
92473+{
92474+#ifdef CONFIG_GRKERNSEC
92475+ /* ignore the 0 signal for protected task checks */
92476+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
92477+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
92478+ return -EPERM;
92479+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
92480+ return -EPERM;
92481+ }
92482+#endif
92483+ return 0;
92484+}
92485+
92486+#ifdef CONFIG_GRKERNSEC
92487+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
92488+
92489+int gr_fake_force_sig(int sig, struct task_struct *t)
92490+{
92491+ unsigned long int flags;
92492+ int ret, blocked, ignored;
92493+ struct k_sigaction *action;
92494+
92495+ spin_lock_irqsave(&t->sighand->siglock, flags);
92496+ action = &t->sighand->action[sig-1];
92497+ ignored = action->sa.sa_handler == SIG_IGN;
92498+ blocked = sigismember(&t->blocked, sig);
92499+ if (blocked || ignored) {
92500+ action->sa.sa_handler = SIG_DFL;
92501+ if (blocked) {
92502+ sigdelset(&t->blocked, sig);
92503+ recalc_sigpending_and_wake(t);
92504+ }
92505+ }
92506+ if (action->sa.sa_handler == SIG_DFL)
92507+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
92508+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
92509+
92510+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
92511+
92512+ return ret;
92513+}
92514+#endif
92515+
92516+#define GR_USER_BAN_TIME (15 * 60)
92517+#define GR_DAEMON_BRUTE_TIME (30 * 60)
92518+
92519+void gr_handle_brute_attach(int dumpable)
92520+{
92521+#ifdef CONFIG_GRKERNSEC_BRUTE
92522+ struct task_struct *p = current;
92523+ kuid_t uid = GLOBAL_ROOT_UID;
92524+ int daemon = 0;
92525+
92526+ if (!grsec_enable_brute)
92527+ return;
92528+
92529+ rcu_read_lock();
92530+ read_lock(&tasklist_lock);
92531+ read_lock(&grsec_exec_file_lock);
92532+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
92533+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
92534+ p->real_parent->brute = 1;
92535+ daemon = 1;
92536+ } else {
92537+ const struct cred *cred = __task_cred(p), *cred2;
92538+ struct task_struct *tsk, *tsk2;
92539+
92540+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
92541+ struct user_struct *user;
92542+
92543+ uid = cred->uid;
92544+
92545+ /* this is put upon execution past expiration */
92546+ user = find_user(uid);
92547+ if (user == NULL)
92548+ goto unlock;
92549+ user->suid_banned = 1;
92550+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
92551+ if (user->suid_ban_expires == ~0UL)
92552+ user->suid_ban_expires--;
92553+
92554+ /* only kill other threads of the same binary, from the same user */
92555+ do_each_thread(tsk2, tsk) {
92556+ cred2 = __task_cred(tsk);
92557+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
92558+ gr_fake_force_sig(SIGKILL, tsk);
92559+ } while_each_thread(tsk2, tsk);
92560+ }
92561+ }
92562+unlock:
92563+ read_unlock(&grsec_exec_file_lock);
92564+ read_unlock(&tasklist_lock);
92565+ rcu_read_unlock();
92566+
92567+ if (gr_is_global_nonroot(uid))
92568+ 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);
92569+ else if (daemon)
92570+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
92571+
92572+#endif
92573+ return;
92574+}
92575+
92576+void gr_handle_brute_check(void)
92577+{
92578+#ifdef CONFIG_GRKERNSEC_BRUTE
92579+ struct task_struct *p = current;
92580+
92581+ if (unlikely(p->brute)) {
92582+ if (!grsec_enable_brute)
92583+ p->brute = 0;
92584+ else if (time_before(get_seconds(), p->brute_expires))
92585+ msleep(30 * 1000);
92586+ }
92587+#endif
92588+ return;
92589+}
92590+
92591+void gr_handle_kernel_exploit(void)
92592+{
92593+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92594+ const struct cred *cred;
92595+ struct task_struct *tsk, *tsk2;
92596+ struct user_struct *user;
92597+ kuid_t uid;
92598+
92599+ if (in_irq() || in_serving_softirq() || in_nmi())
92600+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
92601+
92602+ uid = current_uid();
92603+
92604+ if (gr_is_global_root(uid))
92605+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
92606+ else {
92607+ /* kill all the processes of this user, hold a reference
92608+ to their creds struct, and prevent them from creating
92609+ another process until system reset
92610+ */
92611+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
92612+ GR_GLOBAL_UID(uid));
92613+ /* we intentionally leak this ref */
92614+ user = get_uid(current->cred->user);
92615+ if (user)
92616+ user->kernel_banned = 1;
92617+
92618+ /* kill all processes of this user */
92619+ read_lock(&tasklist_lock);
92620+ do_each_thread(tsk2, tsk) {
92621+ cred = __task_cred(tsk);
92622+ if (uid_eq(cred->uid, uid))
92623+ gr_fake_force_sig(SIGKILL, tsk);
92624+ } while_each_thread(tsk2, tsk);
92625+ read_unlock(&tasklist_lock);
92626+ }
92627+#endif
92628+}
92629+
92630+#ifdef CONFIG_GRKERNSEC_BRUTE
92631+static bool suid_ban_expired(struct user_struct *user)
92632+{
92633+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
92634+ user->suid_banned = 0;
92635+ user->suid_ban_expires = 0;
92636+ free_uid(user);
92637+ return true;
92638+ }
92639+
92640+ return false;
92641+}
92642+#endif
92643+
92644+int gr_process_kernel_exec_ban(void)
92645+{
92646+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92647+ if (unlikely(current->cred->user->kernel_banned))
92648+ return -EPERM;
92649+#endif
92650+ return 0;
92651+}
92652+
92653+int gr_process_kernel_setuid_ban(struct user_struct *user)
92654+{
92655+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
92656+ if (unlikely(user->kernel_banned))
92657+ gr_fake_force_sig(SIGKILL, current);
92658+#endif
92659+ return 0;
92660+}
92661+
92662+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
92663+{
92664+#ifdef CONFIG_GRKERNSEC_BRUTE
92665+ struct user_struct *user = current->cred->user;
92666+ if (unlikely(user->suid_banned)) {
92667+ if (suid_ban_expired(user))
92668+ return 0;
92669+ /* disallow execution of suid binaries only */
92670+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
92671+ return -EPERM;
92672+ }
92673+#endif
92674+ return 0;
92675+}
92676diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
92677new file mode 100644
92678index 0000000..a523bd2
92679--- /dev/null
92680+++ b/grsecurity/grsec_sock.c
92681@@ -0,0 +1,244 @@
92682+#include <linux/kernel.h>
92683+#include <linux/module.h>
92684+#include <linux/sched.h>
92685+#include <linux/file.h>
92686+#include <linux/net.h>
92687+#include <linux/in.h>
92688+#include <linux/ip.h>
92689+#include <net/sock.h>
92690+#include <net/inet_sock.h>
92691+#include <linux/grsecurity.h>
92692+#include <linux/grinternal.h>
92693+#include <linux/gracl.h>
92694+
92695+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
92696+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
92697+
92698+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
92699+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
92700+
92701+#ifdef CONFIG_UNIX_MODULE
92702+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
92703+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
92704+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
92705+EXPORT_SYMBOL_GPL(gr_handle_create);
92706+#endif
92707+
92708+#ifdef CONFIG_GRKERNSEC
92709+#define gr_conn_table_size 32749
92710+struct conn_table_entry {
92711+ struct conn_table_entry *next;
92712+ struct signal_struct *sig;
92713+};
92714+
92715+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
92716+DEFINE_SPINLOCK(gr_conn_table_lock);
92717+
92718+extern const char * gr_socktype_to_name(unsigned char type);
92719+extern const char * gr_proto_to_name(unsigned char proto);
92720+extern const char * gr_sockfamily_to_name(unsigned char family);
92721+
92722+static int
92723+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
92724+{
92725+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
92726+}
92727+
92728+static int
92729+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
92730+ __u16 sport, __u16 dport)
92731+{
92732+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
92733+ sig->gr_sport == sport && sig->gr_dport == dport))
92734+ return 1;
92735+ else
92736+ return 0;
92737+}
92738+
92739+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
92740+{
92741+ struct conn_table_entry **match;
92742+ unsigned int index;
92743+
92744+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
92745+ sig->gr_sport, sig->gr_dport,
92746+ gr_conn_table_size);
92747+
92748+ newent->sig = sig;
92749+
92750+ match = &gr_conn_table[index];
92751+ newent->next = *match;
92752+ *match = newent;
92753+
92754+ return;
92755+}
92756+
92757+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
92758+{
92759+ struct conn_table_entry *match, *last = NULL;
92760+ unsigned int index;
92761+
92762+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
92763+ sig->gr_sport, sig->gr_dport,
92764+ gr_conn_table_size);
92765+
92766+ match = gr_conn_table[index];
92767+ while (match && !conn_match(match->sig,
92768+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
92769+ sig->gr_dport)) {
92770+ last = match;
92771+ match = match->next;
92772+ }
92773+
92774+ if (match) {
92775+ if (last)
92776+ last->next = match->next;
92777+ else
92778+ gr_conn_table[index] = NULL;
92779+ kfree(match);
92780+ }
92781+
92782+ return;
92783+}
92784+
92785+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
92786+ __u16 sport, __u16 dport)
92787+{
92788+ struct conn_table_entry *match;
92789+ unsigned int index;
92790+
92791+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
92792+
92793+ match = gr_conn_table[index];
92794+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
92795+ match = match->next;
92796+
92797+ if (match)
92798+ return match->sig;
92799+ else
92800+ return NULL;
92801+}
92802+
92803+#endif
92804+
92805+void gr_update_task_in_ip_table(const struct inet_sock *inet)
92806+{
92807+#ifdef CONFIG_GRKERNSEC
92808+ struct signal_struct *sig = current->signal;
92809+ struct conn_table_entry *newent;
92810+
92811+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
92812+ if (newent == NULL)
92813+ return;
92814+ /* no bh lock needed since we are called with bh disabled */
92815+ spin_lock(&gr_conn_table_lock);
92816+ gr_del_task_from_ip_table_nolock(sig);
92817+ sig->gr_saddr = inet->inet_rcv_saddr;
92818+ sig->gr_daddr = inet->inet_daddr;
92819+ sig->gr_sport = inet->inet_sport;
92820+ sig->gr_dport = inet->inet_dport;
92821+ gr_add_to_task_ip_table_nolock(sig, newent);
92822+ spin_unlock(&gr_conn_table_lock);
92823+#endif
92824+ return;
92825+}
92826+
92827+void gr_del_task_from_ip_table(struct task_struct *task)
92828+{
92829+#ifdef CONFIG_GRKERNSEC
92830+ spin_lock_bh(&gr_conn_table_lock);
92831+ gr_del_task_from_ip_table_nolock(task->signal);
92832+ spin_unlock_bh(&gr_conn_table_lock);
92833+#endif
92834+ return;
92835+}
92836+
92837+void
92838+gr_attach_curr_ip(const struct sock *sk)
92839+{
92840+#ifdef CONFIG_GRKERNSEC
92841+ struct signal_struct *p, *set;
92842+ const struct inet_sock *inet = inet_sk(sk);
92843+
92844+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
92845+ return;
92846+
92847+ set = current->signal;
92848+
92849+ spin_lock_bh(&gr_conn_table_lock);
92850+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
92851+ inet->inet_dport, inet->inet_sport);
92852+ if (unlikely(p != NULL)) {
92853+ set->curr_ip = p->curr_ip;
92854+ set->used_accept = 1;
92855+ gr_del_task_from_ip_table_nolock(p);
92856+ spin_unlock_bh(&gr_conn_table_lock);
92857+ return;
92858+ }
92859+ spin_unlock_bh(&gr_conn_table_lock);
92860+
92861+ set->curr_ip = inet->inet_daddr;
92862+ set->used_accept = 1;
92863+#endif
92864+ return;
92865+}
92866+
92867+int
92868+gr_handle_sock_all(const int family, const int type, const int protocol)
92869+{
92870+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
92871+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
92872+ (family != AF_UNIX)) {
92873+ if (family == AF_INET)
92874+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
92875+ else
92876+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
92877+ return -EACCES;
92878+ }
92879+#endif
92880+ return 0;
92881+}
92882+
92883+int
92884+gr_handle_sock_server(const struct sockaddr *sck)
92885+{
92886+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
92887+ if (grsec_enable_socket_server &&
92888+ in_group_p(grsec_socket_server_gid) &&
92889+ sck && (sck->sa_family != AF_UNIX) &&
92890+ (sck->sa_family != AF_LOCAL)) {
92891+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
92892+ return -EACCES;
92893+ }
92894+#endif
92895+ return 0;
92896+}
92897+
92898+int
92899+gr_handle_sock_server_other(const struct sock *sck)
92900+{
92901+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
92902+ if (grsec_enable_socket_server &&
92903+ in_group_p(grsec_socket_server_gid) &&
92904+ sck && (sck->sk_family != AF_UNIX) &&
92905+ (sck->sk_family != AF_LOCAL)) {
92906+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
92907+ return -EACCES;
92908+ }
92909+#endif
92910+ return 0;
92911+}
92912+
92913+int
92914+gr_handle_sock_client(const struct sockaddr *sck)
92915+{
92916+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
92917+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
92918+ sck && (sck->sa_family != AF_UNIX) &&
92919+ (sck->sa_family != AF_LOCAL)) {
92920+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
92921+ return -EACCES;
92922+ }
92923+#endif
92924+ return 0;
92925+}
92926diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
92927new file mode 100644
92928index 0000000..aaec43c
92929--- /dev/null
92930+++ b/grsecurity/grsec_sysctl.c
92931@@ -0,0 +1,488 @@
92932+#include <linux/kernel.h>
92933+#include <linux/sched.h>
92934+#include <linux/sysctl.h>
92935+#include <linux/grsecurity.h>
92936+#include <linux/grinternal.h>
92937+
92938+int
92939+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
92940+{
92941+#ifdef CONFIG_GRKERNSEC_SYSCTL
92942+ if (dirname == NULL || name == NULL)
92943+ return 0;
92944+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
92945+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
92946+ return -EACCES;
92947+ }
92948+#endif
92949+ return 0;
92950+}
92951+
92952+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
92953+static int __maybe_unused __read_only one = 1;
92954+#endif
92955+
92956+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
92957+ defined(CONFIG_GRKERNSEC_DENYUSB)
92958+struct ctl_table grsecurity_table[] = {
92959+#ifdef CONFIG_GRKERNSEC_SYSCTL
92960+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
92961+#ifdef CONFIG_GRKERNSEC_IO
92962+ {
92963+ .procname = "disable_priv_io",
92964+ .data = &grsec_disable_privio,
92965+ .maxlen = sizeof(int),
92966+ .mode = 0600,
92967+ .proc_handler = &proc_dointvec_secure,
92968+ },
92969+#endif
92970+#endif
92971+#ifdef CONFIG_GRKERNSEC_LINK
92972+ {
92973+ .procname = "linking_restrictions",
92974+ .data = &grsec_enable_link,
92975+ .maxlen = sizeof(int),
92976+ .mode = 0600,
92977+ .proc_handler = &proc_dointvec_secure,
92978+ },
92979+#endif
92980+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
92981+ {
92982+ .procname = "enforce_symlinksifowner",
92983+ .data = &grsec_enable_symlinkown,
92984+ .maxlen = sizeof(int),
92985+ .mode = 0600,
92986+ .proc_handler = &proc_dointvec_secure,
92987+ },
92988+ {
92989+ .procname = "symlinkown_gid",
92990+ .data = &grsec_symlinkown_gid,
92991+ .maxlen = sizeof(int),
92992+ .mode = 0600,
92993+ .proc_handler = &proc_dointvec_secure,
92994+ },
92995+#endif
92996+#ifdef CONFIG_GRKERNSEC_BRUTE
92997+ {
92998+ .procname = "deter_bruteforce",
92999+ .data = &grsec_enable_brute,
93000+ .maxlen = sizeof(int),
93001+ .mode = 0600,
93002+ .proc_handler = &proc_dointvec_secure,
93003+ },
93004+#endif
93005+#ifdef CONFIG_GRKERNSEC_FIFO
93006+ {
93007+ .procname = "fifo_restrictions",
93008+ .data = &grsec_enable_fifo,
93009+ .maxlen = sizeof(int),
93010+ .mode = 0600,
93011+ .proc_handler = &proc_dointvec_secure,
93012+ },
93013+#endif
93014+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
93015+ {
93016+ .procname = "ptrace_readexec",
93017+ .data = &grsec_enable_ptrace_readexec,
93018+ .maxlen = sizeof(int),
93019+ .mode = 0600,
93020+ .proc_handler = &proc_dointvec_secure,
93021+ },
93022+#endif
93023+#ifdef CONFIG_GRKERNSEC_SETXID
93024+ {
93025+ .procname = "consistent_setxid",
93026+ .data = &grsec_enable_setxid,
93027+ .maxlen = sizeof(int),
93028+ .mode = 0600,
93029+ .proc_handler = &proc_dointvec_secure,
93030+ },
93031+#endif
93032+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
93033+ {
93034+ .procname = "ip_blackhole",
93035+ .data = &grsec_enable_blackhole,
93036+ .maxlen = sizeof(int),
93037+ .mode = 0600,
93038+ .proc_handler = &proc_dointvec_secure,
93039+ },
93040+ {
93041+ .procname = "lastack_retries",
93042+ .data = &grsec_lastack_retries,
93043+ .maxlen = sizeof(int),
93044+ .mode = 0600,
93045+ .proc_handler = &proc_dointvec_secure,
93046+ },
93047+#endif
93048+#ifdef CONFIG_GRKERNSEC_EXECLOG
93049+ {
93050+ .procname = "exec_logging",
93051+ .data = &grsec_enable_execlog,
93052+ .maxlen = sizeof(int),
93053+ .mode = 0600,
93054+ .proc_handler = &proc_dointvec_secure,
93055+ },
93056+#endif
93057+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
93058+ {
93059+ .procname = "rwxmap_logging",
93060+ .data = &grsec_enable_log_rwxmaps,
93061+ .maxlen = sizeof(int),
93062+ .mode = 0600,
93063+ .proc_handler = &proc_dointvec_secure,
93064+ },
93065+#endif
93066+#ifdef CONFIG_GRKERNSEC_SIGNAL
93067+ {
93068+ .procname = "signal_logging",
93069+ .data = &grsec_enable_signal,
93070+ .maxlen = sizeof(int),
93071+ .mode = 0600,
93072+ .proc_handler = &proc_dointvec_secure,
93073+ },
93074+#endif
93075+#ifdef CONFIG_GRKERNSEC_FORKFAIL
93076+ {
93077+ .procname = "forkfail_logging",
93078+ .data = &grsec_enable_forkfail,
93079+ .maxlen = sizeof(int),
93080+ .mode = 0600,
93081+ .proc_handler = &proc_dointvec_secure,
93082+ },
93083+#endif
93084+#ifdef CONFIG_GRKERNSEC_TIME
93085+ {
93086+ .procname = "timechange_logging",
93087+ .data = &grsec_enable_time,
93088+ .maxlen = sizeof(int),
93089+ .mode = 0600,
93090+ .proc_handler = &proc_dointvec_secure,
93091+ },
93092+#endif
93093+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
93094+ {
93095+ .procname = "chroot_deny_shmat",
93096+ .data = &grsec_enable_chroot_shmat,
93097+ .maxlen = sizeof(int),
93098+ .mode = 0600,
93099+ .proc_handler = &proc_dointvec_secure,
93100+ },
93101+#endif
93102+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
93103+ {
93104+ .procname = "chroot_deny_unix",
93105+ .data = &grsec_enable_chroot_unix,
93106+ .maxlen = sizeof(int),
93107+ .mode = 0600,
93108+ .proc_handler = &proc_dointvec_secure,
93109+ },
93110+#endif
93111+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
93112+ {
93113+ .procname = "chroot_deny_mount",
93114+ .data = &grsec_enable_chroot_mount,
93115+ .maxlen = sizeof(int),
93116+ .mode = 0600,
93117+ .proc_handler = &proc_dointvec_secure,
93118+ },
93119+#endif
93120+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
93121+ {
93122+ .procname = "chroot_deny_fchdir",
93123+ .data = &grsec_enable_chroot_fchdir,
93124+ .maxlen = sizeof(int),
93125+ .mode = 0600,
93126+ .proc_handler = &proc_dointvec_secure,
93127+ },
93128+#endif
93129+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
93130+ {
93131+ .procname = "chroot_deny_chroot",
93132+ .data = &grsec_enable_chroot_double,
93133+ .maxlen = sizeof(int),
93134+ .mode = 0600,
93135+ .proc_handler = &proc_dointvec_secure,
93136+ },
93137+#endif
93138+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
93139+ {
93140+ .procname = "chroot_deny_pivot",
93141+ .data = &grsec_enable_chroot_pivot,
93142+ .maxlen = sizeof(int),
93143+ .mode = 0600,
93144+ .proc_handler = &proc_dointvec_secure,
93145+ },
93146+#endif
93147+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
93148+ {
93149+ .procname = "chroot_enforce_chdir",
93150+ .data = &grsec_enable_chroot_chdir,
93151+ .maxlen = sizeof(int),
93152+ .mode = 0600,
93153+ .proc_handler = &proc_dointvec_secure,
93154+ },
93155+#endif
93156+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
93157+ {
93158+ .procname = "chroot_deny_chmod",
93159+ .data = &grsec_enable_chroot_chmod,
93160+ .maxlen = sizeof(int),
93161+ .mode = 0600,
93162+ .proc_handler = &proc_dointvec_secure,
93163+ },
93164+#endif
93165+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
93166+ {
93167+ .procname = "chroot_deny_mknod",
93168+ .data = &grsec_enable_chroot_mknod,
93169+ .maxlen = sizeof(int),
93170+ .mode = 0600,
93171+ .proc_handler = &proc_dointvec_secure,
93172+ },
93173+#endif
93174+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
93175+ {
93176+ .procname = "chroot_restrict_nice",
93177+ .data = &grsec_enable_chroot_nice,
93178+ .maxlen = sizeof(int),
93179+ .mode = 0600,
93180+ .proc_handler = &proc_dointvec_secure,
93181+ },
93182+#endif
93183+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
93184+ {
93185+ .procname = "chroot_execlog",
93186+ .data = &grsec_enable_chroot_execlog,
93187+ .maxlen = sizeof(int),
93188+ .mode = 0600,
93189+ .proc_handler = &proc_dointvec_secure,
93190+ },
93191+#endif
93192+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
93193+ {
93194+ .procname = "chroot_caps",
93195+ .data = &grsec_enable_chroot_caps,
93196+ .maxlen = sizeof(int),
93197+ .mode = 0600,
93198+ .proc_handler = &proc_dointvec_secure,
93199+ },
93200+#endif
93201+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
93202+ {
93203+ .procname = "chroot_deny_bad_rename",
93204+ .data = &grsec_enable_chroot_rename,
93205+ .maxlen = sizeof(int),
93206+ .mode = 0600,
93207+ .proc_handler = &proc_dointvec_secure,
93208+ },
93209+#endif
93210+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
93211+ {
93212+ .procname = "chroot_deny_sysctl",
93213+ .data = &grsec_enable_chroot_sysctl,
93214+ .maxlen = sizeof(int),
93215+ .mode = 0600,
93216+ .proc_handler = &proc_dointvec_secure,
93217+ },
93218+#endif
93219+#ifdef CONFIG_GRKERNSEC_TPE
93220+ {
93221+ .procname = "tpe",
93222+ .data = &grsec_enable_tpe,
93223+ .maxlen = sizeof(int),
93224+ .mode = 0600,
93225+ .proc_handler = &proc_dointvec_secure,
93226+ },
93227+ {
93228+ .procname = "tpe_gid",
93229+ .data = &grsec_tpe_gid,
93230+ .maxlen = sizeof(int),
93231+ .mode = 0600,
93232+ .proc_handler = &proc_dointvec_secure,
93233+ },
93234+#endif
93235+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
93236+ {
93237+ .procname = "tpe_invert",
93238+ .data = &grsec_enable_tpe_invert,
93239+ .maxlen = sizeof(int),
93240+ .mode = 0600,
93241+ .proc_handler = &proc_dointvec_secure,
93242+ },
93243+#endif
93244+#ifdef CONFIG_GRKERNSEC_TPE_ALL
93245+ {
93246+ .procname = "tpe_restrict_all",
93247+ .data = &grsec_enable_tpe_all,
93248+ .maxlen = sizeof(int),
93249+ .mode = 0600,
93250+ .proc_handler = &proc_dointvec_secure,
93251+ },
93252+#endif
93253+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
93254+ {
93255+ .procname = "socket_all",
93256+ .data = &grsec_enable_socket_all,
93257+ .maxlen = sizeof(int),
93258+ .mode = 0600,
93259+ .proc_handler = &proc_dointvec_secure,
93260+ },
93261+ {
93262+ .procname = "socket_all_gid",
93263+ .data = &grsec_socket_all_gid,
93264+ .maxlen = sizeof(int),
93265+ .mode = 0600,
93266+ .proc_handler = &proc_dointvec_secure,
93267+ },
93268+#endif
93269+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
93270+ {
93271+ .procname = "socket_client",
93272+ .data = &grsec_enable_socket_client,
93273+ .maxlen = sizeof(int),
93274+ .mode = 0600,
93275+ .proc_handler = &proc_dointvec_secure,
93276+ },
93277+ {
93278+ .procname = "socket_client_gid",
93279+ .data = &grsec_socket_client_gid,
93280+ .maxlen = sizeof(int),
93281+ .mode = 0600,
93282+ .proc_handler = &proc_dointvec_secure,
93283+ },
93284+#endif
93285+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
93286+ {
93287+ .procname = "socket_server",
93288+ .data = &grsec_enable_socket_server,
93289+ .maxlen = sizeof(int),
93290+ .mode = 0600,
93291+ .proc_handler = &proc_dointvec_secure,
93292+ },
93293+ {
93294+ .procname = "socket_server_gid",
93295+ .data = &grsec_socket_server_gid,
93296+ .maxlen = sizeof(int),
93297+ .mode = 0600,
93298+ .proc_handler = &proc_dointvec_secure,
93299+ },
93300+#endif
93301+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
93302+ {
93303+ .procname = "audit_group",
93304+ .data = &grsec_enable_group,
93305+ .maxlen = sizeof(int),
93306+ .mode = 0600,
93307+ .proc_handler = &proc_dointvec_secure,
93308+ },
93309+ {
93310+ .procname = "audit_gid",
93311+ .data = &grsec_audit_gid,
93312+ .maxlen = sizeof(int),
93313+ .mode = 0600,
93314+ .proc_handler = &proc_dointvec_secure,
93315+ },
93316+#endif
93317+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
93318+ {
93319+ .procname = "audit_chdir",
93320+ .data = &grsec_enable_chdir,
93321+ .maxlen = sizeof(int),
93322+ .mode = 0600,
93323+ .proc_handler = &proc_dointvec_secure,
93324+ },
93325+#endif
93326+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
93327+ {
93328+ .procname = "audit_mount",
93329+ .data = &grsec_enable_mount,
93330+ .maxlen = sizeof(int),
93331+ .mode = 0600,
93332+ .proc_handler = &proc_dointvec_secure,
93333+ },
93334+#endif
93335+#ifdef CONFIG_GRKERNSEC_DMESG
93336+ {
93337+ .procname = "dmesg",
93338+ .data = &grsec_enable_dmesg,
93339+ .maxlen = sizeof(int),
93340+ .mode = 0600,
93341+ .proc_handler = &proc_dointvec_secure,
93342+ },
93343+#endif
93344+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
93345+ {
93346+ .procname = "chroot_findtask",
93347+ .data = &grsec_enable_chroot_findtask,
93348+ .maxlen = sizeof(int),
93349+ .mode = 0600,
93350+ .proc_handler = &proc_dointvec_secure,
93351+ },
93352+#endif
93353+#ifdef CONFIG_GRKERNSEC_RESLOG
93354+ {
93355+ .procname = "resource_logging",
93356+ .data = &grsec_resource_logging,
93357+ .maxlen = sizeof(int),
93358+ .mode = 0600,
93359+ .proc_handler = &proc_dointvec_secure,
93360+ },
93361+#endif
93362+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
93363+ {
93364+ .procname = "audit_ptrace",
93365+ .data = &grsec_enable_audit_ptrace,
93366+ .maxlen = sizeof(int),
93367+ .mode = 0600,
93368+ .proc_handler = &proc_dointvec_secure,
93369+ },
93370+#endif
93371+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
93372+ {
93373+ .procname = "harden_ptrace",
93374+ .data = &grsec_enable_harden_ptrace,
93375+ .maxlen = sizeof(int),
93376+ .mode = 0600,
93377+ .proc_handler = &proc_dointvec_secure,
93378+ },
93379+#endif
93380+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
93381+ {
93382+ .procname = "harden_ipc",
93383+ .data = &grsec_enable_harden_ipc,
93384+ .maxlen = sizeof(int),
93385+ .mode = 0600,
93386+ .proc_handler = &proc_dointvec_secure,
93387+ },
93388+#endif
93389+ {
93390+ .procname = "grsec_lock",
93391+ .data = &grsec_lock,
93392+ .maxlen = sizeof(int),
93393+ .mode = 0600,
93394+ .proc_handler = &proc_dointvec_secure,
93395+ },
93396+#endif
93397+#ifdef CONFIG_GRKERNSEC_ROFS
93398+ {
93399+ .procname = "romount_protect",
93400+ .data = &grsec_enable_rofs,
93401+ .maxlen = sizeof(int),
93402+ .mode = 0600,
93403+ .proc_handler = &proc_dointvec_minmax_secure,
93404+ .extra1 = &one,
93405+ .extra2 = &one,
93406+ },
93407+#endif
93408+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
93409+ {
93410+ .procname = "deny_new_usb",
93411+ .data = &grsec_deny_new_usb,
93412+ .maxlen = sizeof(int),
93413+ .mode = 0600,
93414+ .proc_handler = &proc_dointvec_secure,
93415+ },
93416+#endif
93417+ { }
93418+};
93419+#endif
93420diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
93421new file mode 100644
93422index 0000000..61b514e
93423--- /dev/null
93424+++ b/grsecurity/grsec_time.c
93425@@ -0,0 +1,16 @@
93426+#include <linux/kernel.h>
93427+#include <linux/sched.h>
93428+#include <linux/grinternal.h>
93429+#include <linux/module.h>
93430+
93431+void
93432+gr_log_timechange(void)
93433+{
93434+#ifdef CONFIG_GRKERNSEC_TIME
93435+ if (grsec_enable_time)
93436+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
93437+#endif
93438+ return;
93439+}
93440+
93441+EXPORT_SYMBOL_GPL(gr_log_timechange);
93442diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
93443new file mode 100644
93444index 0000000..9786671
93445--- /dev/null
93446+++ b/grsecurity/grsec_tpe.c
93447@@ -0,0 +1,78 @@
93448+#include <linux/kernel.h>
93449+#include <linux/sched.h>
93450+#include <linux/file.h>
93451+#include <linux/fs.h>
93452+#include <linux/grinternal.h>
93453+
93454+extern int gr_acl_tpe_check(void);
93455+
93456+int
93457+gr_tpe_allow(const struct file *file)
93458+{
93459+#ifdef CONFIG_GRKERNSEC
93460+ struct inode *inode = d_backing_inode(file->f_path.dentry->d_parent);
93461+ struct inode *file_inode = d_backing_inode(file->f_path.dentry);
93462+ const struct cred *cred = current_cred();
93463+ char *msg = NULL;
93464+ char *msg2 = NULL;
93465+
93466+ // never restrict root
93467+ if (gr_is_global_root(cred->uid))
93468+ return 1;
93469+
93470+ if (grsec_enable_tpe) {
93471+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
93472+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
93473+ msg = "not being in trusted group";
93474+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
93475+ msg = "being in untrusted group";
93476+#else
93477+ if (in_group_p(grsec_tpe_gid))
93478+ msg = "being in untrusted group";
93479+#endif
93480+ }
93481+ if (!msg && gr_acl_tpe_check())
93482+ msg = "being in untrusted role";
93483+
93484+ // not in any affected group/role
93485+ if (!msg)
93486+ goto next_check;
93487+
93488+ if (gr_is_global_nonroot(inode->i_uid))
93489+ msg2 = "file in non-root-owned directory";
93490+ else if (inode->i_mode & S_IWOTH)
93491+ msg2 = "file in world-writable directory";
93492+ else if (inode->i_mode & S_IWGRP)
93493+ msg2 = "file in group-writable directory";
93494+ else if (file_inode->i_mode & S_IWOTH)
93495+ msg2 = "file is world-writable";
93496+
93497+ if (msg && msg2) {
93498+ char fullmsg[70] = {0};
93499+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
93500+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
93501+ return 0;
93502+ }
93503+ msg = NULL;
93504+next_check:
93505+#ifdef CONFIG_GRKERNSEC_TPE_ALL
93506+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
93507+ return 1;
93508+
93509+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
93510+ msg = "directory not owned by user";
93511+ else if (inode->i_mode & S_IWOTH)
93512+ msg = "file in world-writable directory";
93513+ else if (inode->i_mode & S_IWGRP)
93514+ msg = "file in group-writable directory";
93515+ else if (file_inode->i_mode & S_IWOTH)
93516+ msg = "file is world-writable";
93517+
93518+ if (msg) {
93519+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
93520+ return 0;
93521+ }
93522+#endif
93523+#endif
93524+ return 1;
93525+}
93526diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
93527new file mode 100644
93528index 0000000..ae02d8e
93529--- /dev/null
93530+++ b/grsecurity/grsec_usb.c
93531@@ -0,0 +1,15 @@
93532+#include <linux/kernel.h>
93533+#include <linux/grinternal.h>
93534+#include <linux/module.h>
93535+
93536+int gr_handle_new_usb(void)
93537+{
93538+#ifdef CONFIG_GRKERNSEC_DENYUSB
93539+ if (grsec_deny_new_usb) {
93540+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
93541+ return 1;
93542+ }
93543+#endif
93544+ return 0;
93545+}
93546+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
93547diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
93548new file mode 100644
93549index 0000000..158b330
93550--- /dev/null
93551+++ b/grsecurity/grsum.c
93552@@ -0,0 +1,64 @@
93553+#include <linux/err.h>
93554+#include <linux/kernel.h>
93555+#include <linux/sched.h>
93556+#include <linux/mm.h>
93557+#include <linux/scatterlist.h>
93558+#include <linux/crypto.h>
93559+#include <linux/gracl.h>
93560+
93561+
93562+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
93563+#error "crypto and sha256 must be built into the kernel"
93564+#endif
93565+
93566+int
93567+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
93568+{
93569+ struct crypto_hash *tfm;
93570+ struct hash_desc desc;
93571+ struct scatterlist sg[2];
93572+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
93573+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
93574+ unsigned long *sumptr = (unsigned long *)sum;
93575+ int cryptres;
93576+ int retval = 1;
93577+ volatile int mismatched = 0;
93578+ volatile int dummy = 0;
93579+ unsigned int i;
93580+
93581+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
93582+ if (IS_ERR(tfm)) {
93583+ /* should never happen, since sha256 should be built in */
93584+ memset(entry->pw, 0, GR_PW_LEN);
93585+ return 1;
93586+ }
93587+
93588+ sg_init_table(sg, 2);
93589+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
93590+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
93591+
93592+ desc.tfm = tfm;
93593+ desc.flags = 0;
93594+
93595+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
93596+ temp_sum);
93597+
93598+ memset(entry->pw, 0, GR_PW_LEN);
93599+
93600+ if (cryptres)
93601+ goto out;
93602+
93603+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
93604+ if (sumptr[i] != tmpsumptr[i])
93605+ mismatched = 1;
93606+ else
93607+ dummy = 1; // waste a cycle
93608+
93609+ if (!mismatched)
93610+ retval = dummy - 1;
93611+
93612+out:
93613+ crypto_free_hash(tfm);
93614+
93615+ return retval;
93616+}
93617diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
93618index 5bdab6b..9ae82fe 100644
93619--- a/include/asm-generic/4level-fixup.h
93620+++ b/include/asm-generic/4level-fixup.h
93621@@ -14,8 +14,10 @@
93622 #define pmd_alloc(mm, pud, address) \
93623 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
93624 NULL: pmd_offset(pud, address))
93625+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
93626
93627 #define pud_alloc(mm, pgd, address) (pgd)
93628+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
93629 #define pud_offset(pgd, start) (pgd)
93630 #define pud_none(pud) 0
93631 #define pud_bad(pud) 0
93632diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
93633index b7babf0..1e4b4f1 100644
93634--- a/include/asm-generic/atomic-long.h
93635+++ b/include/asm-generic/atomic-long.h
93636@@ -22,6 +22,12 @@
93637
93638 typedef atomic64_t atomic_long_t;
93639
93640+#ifdef CONFIG_PAX_REFCOUNT
93641+typedef atomic64_unchecked_t atomic_long_unchecked_t;
93642+#else
93643+typedef atomic64_t atomic_long_unchecked_t;
93644+#endif
93645+
93646 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
93647
93648 static inline long atomic_long_read(atomic_long_t *l)
93649@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
93650 return (long)atomic64_read(v);
93651 }
93652
93653+#ifdef CONFIG_PAX_REFCOUNT
93654+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
93655+{
93656+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93657+
93658+ return (long)atomic64_read_unchecked(v);
93659+}
93660+#endif
93661+
93662 static inline void atomic_long_set(atomic_long_t *l, long i)
93663 {
93664 atomic64_t *v = (atomic64_t *)l;
93665@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
93666 atomic64_set(v, i);
93667 }
93668
93669+#ifdef CONFIG_PAX_REFCOUNT
93670+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
93671+{
93672+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93673+
93674+ atomic64_set_unchecked(v, i);
93675+}
93676+#endif
93677+
93678 static inline void atomic_long_inc(atomic_long_t *l)
93679 {
93680 atomic64_t *v = (atomic64_t *)l;
93681@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
93682 atomic64_inc(v);
93683 }
93684
93685+#ifdef CONFIG_PAX_REFCOUNT
93686+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
93687+{
93688+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93689+
93690+ atomic64_inc_unchecked(v);
93691+}
93692+#endif
93693+
93694 static inline void atomic_long_dec(atomic_long_t *l)
93695 {
93696 atomic64_t *v = (atomic64_t *)l;
93697@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
93698 atomic64_dec(v);
93699 }
93700
93701+#ifdef CONFIG_PAX_REFCOUNT
93702+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
93703+{
93704+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93705+
93706+ atomic64_dec_unchecked(v);
93707+}
93708+#endif
93709+
93710 static inline void atomic_long_add(long i, atomic_long_t *l)
93711 {
93712 atomic64_t *v = (atomic64_t *)l;
93713@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
93714 atomic64_add(i, v);
93715 }
93716
93717+#ifdef CONFIG_PAX_REFCOUNT
93718+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
93719+{
93720+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93721+
93722+ atomic64_add_unchecked(i, v);
93723+}
93724+#endif
93725+
93726 static inline void atomic_long_sub(long i, atomic_long_t *l)
93727 {
93728 atomic64_t *v = (atomic64_t *)l;
93729@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
93730 atomic64_sub(i, v);
93731 }
93732
93733+#ifdef CONFIG_PAX_REFCOUNT
93734+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
93735+{
93736+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93737+
93738+ atomic64_sub_unchecked(i, v);
93739+}
93740+#endif
93741+
93742 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
93743 {
93744 atomic64_t *v = (atomic64_t *)l;
93745@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
93746 return atomic64_add_negative(i, v);
93747 }
93748
93749-static inline long atomic_long_add_return(long i, atomic_long_t *l)
93750+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
93751 {
93752 atomic64_t *v = (atomic64_t *)l;
93753
93754 return (long)atomic64_add_return(i, v);
93755 }
93756
93757+#ifdef CONFIG_PAX_REFCOUNT
93758+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
93759+{
93760+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93761+
93762+ return (long)atomic64_add_return_unchecked(i, v);
93763+}
93764+#endif
93765+
93766 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
93767 {
93768 atomic64_t *v = (atomic64_t *)l;
93769@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
93770 return (long)atomic64_inc_return(v);
93771 }
93772
93773+#ifdef CONFIG_PAX_REFCOUNT
93774+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
93775+{
93776+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
93777+
93778+ return (long)atomic64_inc_return_unchecked(v);
93779+}
93780+#endif
93781+
93782 static inline long atomic_long_dec_return(atomic_long_t *l)
93783 {
93784 atomic64_t *v = (atomic64_t *)l;
93785@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
93786
93787 typedef atomic_t atomic_long_t;
93788
93789+#ifdef CONFIG_PAX_REFCOUNT
93790+typedef atomic_unchecked_t atomic_long_unchecked_t;
93791+#else
93792+typedef atomic_t atomic_long_unchecked_t;
93793+#endif
93794+
93795 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
93796 static inline long atomic_long_read(atomic_long_t *l)
93797 {
93798@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
93799 return (long)atomic_read(v);
93800 }
93801
93802+#ifdef CONFIG_PAX_REFCOUNT
93803+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
93804+{
93805+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93806+
93807+ return (long)atomic_read_unchecked(v);
93808+}
93809+#endif
93810+
93811 static inline void atomic_long_set(atomic_long_t *l, long i)
93812 {
93813 atomic_t *v = (atomic_t *)l;
93814@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
93815 atomic_set(v, i);
93816 }
93817
93818+#ifdef CONFIG_PAX_REFCOUNT
93819+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
93820+{
93821+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93822+
93823+ atomic_set_unchecked(v, i);
93824+}
93825+#endif
93826+
93827 static inline void atomic_long_inc(atomic_long_t *l)
93828 {
93829 atomic_t *v = (atomic_t *)l;
93830@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
93831 atomic_inc(v);
93832 }
93833
93834+#ifdef CONFIG_PAX_REFCOUNT
93835+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
93836+{
93837+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93838+
93839+ atomic_inc_unchecked(v);
93840+}
93841+#endif
93842+
93843 static inline void atomic_long_dec(atomic_long_t *l)
93844 {
93845 atomic_t *v = (atomic_t *)l;
93846@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
93847 atomic_dec(v);
93848 }
93849
93850+#ifdef CONFIG_PAX_REFCOUNT
93851+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
93852+{
93853+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93854+
93855+ atomic_dec_unchecked(v);
93856+}
93857+#endif
93858+
93859 static inline void atomic_long_add(long i, atomic_long_t *l)
93860 {
93861 atomic_t *v = (atomic_t *)l;
93862@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
93863 atomic_add(i, v);
93864 }
93865
93866+#ifdef CONFIG_PAX_REFCOUNT
93867+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
93868+{
93869+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93870+
93871+ atomic_add_unchecked(i, v);
93872+}
93873+#endif
93874+
93875 static inline void atomic_long_sub(long i, atomic_long_t *l)
93876 {
93877 atomic_t *v = (atomic_t *)l;
93878@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
93879 atomic_sub(i, v);
93880 }
93881
93882+#ifdef CONFIG_PAX_REFCOUNT
93883+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
93884+{
93885+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93886+
93887+ atomic_sub_unchecked(i, v);
93888+}
93889+#endif
93890+
93891 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
93892 {
93893 atomic_t *v = (atomic_t *)l;
93894@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
93895 return atomic_add_negative(i, v);
93896 }
93897
93898-static inline long atomic_long_add_return(long i, atomic_long_t *l)
93899+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
93900 {
93901 atomic_t *v = (atomic_t *)l;
93902
93903 return (long)atomic_add_return(i, v);
93904 }
93905
93906+#ifdef CONFIG_PAX_REFCOUNT
93907+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
93908+{
93909+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93910+
93911+ return (long)atomic_add_return_unchecked(i, v);
93912+}
93913+
93914+#endif
93915+
93916 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
93917 {
93918 atomic_t *v = (atomic_t *)l;
93919@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
93920 return (long)atomic_inc_return(v);
93921 }
93922
93923+#ifdef CONFIG_PAX_REFCOUNT
93924+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
93925+{
93926+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
93927+
93928+ return (long)atomic_inc_return_unchecked(v);
93929+}
93930+#endif
93931+
93932 static inline long atomic_long_dec_return(atomic_long_t *l)
93933 {
93934 atomic_t *v = (atomic_t *)l;
93935@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
93936
93937 #endif /* BITS_PER_LONG == 64 */
93938
93939+#ifdef CONFIG_PAX_REFCOUNT
93940+static inline void pax_refcount_needs_these_functions(void)
93941+{
93942+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
93943+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
93944+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
93945+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
93946+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
93947+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
93948+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
93949+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
93950+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
93951+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
93952+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
93953+#ifdef CONFIG_X86
93954+ atomic_clear_mask_unchecked(0, NULL);
93955+ atomic_set_mask_unchecked(0, NULL);
93956+#endif
93957+
93958+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
93959+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
93960+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
93961+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
93962+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
93963+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
93964+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
93965+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
93966+}
93967+#else
93968+#define atomic_read_unchecked(v) atomic_read(v)
93969+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
93970+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
93971+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
93972+#define atomic_inc_unchecked(v) atomic_inc(v)
93973+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
93974+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
93975+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
93976+#define atomic_dec_unchecked(v) atomic_dec(v)
93977+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
93978+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
93979+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
93980+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
93981+
93982+#define atomic_long_read_unchecked(v) atomic_long_read(v)
93983+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
93984+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
93985+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
93986+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
93987+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
93988+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
93989+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
93990+#endif
93991+
93992 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
93993diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
93994index 30ad9c8..c70c170 100644
93995--- a/include/asm-generic/atomic64.h
93996+++ b/include/asm-generic/atomic64.h
93997@@ -16,6 +16,8 @@ typedef struct {
93998 long long counter;
93999 } atomic64_t;
94000
94001+typedef atomic64_t atomic64_unchecked_t;
94002+
94003 #define ATOMIC64_INIT(i) { (i) }
94004
94005 extern long long atomic64_read(const atomic64_t *v);
94006@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
94007 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
94008 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
94009
94010+#define atomic64_read_unchecked(v) atomic64_read(v)
94011+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
94012+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
94013+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
94014+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
94015+#define atomic64_inc_unchecked(v) atomic64_inc(v)
94016+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
94017+#define atomic64_dec_unchecked(v) atomic64_dec(v)
94018+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
94019+
94020 #endif /* _ASM_GENERIC_ATOMIC64_H */
94021diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
94022index f5c40b0..e902f9d 100644
94023--- a/include/asm-generic/barrier.h
94024+++ b/include/asm-generic/barrier.h
94025@@ -82,7 +82,7 @@
94026 do { \
94027 compiletime_assert_atomic_type(*p); \
94028 smp_mb(); \
94029- ACCESS_ONCE(*p) = (v); \
94030+ ACCESS_ONCE_RW(*p) = (v); \
94031 } while (0)
94032
94033 #define smp_load_acquire(p) \
94034diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
94035index a60a7cc..0fe12f2 100644
94036--- a/include/asm-generic/bitops/__fls.h
94037+++ b/include/asm-generic/bitops/__fls.h
94038@@ -9,7 +9,7 @@
94039 *
94040 * Undefined if no set bit exists, so code should check against 0 first.
94041 */
94042-static __always_inline unsigned long __fls(unsigned long word)
94043+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
94044 {
94045 int num = BITS_PER_LONG - 1;
94046
94047diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
94048index 0576d1f..dad6c71 100644
94049--- a/include/asm-generic/bitops/fls.h
94050+++ b/include/asm-generic/bitops/fls.h
94051@@ -9,7 +9,7 @@
94052 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
94053 */
94054
94055-static __always_inline int fls(int x)
94056+static __always_inline int __intentional_overflow(-1) fls(int x)
94057 {
94058 int r = 32;
94059
94060diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
94061index b097cf8..3d40e14 100644
94062--- a/include/asm-generic/bitops/fls64.h
94063+++ b/include/asm-generic/bitops/fls64.h
94064@@ -15,7 +15,7 @@
94065 * at position 64.
94066 */
94067 #if BITS_PER_LONG == 32
94068-static __always_inline int fls64(__u64 x)
94069+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
94070 {
94071 __u32 h = x >> 32;
94072 if (h)
94073@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
94074 return fls(x);
94075 }
94076 #elif BITS_PER_LONG == 64
94077-static __always_inline int fls64(__u64 x)
94078+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
94079 {
94080 if (x == 0)
94081 return 0;
94082diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
94083index 630dd23..8c1dcb6b 100644
94084--- a/include/asm-generic/bug.h
94085+++ b/include/asm-generic/bug.h
94086@@ -62,13 +62,13 @@ struct bug_entry {
94087 * to provide better diagnostics.
94088 */
94089 #ifndef __WARN_TAINT
94090-extern __printf(3, 4)
94091+extern __printf(3, 4) __nocapture(1, 3, 4)
94092 void warn_slowpath_fmt(const char *file, const int line,
94093 const char *fmt, ...);
94094-extern __printf(4, 5)
94095+extern __printf(4, 5) __nocapture(1, 4, 5)
94096 void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
94097 const char *fmt, ...);
94098-extern void warn_slowpath_null(const char *file, const int line);
94099+extern __nocapture(1) void warn_slowpath_null(const char *file, const int line);
94100 #define WANT_WARN_ON_SLOWPATH
94101 #define __WARN() warn_slowpath_null(__FILE__, __LINE__)
94102 #define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
94103diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
94104index 1bfcfe5..e04c5c9 100644
94105--- a/include/asm-generic/cache.h
94106+++ b/include/asm-generic/cache.h
94107@@ -6,7 +6,7 @@
94108 * cache lines need to provide their own cache.h.
94109 */
94110
94111-#define L1_CACHE_SHIFT 5
94112-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
94113+#define L1_CACHE_SHIFT 5UL
94114+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
94115
94116 #endif /* __ASM_GENERIC_CACHE_H */
94117diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
94118index 0d68a1e..b74a761 100644
94119--- a/include/asm-generic/emergency-restart.h
94120+++ b/include/asm-generic/emergency-restart.h
94121@@ -1,7 +1,7 @@
94122 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
94123 #define _ASM_GENERIC_EMERGENCY_RESTART_H
94124
94125-static inline void machine_emergency_restart(void)
94126+static inline __noreturn void machine_emergency_restart(void)
94127 {
94128 machine_restart(NULL);
94129 }
94130diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
94131index 90f99c7..00ce236 100644
94132--- a/include/asm-generic/kmap_types.h
94133+++ b/include/asm-generic/kmap_types.h
94134@@ -2,9 +2,9 @@
94135 #define _ASM_GENERIC_KMAP_TYPES_H
94136
94137 #ifdef __WITH_KM_FENCE
94138-# define KM_TYPE_NR 41
94139+# define KM_TYPE_NR 42
94140 #else
94141-# define KM_TYPE_NR 20
94142+# define KM_TYPE_NR 21
94143 #endif
94144
94145 #endif
94146diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
94147index 9ceb03b..62b0b8f 100644
94148--- a/include/asm-generic/local.h
94149+++ b/include/asm-generic/local.h
94150@@ -23,24 +23,37 @@ typedef struct
94151 atomic_long_t a;
94152 } local_t;
94153
94154+typedef struct {
94155+ atomic_long_unchecked_t a;
94156+} local_unchecked_t;
94157+
94158 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
94159
94160 #define local_read(l) atomic_long_read(&(l)->a)
94161+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
94162 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
94163+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
94164 #define local_inc(l) atomic_long_inc(&(l)->a)
94165+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
94166 #define local_dec(l) atomic_long_dec(&(l)->a)
94167+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
94168 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
94169+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
94170 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
94171+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
94172
94173 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
94174 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
94175 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
94176 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
94177 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
94178+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
94179 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
94180 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
94181+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
94182
94183 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
94184+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
94185 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
94186 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
94187 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
94188diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
94189index 725612b..9cc513a 100644
94190--- a/include/asm-generic/pgtable-nopmd.h
94191+++ b/include/asm-generic/pgtable-nopmd.h
94192@@ -1,14 +1,19 @@
94193 #ifndef _PGTABLE_NOPMD_H
94194 #define _PGTABLE_NOPMD_H
94195
94196-#ifndef __ASSEMBLY__
94197-
94198 #include <asm-generic/pgtable-nopud.h>
94199
94200-struct mm_struct;
94201-
94202 #define __PAGETABLE_PMD_FOLDED
94203
94204+#define PMD_SHIFT PUD_SHIFT
94205+#define PTRS_PER_PMD 1
94206+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
94207+#define PMD_MASK (~(PMD_SIZE-1))
94208+
94209+#ifndef __ASSEMBLY__
94210+
94211+struct mm_struct;
94212+
94213 /*
94214 * Having the pmd type consist of a pud gets the size right, and allows
94215 * us to conceptually access the pud entry that this pmd is folded into
94216@@ -16,11 +21,6 @@ struct mm_struct;
94217 */
94218 typedef struct { pud_t pud; } pmd_t;
94219
94220-#define PMD_SHIFT PUD_SHIFT
94221-#define PTRS_PER_PMD 1
94222-#define PMD_SIZE (1UL << PMD_SHIFT)
94223-#define PMD_MASK (~(PMD_SIZE-1))
94224-
94225 /*
94226 * The "pud_xxx()" functions here are trivial for a folded two-level
94227 * setup: the pmd is never bad, and a pmd always exists (as it's folded
94228diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
94229index 810431d..0ec4804f 100644
94230--- a/include/asm-generic/pgtable-nopud.h
94231+++ b/include/asm-generic/pgtable-nopud.h
94232@@ -1,10 +1,15 @@
94233 #ifndef _PGTABLE_NOPUD_H
94234 #define _PGTABLE_NOPUD_H
94235
94236-#ifndef __ASSEMBLY__
94237-
94238 #define __PAGETABLE_PUD_FOLDED
94239
94240+#define PUD_SHIFT PGDIR_SHIFT
94241+#define PTRS_PER_PUD 1
94242+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
94243+#define PUD_MASK (~(PUD_SIZE-1))
94244+
94245+#ifndef __ASSEMBLY__
94246+
94247 /*
94248 * Having the pud type consist of a pgd gets the size right, and allows
94249 * us to conceptually access the pgd entry that this pud is folded into
94250@@ -12,11 +17,6 @@
94251 */
94252 typedef struct { pgd_t pgd; } pud_t;
94253
94254-#define PUD_SHIFT PGDIR_SHIFT
94255-#define PTRS_PER_PUD 1
94256-#define PUD_SIZE (1UL << PUD_SHIFT)
94257-#define PUD_MASK (~(PUD_SIZE-1))
94258-
94259 /*
94260 * The "pgd_xxx()" functions here are trivial for a folded two-level
94261 * setup: the pud is never bad, and a pud always exists (as it's folded
94262@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
94263 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
94264
94265 #define pgd_populate(mm, pgd, pud) do { } while (0)
94266+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
94267 /*
94268 * (puds are folded into pgds so this doesn't get actually called,
94269 * but the define is needed for a generic inline function.)
94270diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
94271index 39f1d6a..7dae6fb 100644
94272--- a/include/asm-generic/pgtable.h
94273+++ b/include/asm-generic/pgtable.h
94274@@ -695,6 +695,22 @@ static inline int pmd_protnone(pmd_t pmd)
94275 }
94276 #endif /* CONFIG_NUMA_BALANCING */
94277
94278+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
94279+#ifdef CONFIG_PAX_KERNEXEC
94280+#error KERNEXEC requires pax_open_kernel
94281+#else
94282+static inline unsigned long pax_open_kernel(void) { return 0; }
94283+#endif
94284+#endif
94285+
94286+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
94287+#ifdef CONFIG_PAX_KERNEXEC
94288+#error KERNEXEC requires pax_close_kernel
94289+#else
94290+static inline unsigned long pax_close_kernel(void) { return 0; }
94291+#endif
94292+#endif
94293+
94294 #endif /* CONFIG_MMU */
94295
94296 #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
94297diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
94298index 72d8803..cb9749c 100644
94299--- a/include/asm-generic/uaccess.h
94300+++ b/include/asm-generic/uaccess.h
94301@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
94302 return __clear_user(to, n);
94303 }
94304
94305+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
94306+#ifdef CONFIG_PAX_MEMORY_UDEREF
94307+#error UDEREF requires pax_open_userland
94308+#else
94309+static inline unsigned long pax_open_userland(void) { return 0; }
94310+#endif
94311+#endif
94312+
94313+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
94314+#ifdef CONFIG_PAX_MEMORY_UDEREF
94315+#error UDEREF requires pax_close_userland
94316+#else
94317+static inline unsigned long pax_close_userland(void) { return 0; }
94318+#endif
94319+#endif
94320+
94321 #endif /* __ASM_GENERIC_UACCESS_H */
94322diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
94323index 8bd374d..9590e70 100644
94324--- a/include/asm-generic/vmlinux.lds.h
94325+++ b/include/asm-generic/vmlinux.lds.h
94326@@ -246,6 +246,7 @@
94327 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
94328 VMLINUX_SYMBOL(__start_rodata) = .; \
94329 *(.rodata) *(.rodata.*) \
94330+ *(.data..read_only) \
94331 *(__vermagic) /* Kernel version magic */ \
94332 . = ALIGN(8); \
94333 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
94334@@ -504,6 +505,7 @@
94335 KERNEL_CTORS() \
94336 MCOUNT_REC() \
94337 *(.init.rodata) \
94338+ *(.init.rodata.*) \
94339 FTRACE_EVENTS() \
94340 TRACE_SYSCALLS() \
94341 KPROBE_BLACKLIST() \
94342@@ -525,6 +527,8 @@
94343
94344 #define EXIT_DATA \
94345 *(.exit.data) \
94346+ *(.exit.rodata) \
94347+ *(.exit.rodata.*) \
94348 MEM_DISCARD(exit.data) \
94349 MEM_DISCARD(exit.rodata)
94350
94351@@ -741,17 +745,18 @@
94352 * section in the linker script will go there too. @phdr should have
94353 * a leading colon.
94354 *
94355- * Note that this macros defines __per_cpu_load as an absolute symbol.
94356+ * Note that this macros defines per_cpu_load as an absolute symbol.
94357 * If there is no need to put the percpu section at a predetermined
94358 * address, use PERCPU_SECTION.
94359 */
94360 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
94361- VMLINUX_SYMBOL(__per_cpu_load) = .; \
94362- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
94363+ per_cpu_load = .; \
94364+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
94365 - LOAD_OFFSET) { \
94366+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
94367 PERCPU_INPUT(cacheline) \
94368 } phdr \
94369- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
94370+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
94371
94372 /**
94373 * PERCPU_SECTION - define output section for percpu area, simple version
94374diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
94375index 0ecb768..f910132 100644
94376--- a/include/crypto/algapi.h
94377+++ b/include/crypto/algapi.h
94378@@ -34,7 +34,7 @@ struct crypto_type {
94379 unsigned int maskclear;
94380 unsigned int maskset;
94381 unsigned int tfmsize;
94382-};
94383+} __do_const;
94384
94385 struct crypto_instance {
94386 struct crypto_alg alg;
94387diff --git a/include/drm/drmP.h b/include/drm/drmP.h
94388index 62c40777..f980496 100644
94389--- a/include/drm/drmP.h
94390+++ b/include/drm/drmP.h
94391@@ -59,6 +59,7 @@
94392
94393 #include <asm/mman.h>
94394 #include <asm/pgalloc.h>
94395+#include <asm/local.h>
94396 #include <asm/uaccess.h>
94397
94398 #include <uapi/drm/drm.h>
94399@@ -137,17 +138,18 @@ void drm_err(const char *format, ...);
94400 /*@{*/
94401
94402 /* driver capabilities and requirements mask */
94403-#define DRIVER_USE_AGP 0x1
94404-#define DRIVER_PCI_DMA 0x8
94405-#define DRIVER_SG 0x10
94406-#define DRIVER_HAVE_DMA 0x20
94407-#define DRIVER_HAVE_IRQ 0x40
94408-#define DRIVER_IRQ_SHARED 0x80
94409-#define DRIVER_GEM 0x1000
94410-#define DRIVER_MODESET 0x2000
94411-#define DRIVER_PRIME 0x4000
94412-#define DRIVER_RENDER 0x8000
94413-#define DRIVER_ATOMIC 0x10000
94414+#define DRIVER_USE_AGP 0x1
94415+#define DRIVER_PCI_DMA 0x8
94416+#define DRIVER_SG 0x10
94417+#define DRIVER_HAVE_DMA 0x20
94418+#define DRIVER_HAVE_IRQ 0x40
94419+#define DRIVER_IRQ_SHARED 0x80
94420+#define DRIVER_GEM 0x1000
94421+#define DRIVER_MODESET 0x2000
94422+#define DRIVER_PRIME 0x4000
94423+#define DRIVER_RENDER 0x8000
94424+#define DRIVER_ATOMIC 0x10000
94425+#define DRIVER_KMS_LEGACY_CONTEXT 0x20000
94426
94427 /***********************************************************************/
94428 /** \name Macros to make printk easier */
94429@@ -233,10 +235,12 @@ void drm_err(const char *format, ...);
94430 * \param cmd command.
94431 * \param arg argument.
94432 */
94433-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
94434+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
94435+ struct drm_file *file_priv);
94436+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
94437 struct drm_file *file_priv);
94438
94439-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
94440+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
94441 unsigned long arg);
94442
94443 #define DRM_IOCTL_NR(n) _IOC_NR(n)
94444@@ -252,9 +256,9 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
94445 struct drm_ioctl_desc {
94446 unsigned int cmd;
94447 int flags;
94448- drm_ioctl_t *func;
94449+ drm_ioctl_t func;
94450 const char *name;
94451-};
94452+} __do_const;
94453
94454 /**
94455 * Creates a driver or general drm_ioctl_desc array entry for the given
94456@@ -645,7 +649,8 @@ struct drm_info_list {
94457 int (*show)(struct seq_file*, void*); /** show callback */
94458 u32 driver_features; /**< Required driver features for this entry */
94459 void *data;
94460-};
94461+} __do_const;
94462+typedef struct drm_info_list __no_const drm_info_list_no_const;
94463
94464 /**
94465 * debugfs node structure. This structure represents a debugfs file.
94466@@ -729,7 +734,7 @@ struct drm_device {
94467
94468 /** \name Usage Counters */
94469 /*@{ */
94470- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
94471+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
94472 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
94473 int buf_use; /**< Buffers in use -- cannot alloc */
94474 atomic_t buf_alloc; /**< Buffer allocation in progress */
94475diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
94476index c8fc187..079d4c2 100644
94477--- a/include/drm/drm_crtc_helper.h
94478+++ b/include/drm/drm_crtc_helper.h
94479@@ -161,7 +161,7 @@ struct drm_encoder_helper_funcs {
94480 int (*atomic_check)(struct drm_encoder *encoder,
94481 struct drm_crtc_state *crtc_state,
94482 struct drm_connector_state *conn_state);
94483-};
94484+} __no_const;
94485
94486 /**
94487 * struct drm_connector_helper_funcs - helper operations for connectors
94488diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
94489index 6133723..4c1fccb 100644
94490--- a/include/drm/i915_pciids.h
94491+++ b/include/drm/i915_pciids.h
94492@@ -37,7 +37,7 @@
94493 */
94494 #define INTEL_VGA_DEVICE(id, info) { \
94495 0x8086, id, \
94496- ~0, ~0, \
94497+ PCI_ANY_ID, PCI_ANY_ID, \
94498 0x030000, 0xff0000, \
94499 (unsigned long) info }
94500
94501diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
94502index 72dcbe8..8db58d7 100644
94503--- a/include/drm/ttm/ttm_memory.h
94504+++ b/include/drm/ttm/ttm_memory.h
94505@@ -48,7 +48,7 @@
94506
94507 struct ttm_mem_shrink {
94508 int (*do_shrink) (struct ttm_mem_shrink *);
94509-};
94510+} __no_const;
94511
94512 /**
94513 * struct ttm_mem_global - Global memory accounting structure.
94514diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
94515index 49a8284..9643967 100644
94516--- a/include/drm/ttm/ttm_page_alloc.h
94517+++ b/include/drm/ttm/ttm_page_alloc.h
94518@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
94519 */
94520 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
94521
94522+struct device;
94523 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
94524 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
94525
94526diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
94527index 4b840e8..155d235 100644
94528--- a/include/keys/asymmetric-subtype.h
94529+++ b/include/keys/asymmetric-subtype.h
94530@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
94531 /* Verify the signature on a key of this subtype (optional) */
94532 int (*verify_signature)(const struct key *key,
94533 const struct public_key_signature *sig);
94534-};
94535+} __do_const;
94536
94537 /**
94538 * asymmetric_key_subtype - Get the subtype from an asymmetric key
94539diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
94540index c1da539..1dcec55 100644
94541--- a/include/linux/atmdev.h
94542+++ b/include/linux/atmdev.h
94543@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
94544 #endif
94545
94546 struct k_atm_aal_stats {
94547-#define __HANDLE_ITEM(i) atomic_t i
94548+#define __HANDLE_ITEM(i) atomic_unchecked_t i
94549 __AAL_STAT_ITEMS
94550 #undef __HANDLE_ITEM
94551 };
94552@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
94553 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
94554 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
94555 struct module *owner;
94556-};
94557+} __do_const ;
94558
94559 struct atmphy_ops {
94560 int (*start)(struct atm_dev *dev);
94561diff --git a/include/linux/atomic.h b/include/linux/atomic.h
94562index 5b08a85..60922fb 100644
94563--- a/include/linux/atomic.h
94564+++ b/include/linux/atomic.h
94565@@ -12,7 +12,7 @@
94566 * Atomically adds @a to @v, so long as @v was not already @u.
94567 * Returns non-zero if @v was not @u, and zero otherwise.
94568 */
94569-static inline int atomic_add_unless(atomic_t *v, int a, int u)
94570+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
94571 {
94572 return __atomic_add_unless(v, a, u) != u;
94573 }
94574diff --git a/include/linux/audit.h b/include/linux/audit.h
94575index c2e7e3a..8bfc0e1 100644
94576--- a/include/linux/audit.h
94577+++ b/include/linux/audit.h
94578@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
94579 extern unsigned int audit_serial(void);
94580 extern int auditsc_get_stamp(struct audit_context *ctx,
94581 struct timespec *t, unsigned int *serial);
94582-extern int audit_set_loginuid(kuid_t loginuid);
94583+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
94584
94585 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
94586 {
94587diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
94588index 576e463..28fd926 100644
94589--- a/include/linux/binfmts.h
94590+++ b/include/linux/binfmts.h
94591@@ -44,7 +44,7 @@ struct linux_binprm {
94592 unsigned interp_flags;
94593 unsigned interp_data;
94594 unsigned long loader, exec;
94595-};
94596+} __randomize_layout;
94597
94598 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
94599 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
94600@@ -77,8 +77,10 @@ struct linux_binfmt {
94601 int (*load_binary)(struct linux_binprm *);
94602 int (*load_shlib)(struct file *);
94603 int (*core_dump)(struct coredump_params *cprm);
94604+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
94605+ void (*handle_mmap)(struct file *);
94606 unsigned long min_coredump; /* minimal dump size */
94607-};
94608+} __do_const __randomize_layout;
94609
94610 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
94611
94612diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
94613index ea17cca..dd56e56 100644
94614--- a/include/linux/bitmap.h
94615+++ b/include/linux/bitmap.h
94616@@ -295,7 +295,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
94617 return find_first_zero_bit(src, nbits) == nbits;
94618 }
94619
94620-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
94621+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
94622 {
94623 if (small_const_nbits(nbits))
94624 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
94625diff --git a/include/linux/bitops.h b/include/linux/bitops.h
94626index 297f5bd..0b6d1e8 100644
94627--- a/include/linux/bitops.h
94628+++ b/include/linux/bitops.h
94629@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
94630 * @word: value to rotate
94631 * @shift: bits to roll
94632 */
94633-static inline __u32 rol32(__u32 word, unsigned int shift)
94634+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
94635 {
94636 return (word << shift) | (word >> (32 - shift));
94637 }
94638@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
94639 * @word: value to rotate
94640 * @shift: bits to roll
94641 */
94642-static inline __u32 ror32(__u32 word, unsigned int shift)
94643+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
94644 {
94645 return (word >> shift) | (word << (32 - shift));
94646 }
94647@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
94648 return (__s32)(value << shift) >> shift;
94649 }
94650
94651-static inline unsigned fls_long(unsigned long l)
94652+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
94653 {
94654 if (sizeof(l) == 4)
94655 return fls(l);
94656diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
94657index 5d93a66..978c4a0 100644
94658--- a/include/linux/blkdev.h
94659+++ b/include/linux/blkdev.h
94660@@ -1614,7 +1614,7 @@ struct block_device_operations {
94661 /* this callback is with swap_lock and sometimes page table lock held */
94662 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
94663 struct module *owner;
94664-};
94665+} __do_const;
94666
94667 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
94668 unsigned long);
94669diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
94670index afc1343..9735539 100644
94671--- a/include/linux/blktrace_api.h
94672+++ b/include/linux/blktrace_api.h
94673@@ -25,7 +25,7 @@ struct blk_trace {
94674 struct dentry *dropped_file;
94675 struct dentry *msg_file;
94676 struct list_head running_list;
94677- atomic_t dropped;
94678+ atomic_unchecked_t dropped;
94679 };
94680
94681 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
94682diff --git a/include/linux/cache.h b/include/linux/cache.h
94683index 17e7e82..1d7da26 100644
94684--- a/include/linux/cache.h
94685+++ b/include/linux/cache.h
94686@@ -16,6 +16,14 @@
94687 #define __read_mostly
94688 #endif
94689
94690+#ifndef __read_only
94691+#ifdef CONFIG_PAX_KERNEXEC
94692+#error KERNEXEC requires __read_only
94693+#else
94694+#define __read_only __read_mostly
94695+#endif
94696+#endif
94697+
94698 #ifndef ____cacheline_aligned
94699 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
94700 #endif
94701diff --git a/include/linux/capability.h b/include/linux/capability.h
94702index af9f0b9..71a5e5c 100644
94703--- a/include/linux/capability.h
94704+++ b/include/linux/capability.h
94705@@ -237,15 +237,28 @@ static inline bool capable(int cap)
94706 {
94707 return true;
94708 }
94709+static inline bool capable_nolog(int cap)
94710+{
94711+ return true;
94712+}
94713 static inline bool ns_capable(struct user_namespace *ns, int cap)
94714 {
94715 return true;
94716 }
94717+static inline bool ns_capable_nolog(struct user_namespace *ns, int cap)
94718+{
94719+ return true;
94720+}
94721 #endif /* CONFIG_MULTIUSER */
94722 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
94723+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
94724 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
94725+extern bool capable_nolog(int cap);
94726+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
94727
94728 /* audit system wants to get cap info from files as well */
94729 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
94730
94731+extern int is_privileged_binary(const struct dentry *dentry);
94732+
94733 #endif /* !_LINUX_CAPABILITY_H */
94734diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
94735index 8609d57..86e4d79 100644
94736--- a/include/linux/cdrom.h
94737+++ b/include/linux/cdrom.h
94738@@ -87,7 +87,6 @@ struct cdrom_device_ops {
94739
94740 /* driver specifications */
94741 const int capability; /* capability flags */
94742- int n_minors; /* number of active minor devices */
94743 /* handle uniform packets for scsi type devices (scsi,atapi) */
94744 int (*generic_packet) (struct cdrom_device_info *,
94745 struct packet_command *);
94746diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
94747index bda5ec0b4..51d8ea1 100644
94748--- a/include/linux/cleancache.h
94749+++ b/include/linux/cleancache.h
94750@@ -35,7 +35,7 @@ struct cleancache_ops {
94751 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
94752 void (*invalidate_inode)(int, struct cleancache_filekey);
94753 void (*invalidate_fs)(int);
94754-};
94755+} __no_const;
94756
94757 extern int cleancache_register_ops(struct cleancache_ops *ops);
94758 extern void __cleancache_init_fs(struct super_block *);
94759diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
94760index df69531..0180e68 100644
94761--- a/include/linux/clk-provider.h
94762+++ b/include/linux/clk-provider.h
94763@@ -195,6 +195,7 @@ struct clk_ops {
94764 void (*init)(struct clk_hw *hw);
94765 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
94766 };
94767+typedef struct clk_ops __no_const clk_ops_no_const;
94768
94769 /**
94770 * struct clk_init_data - holds init data that's common to all clocks and is
94771@@ -209,7 +210,7 @@ struct clk_ops {
94772 struct clk_init_data {
94773 const char *name;
94774 const struct clk_ops *ops;
94775- const char **parent_names;
94776+ const char * const *parent_names;
94777 u8 num_parents;
94778 unsigned long flags;
94779 };
94780@@ -426,12 +427,12 @@ extern const struct clk_ops clk_mux_ops;
94781 extern const struct clk_ops clk_mux_ro_ops;
94782
94783 struct clk *clk_register_mux(struct device *dev, const char *name,
94784- const char **parent_names, u8 num_parents, unsigned long flags,
94785+ const char * const *parent_names, u8 num_parents, unsigned long flags,
94786 void __iomem *reg, u8 shift, u8 width,
94787 u8 clk_mux_flags, spinlock_t *lock);
94788
94789 struct clk *clk_register_mux_table(struct device *dev, const char *name,
94790- const char **parent_names, u8 num_parents, unsigned long flags,
94791+ const char * const *parent_names, u8 num_parents, unsigned long flags,
94792 void __iomem *reg, u8 shift, u32 mask,
94793 u8 clk_mux_flags, u32 *table, spinlock_t *lock);
94794
94795diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h
94796index 94bad77..a39e810 100644
94797--- a/include/linux/clkdev.h
94798+++ b/include/linux/clkdev.h
94799@@ -32,7 +32,7 @@ struct clk_lookup {
94800 }
94801
94802 struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,
94803- const char *dev_fmt, ...);
94804+ const char *dev_fmt, ...) __printf(3, 4);
94805
94806 void clkdev_add(struct clk_lookup *cl);
94807 void clkdev_drop(struct clk_lookup *cl);
94808@@ -40,7 +40,8 @@ void clkdev_drop(struct clk_lookup *cl);
94809 void clkdev_add_table(struct clk_lookup *, size_t);
94810 int clk_add_alias(const char *, const char *, char *, struct device *);
94811
94812-int clk_register_clkdev(struct clk *, const char *, const char *, ...);
94813+int clk_register_clkdev(struct clk *, const char *, const char *, ...)
94814+ __printf(3, 4);
94815 int clk_register_clkdevs(struct clk *, struct clk_lookup *, size_t);
94816
94817 #ifdef CONFIG_COMMON_CLK
94818diff --git a/include/linux/compat.h b/include/linux/compat.h
94819index ab25814..63b52db 100644
94820--- a/include/linux/compat.h
94821+++ b/include/linux/compat.h
94822@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
94823 compat_size_t __user *len_ptr);
94824
94825 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
94826-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
94827+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
94828 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
94829 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
94830 compat_ssize_t msgsz, int msgflg);
94831@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
94832 long compat_sys_msgctl(int first, int second, void __user *uptr);
94833 long compat_sys_shmctl(int first, int second, void __user *uptr);
94834 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
94835- unsigned nsems, const struct compat_timespec __user *timeout);
94836+ compat_long_t nsems, const struct compat_timespec __user *timeout);
94837 asmlinkage long compat_sys_keyctl(u32 option,
94838 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
94839 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
94840@@ -424,7 +424,7 @@ asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv,
94841
94842 asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);
94843
94844-extern int compat_printk(const char *fmt, ...);
94845+extern __printf(1, 2) int compat_printk(const char *fmt, ...);
94846 extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat);
94847 extern void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set);
94848
94849@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
94850 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
94851 compat_ulong_t addr, compat_ulong_t data);
94852 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
94853- compat_long_t addr, compat_long_t data);
94854+ compat_ulong_t addr, compat_ulong_t data);
94855
94856 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
94857 /*
94858diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
94859index 371e560..e2e4e3e 100644
94860--- a/include/linux/compiler-gcc.h
94861+++ b/include/linux/compiler-gcc.h
94862@@ -108,8 +108,8 @@
94863 */
94864 #define __pure __attribute__((pure))
94865 #define __aligned(x) __attribute__((aligned(x)))
94866-#define __printf(a, b) __attribute__((format(printf, a, b)))
94867-#define __scanf(a, b) __attribute__((format(scanf, a, b)))
94868+#define __printf(a, b) __attribute__((format(printf, a, b))) __nocapture(a, b)
94869+#define __scanf(a, b) __attribute__((format(scanf, a, b))) __nocapture(a, b)
94870 #define noinline __attribute__((noinline))
94871 #define __attribute_const__ __attribute__((__const__))
94872 #define __maybe_unused __attribute__((unused))
94873diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
94874index 769e198..7ee7cb5 100644
94875--- a/include/linux/compiler-gcc4.h
94876+++ b/include/linux/compiler-gcc4.h
94877@@ -39,9 +39,38 @@
94878 # define __compiletime_warning(message) __attribute__((warning(message)))
94879 # define __compiletime_error(message) __attribute__((error(message)))
94880 #endif /* __CHECKER__ */
94881+
94882+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
94883+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
94884+#define __bos0(ptr) __bos((ptr), 0)
94885+#define __bos1(ptr) __bos((ptr), 1)
94886 #endif /* GCC_VERSION >= 40300 */
94887
94888 #if GCC_VERSION >= 40500
94889+
94890+#ifdef RANDSTRUCT_PLUGIN
94891+#define __randomize_layout __attribute__((randomize_layout))
94892+#define __no_randomize_layout __attribute__((no_randomize_layout))
94893+#endif
94894+
94895+#ifdef CONSTIFY_PLUGIN
94896+#define __no_const __attribute__((no_const))
94897+#define __do_const __attribute__((do_const))
94898+#endif
94899+
94900+#ifdef SIZE_OVERFLOW_PLUGIN
94901+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
94902+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
94903+#endif
94904+
94905+#ifdef LATENT_ENTROPY_PLUGIN
94906+#define __latent_entropy __attribute__((latent_entropy))
94907+#endif
94908+
94909+#ifdef INITIFY_PLUGIN
94910+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
94911+#endif
94912+
94913 /*
94914 * Mark a position in code as unreachable. This can be used to
94915 * suppress control flow warnings after asm blocks that transfer
94916diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
94917index efee493..8aa8f6b 100644
94918--- a/include/linux/compiler-gcc5.h
94919+++ b/include/linux/compiler-gcc5.h
94920@@ -28,6 +28,34 @@
94921 # define __compiletime_error(message) __attribute__((error(message)))
94922 #endif /* __CHECKER__ */
94923
94924+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
94925+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
94926+#define __bos0(ptr) __bos((ptr), 0)
94927+#define __bos1(ptr) __bos((ptr), 1)
94928+
94929+#ifdef RANDSTRUCT_PLUGIN
94930+#define __randomize_layout __attribute__((randomize_layout))
94931+#define __no_randomize_layout __attribute__((no_randomize_layout))
94932+#endif
94933+
94934+#ifdef CONSTIFY_PLUGIN
94935+#define __no_const __attribute__((no_const))
94936+#define __do_const __attribute__((do_const))
94937+#endif
94938+
94939+#ifdef SIZE_OVERFLOW_PLUGIN
94940+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
94941+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
94942+#endif
94943+
94944+#ifdef LATENT_ENTROPY_PLUGIN
94945+#define __latent_entropy __attribute__((latent_entropy))
94946+#endif
94947+
94948+#ifdef INITIFY_PLUGIN
94949+#define __nocapture(...) __attribute__((nocapture(__VA_ARGS__)))
94950+#endif
94951+
94952 /*
94953 * Mark a position in code as unreachable. This can be used to
94954 * suppress control flow warnings after asm blocks that transfer
94955diff --git a/include/linux/compiler.h b/include/linux/compiler.h
94956index 8677225..2d49df1 100644
94957--- a/include/linux/compiler.h
94958+++ b/include/linux/compiler.h
94959@@ -5,11 +5,14 @@
94960
94961 #ifdef __CHECKER__
94962 # define __user __attribute__((noderef, address_space(1)))
94963+# define __force_user __force __user
94964 # define __kernel __attribute__((address_space(0)))
94965+# define __force_kernel __force __kernel
94966 # define __safe __attribute__((safe))
94967 # define __force __attribute__((force))
94968 # define __nocast __attribute__((nocast))
94969 # define __iomem __attribute__((noderef, address_space(2)))
94970+# define __force_iomem __force __iomem
94971 # define __must_hold(x) __attribute__((context(x,1,1)))
94972 # define __acquires(x) __attribute__((context(x,0,1)))
94973 # define __releases(x) __attribute__((context(x,1,0)))
94974@@ -17,20 +20,37 @@
94975 # define __release(x) __context__(x,-1)
94976 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
94977 # define __percpu __attribute__((noderef, address_space(3)))
94978+# define __force_percpu __force __percpu
94979 #ifdef CONFIG_SPARSE_RCU_POINTER
94980 # define __rcu __attribute__((noderef, address_space(4)))
94981+# define __force_rcu __force __rcu
94982 #else
94983 # define __rcu
94984+# define __force_rcu
94985 #endif
94986 extern void __chk_user_ptr(const volatile void __user *);
94987 extern void __chk_io_ptr(const volatile void __iomem *);
94988 #else
94989-# define __user
94990-# define __kernel
94991+# ifdef CHECKER_PLUGIN
94992+//# define __user
94993+//# define __force_user
94994+//# define __kernel
94995+//# define __force_kernel
94996+# else
94997+# ifdef STRUCTLEAK_PLUGIN
94998+# define __user __attribute__((user))
94999+# else
95000+# define __user
95001+# endif
95002+# define __force_user
95003+# define __kernel
95004+# define __force_kernel
95005+# endif
95006 # define __safe
95007 # define __force
95008 # define __nocast
95009 # define __iomem
95010+# define __force_iomem
95011 # define __chk_user_ptr(x) (void)0
95012 # define __chk_io_ptr(x) (void)0
95013 # define __builtin_warning(x, y...) (1)
95014@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
95015 # define __release(x) (void)0
95016 # define __cond_lock(x,c) (c)
95017 # define __percpu
95018+# define __force_percpu
95019 # define __rcu
95020+# define __force_rcu
95021 #endif
95022
95023 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
95024@@ -199,27 +221,27 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
95025 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
95026 {
95027 switch (size) {
95028- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
95029- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
95030- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
95031- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
95032+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
95033+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
95034+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
95035+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
95036 default:
95037 barrier();
95038- __builtin_memcpy((void *)res, (const void *)p, size);
95039+ __builtin_memcpy(res, (const void *)p, size);
95040 barrier();
95041 }
95042 }
95043
95044-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
95045+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
95046 {
95047 switch (size) {
95048- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
95049- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
95050- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
95051- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
95052+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
95053+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
95054+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
95055+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
95056 default:
95057 barrier();
95058- __builtin_memcpy((void *)p, (const void *)res, size);
95059+ __builtin_memcpy((void *)p, res, size);
95060 barrier();
95061 }
95062 }
95063@@ -352,6 +374,38 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95064 # define __attribute_const__ /* unimplemented */
95065 #endif
95066
95067+#ifndef __randomize_layout
95068+# define __randomize_layout
95069+#endif
95070+
95071+#ifndef __no_randomize_layout
95072+# define __no_randomize_layout
95073+#endif
95074+
95075+#ifndef __no_const
95076+# define __no_const
95077+#endif
95078+
95079+#ifndef __do_const
95080+# define __do_const
95081+#endif
95082+
95083+#ifndef __size_overflow
95084+# define __size_overflow(...)
95085+#endif
95086+
95087+#ifndef __intentional_overflow
95088+# define __intentional_overflow(...)
95089+#endif
95090+
95091+#ifndef __latent_entropy
95092+# define __latent_entropy
95093+#endif
95094+
95095+#ifndef __nocapture
95096+# define __nocapture(...)
95097+#endif
95098+
95099 /*
95100 * Tell gcc if a function is cold. The compiler will assume any path
95101 * directly leading to the call is unlikely.
95102@@ -361,6 +415,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95103 #define __cold
95104 #endif
95105
95106+#ifndef __alloc_size
95107+#define __alloc_size(...)
95108+#endif
95109+
95110+#ifndef __bos
95111+#define __bos(ptr, arg)
95112+#endif
95113+
95114+#ifndef __bos0
95115+#define __bos0(ptr)
95116+#endif
95117+
95118+#ifndef __bos1
95119+#define __bos1(ptr)
95120+#endif
95121+
95122 /* Simple shorthand for a section definition */
95123 #ifndef __section
95124 # define __section(S) __attribute__ ((__section__(#S)))
95125@@ -375,6 +445,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95126 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
95127 #endif
95128
95129+#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))
95130+
95131 /* Is this type a native word size -- useful for atomic operations */
95132 #ifndef __native_word
95133 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
95134@@ -454,8 +526,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
95135 */
95136 #define __ACCESS_ONCE(x) ({ \
95137 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
95138- (volatile typeof(x) *)&(x); })
95139+ (volatile const typeof(x) *)&(x); })
95140 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
95141+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
95142
95143 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
95144 #ifdef CONFIG_KPROBES
95145diff --git a/include/linux/completion.h b/include/linux/completion.h
95146index 5d5aaae..0ea9b84 100644
95147--- a/include/linux/completion.h
95148+++ b/include/linux/completion.h
95149@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
95150
95151 extern void wait_for_completion(struct completion *);
95152 extern void wait_for_completion_io(struct completion *);
95153-extern int wait_for_completion_interruptible(struct completion *x);
95154-extern int wait_for_completion_killable(struct completion *x);
95155+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
95156+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
95157 extern unsigned long wait_for_completion_timeout(struct completion *x,
95158- unsigned long timeout);
95159+ unsigned long timeout) __intentional_overflow(-1);
95160 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
95161- unsigned long timeout);
95162+ unsigned long timeout) __intentional_overflow(-1);
95163 extern long wait_for_completion_interruptible_timeout(
95164- struct completion *x, unsigned long timeout);
95165+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
95166 extern long wait_for_completion_killable_timeout(
95167- struct completion *x, unsigned long timeout);
95168+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
95169 extern bool try_wait_for_completion(struct completion *x);
95170 extern bool completion_done(struct completion *x);
95171
95172diff --git a/include/linux/configfs.h b/include/linux/configfs.h
95173index 34025df..9c263df 100644
95174--- a/include/linux/configfs.h
95175+++ b/include/linux/configfs.h
95176@@ -64,7 +64,8 @@ struct config_item {
95177 struct dentry *ci_dentry;
95178 };
95179
95180-extern int config_item_set_name(struct config_item *, const char *, ...);
95181+extern __printf(2, 3)
95182+int config_item_set_name(struct config_item *, const char *, ...);
95183
95184 static inline char *config_item_name(struct config_item * item)
95185 {
95186@@ -125,7 +126,7 @@ struct configfs_attribute {
95187 const char *ca_name;
95188 struct module *ca_owner;
95189 umode_t ca_mode;
95190-};
95191+} __do_const;
95192
95193 /*
95194 * Users often need to create attribute structures for their configurable
95195diff --git a/include/linux/cpu.h b/include/linux/cpu.h
95196index c0fb6b1..23c30bd 100644
95197--- a/include/linux/cpu.h
95198+++ b/include/linux/cpu.h
95199@@ -40,9 +40,10 @@ extern void cpu_remove_dev_attr(struct device_attribute *attr);
95200 extern int cpu_add_dev_attr_group(struct attribute_group *attrs);
95201 extern void cpu_remove_dev_attr_group(struct attribute_group *attrs);
95202
95203-extern struct device *cpu_device_create(struct device *parent, void *drvdata,
95204- const struct attribute_group **groups,
95205- const char *fmt, ...);
95206+extern __printf(4, 5)
95207+struct device *cpu_device_create(struct device *parent, void *drvdata,
95208+ const struct attribute_group **groups,
95209+ const char *fmt, ...);
95210 #ifdef CONFIG_HOTPLUG_CPU
95211 extern void unregister_cpu(struct cpu *cpu);
95212 extern ssize_t arch_cpu_probe(const char *, size_t);
95213diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
95214index 2ee4888..0451f5e 100644
95215--- a/include/linux/cpufreq.h
95216+++ b/include/linux/cpufreq.h
95217@@ -207,6 +207,7 @@ struct global_attr {
95218 ssize_t (*store)(struct kobject *a, struct attribute *b,
95219 const char *c, size_t count);
95220 };
95221+typedef struct global_attr __no_const global_attr_no_const;
95222
95223 #define define_one_global_ro(_name) \
95224 static struct global_attr _name = \
95225@@ -278,7 +279,7 @@ struct cpufreq_driver {
95226 bool boost_supported;
95227 bool boost_enabled;
95228 int (*set_boost)(int state);
95229-};
95230+} __do_const;
95231
95232 /* flags */
95233 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
95234diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
95235index 9c5e892..feb34e0 100644
95236--- a/include/linux/cpuidle.h
95237+++ b/include/linux/cpuidle.h
95238@@ -59,7 +59,8 @@ struct cpuidle_state {
95239 void (*enter_freeze) (struct cpuidle_device *dev,
95240 struct cpuidle_driver *drv,
95241 int index);
95242-};
95243+} __do_const;
95244+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
95245
95246 /* Idle State Flags */
95247 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
95248@@ -227,7 +228,7 @@ struct cpuidle_governor {
95249 void (*reflect) (struct cpuidle_device *dev, int index);
95250
95251 struct module *owner;
95252-};
95253+} __do_const;
95254
95255 #ifdef CONFIG_CPU_IDLE
95256 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
95257diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
95258index 59915ea..81ebec0 100644
95259--- a/include/linux/cpumask.h
95260+++ b/include/linux/cpumask.h
95261@@ -127,17 +127,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
95262 }
95263
95264 /* Valid inputs for n are -1 and 0. */
95265-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95266+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
95267 {
95268 return n+1;
95269 }
95270
95271-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95272+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
95273 {
95274 return n+1;
95275 }
95276
95277-static inline unsigned int cpumask_next_and(int n,
95278+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
95279 const struct cpumask *srcp,
95280 const struct cpumask *andp)
95281 {
95282@@ -181,7 +181,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
95283 *
95284 * Returns >= nr_cpu_ids if no further cpus set.
95285 */
95286-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95287+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
95288 {
95289 /* -1 is a legal arg here. */
95290 if (n != -1)
95291@@ -196,7 +196,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
95292 *
95293 * Returns >= nr_cpu_ids if no further cpus unset.
95294 */
95295-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95296+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
95297 {
95298 /* -1 is a legal arg here. */
95299 if (n != -1)
95300@@ -204,7 +204,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
95301 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
95302 }
95303
95304-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
95305+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
95306 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
95307 unsigned int cpumask_local_spread(unsigned int i, int node);
95308
95309@@ -471,7 +471,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
95310 * cpumask_weight - Count of bits in *srcp
95311 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
95312 */
95313-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
95314+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
95315 {
95316 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
95317 }
95318diff --git a/include/linux/cred.h b/include/linux/cred.h
95319index 8b6c083..51cb9f5 100644
95320--- a/include/linux/cred.h
95321+++ b/include/linux/cred.h
95322@@ -35,7 +35,7 @@ struct group_info {
95323 int nblocks;
95324 kgid_t small_block[NGROUPS_SMALL];
95325 kgid_t *blocks[0];
95326-};
95327+} __randomize_layout;
95328
95329 /**
95330 * get_group_info - Get a reference to a group info structure
95331@@ -152,7 +152,7 @@ struct cred {
95332 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
95333 struct group_info *group_info; /* supplementary groups for euid/fsgid */
95334 struct rcu_head rcu; /* RCU deletion hook */
95335-};
95336+} __randomize_layout;
95337
95338 extern void __put_cred(struct cred *);
95339 extern void exit_creds(struct task_struct *);
95340@@ -210,6 +210,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
95341 static inline void validate_process_creds(void)
95342 {
95343 }
95344+static inline void validate_task_creds(struct task_struct *task)
95345+{
95346+}
95347 #endif
95348
95349 /**
95350@@ -347,6 +350,7 @@ static inline void put_cred(const struct cred *_cred)
95351
95352 #define task_uid(task) (task_cred_xxx((task), uid))
95353 #define task_euid(task) (task_cred_xxx((task), euid))
95354+#define task_securebits(task) (task_cred_xxx((task), securebits))
95355
95356 #define current_cred_xxx(xxx) \
95357 ({ \
95358diff --git a/include/linux/crypto.h b/include/linux/crypto.h
95359index 10df5d2..503d678 100644
95360--- a/include/linux/crypto.h
95361+++ b/include/linux/crypto.h
95362@@ -632,7 +632,7 @@ struct cipher_tfm {
95363 const u8 *key, unsigned int keylen);
95364 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
95365 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
95366-};
95367+} __no_const;
95368
95369 struct hash_tfm {
95370 int (*init)(struct hash_desc *desc);
95371@@ -653,13 +653,13 @@ struct compress_tfm {
95372 int (*cot_decompress)(struct crypto_tfm *tfm,
95373 const u8 *src, unsigned int slen,
95374 u8 *dst, unsigned int *dlen);
95375-};
95376+} __no_const;
95377
95378 struct rng_tfm {
95379 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
95380 unsigned int dlen);
95381 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
95382-};
95383+} __no_const;
95384
95385 #define crt_ablkcipher crt_u.ablkcipher
95386 #define crt_aead crt_u.aead
95387diff --git a/include/linux/ctype.h b/include/linux/ctype.h
95388index 653589e..4ef254a 100644
95389--- a/include/linux/ctype.h
95390+++ b/include/linux/ctype.h
95391@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
95392 * Fast implementation of tolower() for internal usage. Do not use in your
95393 * code.
95394 */
95395-static inline char _tolower(const char c)
95396+static inline unsigned char _tolower(const unsigned char c)
95397 {
95398 return c | 0x20;
95399 }
95400diff --git a/include/linux/dcache.h b/include/linux/dcache.h
95401index df334cb..e730faa 100644
95402--- a/include/linux/dcache.h
95403+++ b/include/linux/dcache.h
95404@@ -123,6 +123,9 @@ struct dentry {
95405 unsigned long d_time; /* used by d_revalidate */
95406 void *d_fsdata; /* fs-specific data */
95407
95408+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
95409+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
95410+#endif
95411 struct list_head d_lru; /* LRU list */
95412 struct list_head d_child; /* child of parent list */
95413 struct list_head d_subdirs; /* our children */
95414@@ -133,7 +136,7 @@ struct dentry {
95415 struct hlist_node d_alias; /* inode alias list */
95416 struct rcu_head d_rcu;
95417 } d_u;
95418-};
95419+} __randomize_layout;
95420
95421 /*
95422 * dentry->d_lock spinlock nesting subclasses:
95423@@ -319,13 +322,14 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
95424
95425 static inline unsigned d_count(const struct dentry *dentry)
95426 {
95427- return dentry->d_lockref.count;
95428+ return __lockref_read(&dentry->d_lockref);
95429 }
95430
95431 /*
95432 * helper function for dentry_operations.d_dname() members
95433 */
95434-extern char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
95435+extern __printf(4, 5)
95436+char *dynamic_dname(struct dentry *, char *, int, const char *, ...);
95437 extern char *simple_dname(struct dentry *, char *, int);
95438
95439 extern char *__d_path(const struct path *, const struct path *, char *, int);
95440@@ -347,7 +351,7 @@ extern char *dentry_path(struct dentry *, char *, int);
95441 static inline struct dentry *dget_dlock(struct dentry *dentry)
95442 {
95443 if (dentry)
95444- dentry->d_lockref.count++;
95445+ __lockref_inc(&dentry->d_lockref);
95446 return dentry;
95447 }
95448
95449diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
95450index 7925bf0..d5143d2 100644
95451--- a/include/linux/decompress/mm.h
95452+++ b/include/linux/decompress/mm.h
95453@@ -77,7 +77,7 @@ static void free(void *where)
95454 * warnings when not needed (indeed large_malloc / large_free are not
95455 * needed by inflate */
95456
95457-#define malloc(a) kmalloc(a, GFP_KERNEL)
95458+#define malloc(a) kmalloc((a), GFP_KERNEL)
95459 #define free(a) kfree(a)
95460
95461 #define large_malloc(a) vmalloc(a)
95462diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
95463index ce447f0..83c66bd 100644
95464--- a/include/linux/devfreq.h
95465+++ b/include/linux/devfreq.h
95466@@ -114,7 +114,7 @@ struct devfreq_governor {
95467 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
95468 int (*event_handler)(struct devfreq *devfreq,
95469 unsigned int event, void *data);
95470-};
95471+} __do_const;
95472
95473 /**
95474 * struct devfreq - Device devfreq structure
95475diff --git a/include/linux/device.h b/include/linux/device.h
95476index 6558af9..48bce1a 100644
95477--- a/include/linux/device.h
95478+++ b/include/linux/device.h
95479@@ -312,7 +312,7 @@ struct subsys_interface {
95480 struct list_head node;
95481 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
95482 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
95483-};
95484+} __do_const;
95485
95486 int subsys_interface_register(struct subsys_interface *sif);
95487 void subsys_interface_unregister(struct subsys_interface *sif);
95488@@ -508,7 +508,7 @@ struct device_type {
95489 void (*release)(struct device *dev);
95490
95491 const struct dev_pm_ops *pm;
95492-};
95493+} __do_const;
95494
95495 /* interface for exporting device attributes */
95496 struct device_attribute {
95497@@ -518,11 +518,12 @@ struct device_attribute {
95498 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
95499 const char *buf, size_t count);
95500 };
95501+typedef struct device_attribute __no_const device_attribute_no_const;
95502
95503 struct dev_ext_attribute {
95504 struct device_attribute attr;
95505 void *var;
95506-};
95507+} __do_const;
95508
95509 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
95510 char *buf);
95511@@ -607,8 +608,9 @@ extern int devres_release_group(struct device *dev, void *id);
95512
95513 /* managed devm_k.alloc/kfree for device drivers */
95514 extern void *devm_kmalloc(struct device *dev, size_t size, gfp_t gfp);
95515-extern char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
95516- va_list ap);
95517+extern __printf(3, 0)
95518+char *devm_kvasprintf(struct device *dev, gfp_t gfp, const char *fmt,
95519+ va_list ap);
95520 extern __printf(3, 4)
95521 char *devm_kasprintf(struct device *dev, gfp_t gfp, const char *fmt, ...);
95522 static inline void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp)
95523@@ -980,12 +982,10 @@ extern int __must_check device_reprobe(struct device *dev);
95524 /*
95525 * Easy functions for dynamically creating devices on the fly
95526 */
95527-extern struct device *device_create_vargs(struct class *cls,
95528- struct device *parent,
95529- dev_t devt,
95530- void *drvdata,
95531- const char *fmt,
95532- va_list vargs);
95533+extern __printf(5, 0)
95534+struct device *device_create_vargs(struct class *cls, struct device *parent,
95535+ dev_t devt, void *drvdata,
95536+ const char *fmt, va_list vargs);
95537 extern __printf(5, 6)
95538 struct device *device_create(struct class *cls, struct device *parent,
95539 dev_t devt, void *drvdata,
95540diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
95541index ac07ff0..edff186 100644
95542--- a/include/linux/dma-mapping.h
95543+++ b/include/linux/dma-mapping.h
95544@@ -64,7 +64,7 @@ struct dma_map_ops {
95545 u64 (*get_required_mask)(struct device *dev);
95546 #endif
95547 int is_phys;
95548-};
95549+} __do_const;
95550
95551 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
95552
95553diff --git a/include/linux/efi.h b/include/linux/efi.h
95554index af5be03..d8a6ae2 100644
95555--- a/include/linux/efi.h
95556+++ b/include/linux/efi.h
95557@@ -1057,6 +1057,7 @@ struct efivar_operations {
95558 efi_set_variable_nonblocking_t *set_variable_nonblocking;
95559 efi_query_variable_store_t *query_variable_store;
95560 };
95561+typedef struct efivar_operations __no_const efivar_operations_no_const;
95562
95563 struct efivars {
95564 /*
95565diff --git a/include/linux/elf.h b/include/linux/elf.h
95566index 20fa8d8..3d0dd18 100644
95567--- a/include/linux/elf.h
95568+++ b/include/linux/elf.h
95569@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
95570 #define elf_note elf32_note
95571 #define elf_addr_t Elf32_Off
95572 #define Elf_Half Elf32_Half
95573+#define elf_dyn Elf32_Dyn
95574
95575 #else
95576
95577@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
95578 #define elf_note elf64_note
95579 #define elf_addr_t Elf64_Off
95580 #define Elf_Half Elf64_Half
95581+#define elf_dyn Elf64_Dyn
95582
95583 #endif
95584
95585diff --git a/include/linux/err.h b/include/linux/err.h
95586index a729120..6ede2c9 100644
95587--- a/include/linux/err.h
95588+++ b/include/linux/err.h
95589@@ -20,12 +20,12 @@
95590
95591 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
95592
95593-static inline void * __must_check ERR_PTR(long error)
95594+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
95595 {
95596 return (void *) error;
95597 }
95598
95599-static inline long __must_check PTR_ERR(__force const void *ptr)
95600+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
95601 {
95602 return (long) ptr;
95603 }
95604diff --git a/include/linux/extcon.h b/include/linux/extcon.h
95605index 36f49c4..a2a1f4c 100644
95606--- a/include/linux/extcon.h
95607+++ b/include/linux/extcon.h
95608@@ -135,7 +135,7 @@ struct extcon_dev {
95609 /* /sys/class/extcon/.../mutually_exclusive/... */
95610 struct attribute_group attr_g_muex;
95611 struct attribute **attrs_muex;
95612- struct device_attribute *d_attrs_muex;
95613+ device_attribute_no_const *d_attrs_muex;
95614 };
95615
95616 /**
95617diff --git a/include/linux/fb.h b/include/linux/fb.h
95618index 043f328..180ccbf 100644
95619--- a/include/linux/fb.h
95620+++ b/include/linux/fb.h
95621@@ -305,7 +305,8 @@ struct fb_ops {
95622 /* called at KDB enter and leave time to prepare the console */
95623 int (*fb_debug_enter)(struct fb_info *info);
95624 int (*fb_debug_leave)(struct fb_info *info);
95625-};
95626+} __do_const;
95627+typedef struct fb_ops __no_const fb_ops_no_const;
95628
95629 #ifdef CONFIG_FB_TILEBLITTING
95630 #define FB_TILE_CURSOR_NONE 0
95631diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
95632index 230f87b..1fd0485 100644
95633--- a/include/linux/fdtable.h
95634+++ b/include/linux/fdtable.h
95635@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
95636 void put_files_struct(struct files_struct *fs);
95637 void reset_files_struct(struct files_struct *);
95638 int unshare_files(struct files_struct **);
95639-struct files_struct *dup_fd(struct files_struct *, int *);
95640+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
95641 void do_close_on_exec(struct files_struct *);
95642 int iterate_fd(struct files_struct *, unsigned,
95643 int (*)(const void *, struct file *, unsigned),
95644diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
95645index 8293262..2b3b8bd 100644
95646--- a/include/linux/frontswap.h
95647+++ b/include/linux/frontswap.h
95648@@ -11,7 +11,7 @@ struct frontswap_ops {
95649 int (*load)(unsigned, pgoff_t, struct page *);
95650 void (*invalidate_page)(unsigned, pgoff_t);
95651 void (*invalidate_area)(unsigned);
95652-};
95653+} __no_const;
95654
95655 extern bool frontswap_enabled;
95656 extern struct frontswap_ops *
95657diff --git a/include/linux/fs.h b/include/linux/fs.h
95658index 571aab9..03a5b06 100644
95659--- a/include/linux/fs.h
95660+++ b/include/linux/fs.h
95661@@ -437,7 +437,7 @@ struct address_space {
95662 spinlock_t private_lock; /* for use by the address_space */
95663 struct list_head private_list; /* ditto */
95664 void *private_data; /* ditto */
95665-} __attribute__((aligned(sizeof(long))));
95666+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
95667 /*
95668 * On most architectures that alignment is already the case; but
95669 * must be enforced here for CRIS, to let the least significant bit
95670@@ -480,7 +480,7 @@ struct block_device {
95671 int bd_fsfreeze_count;
95672 /* Mutex for freeze */
95673 struct mutex bd_fsfreeze_mutex;
95674-};
95675+} __randomize_layout;
95676
95677 /*
95678 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
95679@@ -666,7 +666,7 @@ struct inode {
95680 #endif
95681
95682 void *i_private; /* fs or device private pointer */
95683-};
95684+} __randomize_layout;
95685
95686 static inline int inode_unhashed(struct inode *inode)
95687 {
95688@@ -861,7 +861,7 @@ struct file {
95689 struct list_head f_tfile_llink;
95690 #endif /* #ifdef CONFIG_EPOLL */
95691 struct address_space *f_mapping;
95692-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
95693+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
95694
95695 struct file_handle {
95696 __u32 handle_bytes;
95697@@ -990,7 +990,7 @@ struct file_lock {
95698 int state; /* state of grant or error if -ve */
95699 } afs;
95700 } fl_u;
95701-};
95702+} __randomize_layout;
95703
95704 struct file_lock_context {
95705 spinlock_t flc_lock;
95706@@ -1351,7 +1351,7 @@ struct super_block {
95707 * Indicates how deep in a filesystem stack this SB is
95708 */
95709 int s_stack_depth;
95710-};
95711+} __randomize_layout;
95712
95713 extern struct timespec current_fs_time(struct super_block *sb);
95714
95715@@ -1603,7 +1603,8 @@ struct file_operations {
95716 #ifndef CONFIG_MMU
95717 unsigned (*mmap_capabilities)(struct file *);
95718 #endif
95719-};
95720+} __do_const __randomize_layout;
95721+typedef struct file_operations __no_const file_operations_no_const;
95722
95723 struct inode_operations {
95724 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
95725@@ -2303,7 +2304,7 @@ extern int register_chrdev_region(dev_t, unsigned, const char *);
95726 extern int __register_chrdev(unsigned int major, unsigned int baseminor,
95727 unsigned int count, const char *name,
95728 const struct file_operations *fops);
95729-extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
95730+extern __nocapture(4) void __unregister_chrdev(unsigned int major, unsigned int baseminor,
95731 unsigned int count, const char *name);
95732 extern void unregister_chrdev_region(dev_t, unsigned);
95733 extern void chrdev_show(struct seq_file *,off_t);
95734@@ -2989,4 +2990,14 @@ static inline bool dir_relax(struct inode *inode)
95735 return !IS_DEADDIR(inode);
95736 }
95737
95738+static inline bool is_sidechannel_device(const struct inode *inode)
95739+{
95740+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
95741+ umode_t mode = inode->i_mode;
95742+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
95743+#else
95744+ return false;
95745+#endif
95746+}
95747+
95748 #endif /* _LINUX_FS_H */
95749diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
95750index 0efc3e6..fd23610 100644
95751--- a/include/linux/fs_struct.h
95752+++ b/include/linux/fs_struct.h
95753@@ -6,13 +6,13 @@
95754 #include <linux/seqlock.h>
95755
95756 struct fs_struct {
95757- int users;
95758+ atomic_t users;
95759 spinlock_t lock;
95760 seqcount_t seq;
95761 int umask;
95762 int in_exec;
95763 struct path root, pwd;
95764-};
95765+} __randomize_layout;
95766
95767 extern struct kmem_cache *fs_cachep;
95768
95769diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
95770index 7714849..a4a5c7a 100644
95771--- a/include/linux/fscache-cache.h
95772+++ b/include/linux/fscache-cache.h
95773@@ -113,7 +113,7 @@ struct fscache_operation {
95774 fscache_operation_release_t release;
95775 };
95776
95777-extern atomic_t fscache_op_debug_id;
95778+extern atomic_unchecked_t fscache_op_debug_id;
95779 extern void fscache_op_work_func(struct work_struct *work);
95780
95781 extern void fscache_enqueue_operation(struct fscache_operation *);
95782@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
95783 INIT_WORK(&op->work, fscache_op_work_func);
95784 atomic_set(&op->usage, 1);
95785 op->state = FSCACHE_OP_ST_INITIALISED;
95786- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
95787+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
95788 op->processor = processor;
95789 op->release = release;
95790 INIT_LIST_HEAD(&op->pend_link);
95791diff --git a/include/linux/fscache.h b/include/linux/fscache.h
95792index 115bb81..e7b812b 100644
95793--- a/include/linux/fscache.h
95794+++ b/include/linux/fscache.h
95795@@ -152,7 +152,7 @@ struct fscache_cookie_def {
95796 * - this is mandatory for any object that may have data
95797 */
95798 void (*now_uncached)(void *cookie_netfs_data);
95799-};
95800+} __do_const;
95801
95802 /*
95803 * fscache cached network filesystem type
95804diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
95805index 7ee1774..72505b8 100644
95806--- a/include/linux/fsnotify.h
95807+++ b/include/linux/fsnotify.h
95808@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
95809 struct inode *inode = file_inode(file);
95810 __u32 mask = FS_ACCESS;
95811
95812+ if (is_sidechannel_device(inode))
95813+ return;
95814+
95815 if (S_ISDIR(inode->i_mode))
95816 mask |= FS_ISDIR;
95817
95818@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
95819 struct inode *inode = file_inode(file);
95820 __u32 mask = FS_MODIFY;
95821
95822+ if (is_sidechannel_device(inode))
95823+ return;
95824+
95825 if (S_ISDIR(inode->i_mode))
95826 mask |= FS_ISDIR;
95827
95828@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
95829 */
95830 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
95831 {
95832- return kstrdup(name, GFP_KERNEL);
95833+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
95834 }
95835
95836 /*
95837diff --git a/include/linux/genhd.h b/include/linux/genhd.h
95838index ec274e0..e678159 100644
95839--- a/include/linux/genhd.h
95840+++ b/include/linux/genhd.h
95841@@ -194,7 +194,7 @@ struct gendisk {
95842 struct kobject *slave_dir;
95843
95844 struct timer_rand_state *random;
95845- atomic_t sync_io; /* RAID */
95846+ atomic_unchecked_t sync_io; /* RAID */
95847 struct disk_events *ev;
95848 #ifdef CONFIG_BLK_DEV_INTEGRITY
95849 struct blk_integrity *integrity;
95850@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
95851 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
95852
95853 /* drivers/char/random.c */
95854-extern void add_disk_randomness(struct gendisk *disk);
95855+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
95856 extern void rand_initialize_disk(struct gendisk *disk);
95857
95858 static inline sector_t get_start_sect(struct block_device *bdev)
95859diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
95860index 667c311..abac2a7 100644
95861--- a/include/linux/genl_magic_func.h
95862+++ b/include/linux/genl_magic_func.h
95863@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
95864 },
95865
95866 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
95867-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
95868+static struct genl_ops ZZZ_genl_ops[] = {
95869 #include GENL_MAGIC_INCLUDE_FILE
95870 };
95871
95872diff --git a/include/linux/gfp.h b/include/linux/gfp.h
95873index 15928f0..90b31d7 100644
95874--- a/include/linux/gfp.h
95875+++ b/include/linux/gfp.h
95876@@ -35,6 +35,13 @@ struct vm_area_struct;
95877 #define ___GFP_NO_KSWAPD 0x400000u
95878 #define ___GFP_OTHER_NODE 0x800000u
95879 #define ___GFP_WRITE 0x1000000u
95880+
95881+#ifdef CONFIG_PAX_USERCOPY_SLABS
95882+#define ___GFP_USERCOPY 0x2000000u
95883+#else
95884+#define ___GFP_USERCOPY 0
95885+#endif
95886+
95887 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
95888
95889 /*
95890@@ -94,6 +101,7 @@ struct vm_area_struct;
95891 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
95892 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
95893 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
95894+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
95895
95896 /*
95897 * This may seem redundant, but it's a way of annotating false positives vs.
95898@@ -101,7 +109,7 @@ struct vm_area_struct;
95899 */
95900 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
95901
95902-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
95903+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
95904 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
95905
95906 /* This equals 0, but use constants in case they ever change */
95907@@ -146,6 +154,8 @@ struct vm_area_struct;
95908 /* 4GB DMA on some platforms */
95909 #define GFP_DMA32 __GFP_DMA32
95910
95911+#define GFP_USERCOPY __GFP_USERCOPY
95912+
95913 /* Convert GFP flags to their corresponding migrate type */
95914 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
95915 {
95916diff --git a/include/linux/gracl.h b/include/linux/gracl.h
95917new file mode 100644
95918index 0000000..91858e4
95919--- /dev/null
95920+++ b/include/linux/gracl.h
95921@@ -0,0 +1,342 @@
95922+#ifndef GR_ACL_H
95923+#define GR_ACL_H
95924+
95925+#include <linux/grdefs.h>
95926+#include <linux/resource.h>
95927+#include <linux/capability.h>
95928+#include <linux/dcache.h>
95929+#include <asm/resource.h>
95930+
95931+/* Major status information */
95932+
95933+#define GR_VERSION "grsecurity 3.1"
95934+#define GRSECURITY_VERSION 0x3100
95935+
95936+enum {
95937+ GR_SHUTDOWN = 0,
95938+ GR_ENABLE = 1,
95939+ GR_SPROLE = 2,
95940+ GR_OLDRELOAD = 3,
95941+ GR_SEGVMOD = 4,
95942+ GR_STATUS = 5,
95943+ GR_UNSPROLE = 6,
95944+ GR_PASSSET = 7,
95945+ GR_SPROLEPAM = 8,
95946+ GR_RELOAD = 9,
95947+};
95948+
95949+/* Password setup definitions
95950+ * kernel/grhash.c */
95951+enum {
95952+ GR_PW_LEN = 128,
95953+ GR_SALT_LEN = 16,
95954+ GR_SHA_LEN = 32,
95955+};
95956+
95957+enum {
95958+ GR_SPROLE_LEN = 64,
95959+};
95960+
95961+enum {
95962+ GR_NO_GLOB = 0,
95963+ GR_REG_GLOB,
95964+ GR_CREATE_GLOB
95965+};
95966+
95967+#define GR_NLIMITS 32
95968+
95969+/* Begin Data Structures */
95970+
95971+struct sprole_pw {
95972+ unsigned char *rolename;
95973+ unsigned char salt[GR_SALT_LEN];
95974+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
95975+};
95976+
95977+struct name_entry {
95978+ __u32 key;
95979+ u64 inode;
95980+ dev_t device;
95981+ char *name;
95982+ __u16 len;
95983+ __u8 deleted;
95984+ struct name_entry *prev;
95985+ struct name_entry *next;
95986+};
95987+
95988+struct inodev_entry {
95989+ struct name_entry *nentry;
95990+ struct inodev_entry *prev;
95991+ struct inodev_entry *next;
95992+};
95993+
95994+struct acl_role_db {
95995+ struct acl_role_label **r_hash;
95996+ __u32 r_size;
95997+};
95998+
95999+struct inodev_db {
96000+ struct inodev_entry **i_hash;
96001+ __u32 i_size;
96002+};
96003+
96004+struct name_db {
96005+ struct name_entry **n_hash;
96006+ __u32 n_size;
96007+};
96008+
96009+struct crash_uid {
96010+ uid_t uid;
96011+ unsigned long expires;
96012+};
96013+
96014+struct gr_hash_struct {
96015+ void **table;
96016+ void **nametable;
96017+ void *first;
96018+ __u32 table_size;
96019+ __u32 used_size;
96020+ int type;
96021+};
96022+
96023+/* Userspace Grsecurity ACL data structures */
96024+
96025+struct acl_subject_label {
96026+ char *filename;
96027+ u64 inode;
96028+ dev_t device;
96029+ __u32 mode;
96030+ kernel_cap_t cap_mask;
96031+ kernel_cap_t cap_lower;
96032+ kernel_cap_t cap_invert_audit;
96033+
96034+ struct rlimit res[GR_NLIMITS];
96035+ __u32 resmask;
96036+
96037+ __u8 user_trans_type;
96038+ __u8 group_trans_type;
96039+ uid_t *user_transitions;
96040+ gid_t *group_transitions;
96041+ __u16 user_trans_num;
96042+ __u16 group_trans_num;
96043+
96044+ __u32 sock_families[2];
96045+ __u32 ip_proto[8];
96046+ __u32 ip_type;
96047+ struct acl_ip_label **ips;
96048+ __u32 ip_num;
96049+ __u32 inaddr_any_override;
96050+
96051+ __u32 crashes;
96052+ unsigned long expires;
96053+
96054+ struct acl_subject_label *parent_subject;
96055+ struct gr_hash_struct *hash;
96056+ struct acl_subject_label *prev;
96057+ struct acl_subject_label *next;
96058+
96059+ struct acl_object_label **obj_hash;
96060+ __u32 obj_hash_size;
96061+ __u16 pax_flags;
96062+};
96063+
96064+struct role_allowed_ip {
96065+ __u32 addr;
96066+ __u32 netmask;
96067+
96068+ struct role_allowed_ip *prev;
96069+ struct role_allowed_ip *next;
96070+};
96071+
96072+struct role_transition {
96073+ char *rolename;
96074+
96075+ struct role_transition *prev;
96076+ struct role_transition *next;
96077+};
96078+
96079+struct acl_role_label {
96080+ char *rolename;
96081+ uid_t uidgid;
96082+ __u16 roletype;
96083+
96084+ __u16 auth_attempts;
96085+ unsigned long expires;
96086+
96087+ struct acl_subject_label *root_label;
96088+ struct gr_hash_struct *hash;
96089+
96090+ struct acl_role_label *prev;
96091+ struct acl_role_label *next;
96092+
96093+ struct role_transition *transitions;
96094+ struct role_allowed_ip *allowed_ips;
96095+ uid_t *domain_children;
96096+ __u16 domain_child_num;
96097+
96098+ umode_t umask;
96099+
96100+ struct acl_subject_label **subj_hash;
96101+ __u32 subj_hash_size;
96102+};
96103+
96104+struct user_acl_role_db {
96105+ struct acl_role_label **r_table;
96106+ __u32 num_pointers; /* Number of allocations to track */
96107+ __u32 num_roles; /* Number of roles */
96108+ __u32 num_domain_children; /* Number of domain children */
96109+ __u32 num_subjects; /* Number of subjects */
96110+ __u32 num_objects; /* Number of objects */
96111+};
96112+
96113+struct acl_object_label {
96114+ char *filename;
96115+ u64 inode;
96116+ dev_t device;
96117+ __u32 mode;
96118+
96119+ struct acl_subject_label *nested;
96120+ struct acl_object_label *globbed;
96121+
96122+ /* next two structures not used */
96123+
96124+ struct acl_object_label *prev;
96125+ struct acl_object_label *next;
96126+};
96127+
96128+struct acl_ip_label {
96129+ char *iface;
96130+ __u32 addr;
96131+ __u32 netmask;
96132+ __u16 low, high;
96133+ __u8 mode;
96134+ __u32 type;
96135+ __u32 proto[8];
96136+
96137+ /* next two structures not used */
96138+
96139+ struct acl_ip_label *prev;
96140+ struct acl_ip_label *next;
96141+};
96142+
96143+struct gr_arg {
96144+ struct user_acl_role_db role_db;
96145+ unsigned char pw[GR_PW_LEN];
96146+ unsigned char salt[GR_SALT_LEN];
96147+ unsigned char sum[GR_SHA_LEN];
96148+ unsigned char sp_role[GR_SPROLE_LEN];
96149+ struct sprole_pw *sprole_pws;
96150+ dev_t segv_device;
96151+ u64 segv_inode;
96152+ uid_t segv_uid;
96153+ __u16 num_sprole_pws;
96154+ __u16 mode;
96155+};
96156+
96157+struct gr_arg_wrapper {
96158+ struct gr_arg *arg;
96159+ __u32 version;
96160+ __u32 size;
96161+};
96162+
96163+struct subject_map {
96164+ struct acl_subject_label *user;
96165+ struct acl_subject_label *kernel;
96166+ struct subject_map *prev;
96167+ struct subject_map *next;
96168+};
96169+
96170+struct acl_subj_map_db {
96171+ struct subject_map **s_hash;
96172+ __u32 s_size;
96173+};
96174+
96175+struct gr_policy_state {
96176+ struct sprole_pw **acl_special_roles;
96177+ __u16 num_sprole_pws;
96178+ struct acl_role_label *kernel_role;
96179+ struct acl_role_label *role_list;
96180+ struct acl_role_label *default_role;
96181+ struct acl_role_db acl_role_set;
96182+ struct acl_subj_map_db subj_map_set;
96183+ struct name_db name_set;
96184+ struct inodev_db inodev_set;
96185+};
96186+
96187+struct gr_alloc_state {
96188+ unsigned long alloc_stack_next;
96189+ unsigned long alloc_stack_size;
96190+ void **alloc_stack;
96191+};
96192+
96193+struct gr_reload_state {
96194+ struct gr_policy_state oldpolicy;
96195+ struct gr_alloc_state oldalloc;
96196+ struct gr_policy_state newpolicy;
96197+ struct gr_alloc_state newalloc;
96198+ struct gr_policy_state *oldpolicy_ptr;
96199+ struct gr_alloc_state *oldalloc_ptr;
96200+ unsigned char oldmode;
96201+};
96202+
96203+/* End Data Structures Section */
96204+
96205+/* Hash functions generated by empirical testing by Brad Spengler
96206+ Makes good use of the low bits of the inode. Generally 0-1 times
96207+ in loop for successful match. 0-3 for unsuccessful match.
96208+ Shift/add algorithm with modulus of table size and an XOR*/
96209+
96210+static __inline__ unsigned int
96211+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
96212+{
96213+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
96214+}
96215+
96216+ static __inline__ unsigned int
96217+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
96218+{
96219+ return ((const unsigned long)userp % sz);
96220+}
96221+
96222+static __inline__ unsigned int
96223+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
96224+{
96225+ unsigned int rem;
96226+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
96227+ return rem;
96228+}
96229+
96230+static __inline__ unsigned int
96231+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
96232+{
96233+ return full_name_hash((const unsigned char *)name, len) % sz;
96234+}
96235+
96236+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
96237+ subj = NULL; \
96238+ iter = 0; \
96239+ while (iter < role->subj_hash_size) { \
96240+ if (subj == NULL) \
96241+ subj = role->subj_hash[iter]; \
96242+ if (subj == NULL) { \
96243+ iter++; \
96244+ continue; \
96245+ }
96246+
96247+#define FOR_EACH_SUBJECT_END(subj,iter) \
96248+ subj = subj->next; \
96249+ if (subj == NULL) \
96250+ iter++; \
96251+ }
96252+
96253+
96254+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
96255+ subj = role->hash->first; \
96256+ while (subj != NULL) {
96257+
96258+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
96259+ subj = subj->next; \
96260+ }
96261+
96262+#endif
96263+
96264diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
96265new file mode 100644
96266index 0000000..af64092
96267--- /dev/null
96268+++ b/include/linux/gracl_compat.h
96269@@ -0,0 +1,156 @@
96270+#ifndef GR_ACL_COMPAT_H
96271+#define GR_ACL_COMPAT_H
96272+
96273+#include <linux/resource.h>
96274+#include <asm/resource.h>
96275+
96276+struct sprole_pw_compat {
96277+ compat_uptr_t rolename;
96278+ unsigned char salt[GR_SALT_LEN];
96279+ unsigned char sum[GR_SHA_LEN];
96280+};
96281+
96282+struct gr_hash_struct_compat {
96283+ compat_uptr_t table;
96284+ compat_uptr_t nametable;
96285+ compat_uptr_t first;
96286+ __u32 table_size;
96287+ __u32 used_size;
96288+ int type;
96289+};
96290+
96291+struct acl_subject_label_compat {
96292+ compat_uptr_t filename;
96293+ compat_u64 inode;
96294+ __u32 device;
96295+ __u32 mode;
96296+ kernel_cap_t cap_mask;
96297+ kernel_cap_t cap_lower;
96298+ kernel_cap_t cap_invert_audit;
96299+
96300+ struct compat_rlimit res[GR_NLIMITS];
96301+ __u32 resmask;
96302+
96303+ __u8 user_trans_type;
96304+ __u8 group_trans_type;
96305+ compat_uptr_t user_transitions;
96306+ compat_uptr_t group_transitions;
96307+ __u16 user_trans_num;
96308+ __u16 group_trans_num;
96309+
96310+ __u32 sock_families[2];
96311+ __u32 ip_proto[8];
96312+ __u32 ip_type;
96313+ compat_uptr_t ips;
96314+ __u32 ip_num;
96315+ __u32 inaddr_any_override;
96316+
96317+ __u32 crashes;
96318+ compat_ulong_t expires;
96319+
96320+ compat_uptr_t parent_subject;
96321+ compat_uptr_t hash;
96322+ compat_uptr_t prev;
96323+ compat_uptr_t next;
96324+
96325+ compat_uptr_t obj_hash;
96326+ __u32 obj_hash_size;
96327+ __u16 pax_flags;
96328+};
96329+
96330+struct role_allowed_ip_compat {
96331+ __u32 addr;
96332+ __u32 netmask;
96333+
96334+ compat_uptr_t prev;
96335+ compat_uptr_t next;
96336+};
96337+
96338+struct role_transition_compat {
96339+ compat_uptr_t rolename;
96340+
96341+ compat_uptr_t prev;
96342+ compat_uptr_t next;
96343+};
96344+
96345+struct acl_role_label_compat {
96346+ compat_uptr_t rolename;
96347+ uid_t uidgid;
96348+ __u16 roletype;
96349+
96350+ __u16 auth_attempts;
96351+ compat_ulong_t expires;
96352+
96353+ compat_uptr_t root_label;
96354+ compat_uptr_t hash;
96355+
96356+ compat_uptr_t prev;
96357+ compat_uptr_t next;
96358+
96359+ compat_uptr_t transitions;
96360+ compat_uptr_t allowed_ips;
96361+ compat_uptr_t domain_children;
96362+ __u16 domain_child_num;
96363+
96364+ umode_t umask;
96365+
96366+ compat_uptr_t subj_hash;
96367+ __u32 subj_hash_size;
96368+};
96369+
96370+struct user_acl_role_db_compat {
96371+ compat_uptr_t r_table;
96372+ __u32 num_pointers;
96373+ __u32 num_roles;
96374+ __u32 num_domain_children;
96375+ __u32 num_subjects;
96376+ __u32 num_objects;
96377+};
96378+
96379+struct acl_object_label_compat {
96380+ compat_uptr_t filename;
96381+ compat_u64 inode;
96382+ __u32 device;
96383+ __u32 mode;
96384+
96385+ compat_uptr_t nested;
96386+ compat_uptr_t globbed;
96387+
96388+ compat_uptr_t prev;
96389+ compat_uptr_t next;
96390+};
96391+
96392+struct acl_ip_label_compat {
96393+ compat_uptr_t iface;
96394+ __u32 addr;
96395+ __u32 netmask;
96396+ __u16 low, high;
96397+ __u8 mode;
96398+ __u32 type;
96399+ __u32 proto[8];
96400+
96401+ compat_uptr_t prev;
96402+ compat_uptr_t next;
96403+};
96404+
96405+struct gr_arg_compat {
96406+ struct user_acl_role_db_compat role_db;
96407+ unsigned char pw[GR_PW_LEN];
96408+ unsigned char salt[GR_SALT_LEN];
96409+ unsigned char sum[GR_SHA_LEN];
96410+ unsigned char sp_role[GR_SPROLE_LEN];
96411+ compat_uptr_t sprole_pws;
96412+ __u32 segv_device;
96413+ compat_u64 segv_inode;
96414+ uid_t segv_uid;
96415+ __u16 num_sprole_pws;
96416+ __u16 mode;
96417+};
96418+
96419+struct gr_arg_wrapper_compat {
96420+ compat_uptr_t arg;
96421+ __u32 version;
96422+ __u32 size;
96423+};
96424+
96425+#endif
96426diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
96427new file mode 100644
96428index 0000000..323ecf2
96429--- /dev/null
96430+++ b/include/linux/gralloc.h
96431@@ -0,0 +1,9 @@
96432+#ifndef __GRALLOC_H
96433+#define __GRALLOC_H
96434+
96435+void acl_free_all(void);
96436+int acl_alloc_stack_init(unsigned long size);
96437+void *acl_alloc(unsigned long len);
96438+void *acl_alloc_num(unsigned long num, unsigned long len);
96439+
96440+#endif
96441diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
96442new file mode 100644
96443index 0000000..be66033
96444--- /dev/null
96445+++ b/include/linux/grdefs.h
96446@@ -0,0 +1,140 @@
96447+#ifndef GRDEFS_H
96448+#define GRDEFS_H
96449+
96450+/* Begin grsecurity status declarations */
96451+
96452+enum {
96453+ GR_READY = 0x01,
96454+ GR_STATUS_INIT = 0x00 // disabled state
96455+};
96456+
96457+/* Begin ACL declarations */
96458+
96459+/* Role flags */
96460+
96461+enum {
96462+ GR_ROLE_USER = 0x0001,
96463+ GR_ROLE_GROUP = 0x0002,
96464+ GR_ROLE_DEFAULT = 0x0004,
96465+ GR_ROLE_SPECIAL = 0x0008,
96466+ GR_ROLE_AUTH = 0x0010,
96467+ GR_ROLE_NOPW = 0x0020,
96468+ GR_ROLE_GOD = 0x0040,
96469+ GR_ROLE_LEARN = 0x0080,
96470+ GR_ROLE_TPE = 0x0100,
96471+ GR_ROLE_DOMAIN = 0x0200,
96472+ GR_ROLE_PAM = 0x0400,
96473+ GR_ROLE_PERSIST = 0x0800
96474+};
96475+
96476+/* ACL Subject and Object mode flags */
96477+enum {
96478+ GR_DELETED = 0x80000000
96479+};
96480+
96481+/* ACL Object-only mode flags */
96482+enum {
96483+ GR_READ = 0x00000001,
96484+ GR_APPEND = 0x00000002,
96485+ GR_WRITE = 0x00000004,
96486+ GR_EXEC = 0x00000008,
96487+ GR_FIND = 0x00000010,
96488+ GR_INHERIT = 0x00000020,
96489+ GR_SETID = 0x00000040,
96490+ GR_CREATE = 0x00000080,
96491+ GR_DELETE = 0x00000100,
96492+ GR_LINK = 0x00000200,
96493+ GR_AUDIT_READ = 0x00000400,
96494+ GR_AUDIT_APPEND = 0x00000800,
96495+ GR_AUDIT_WRITE = 0x00001000,
96496+ GR_AUDIT_EXEC = 0x00002000,
96497+ GR_AUDIT_FIND = 0x00004000,
96498+ GR_AUDIT_INHERIT= 0x00008000,
96499+ GR_AUDIT_SETID = 0x00010000,
96500+ GR_AUDIT_CREATE = 0x00020000,
96501+ GR_AUDIT_DELETE = 0x00040000,
96502+ GR_AUDIT_LINK = 0x00080000,
96503+ GR_PTRACERD = 0x00100000,
96504+ GR_NOPTRACE = 0x00200000,
96505+ GR_SUPPRESS = 0x00400000,
96506+ GR_NOLEARN = 0x00800000,
96507+ GR_INIT_TRANSFER= 0x01000000
96508+};
96509+
96510+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
96511+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
96512+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
96513+
96514+/* ACL subject-only mode flags */
96515+enum {
96516+ GR_KILL = 0x00000001,
96517+ GR_VIEW = 0x00000002,
96518+ GR_PROTECTED = 0x00000004,
96519+ GR_LEARN = 0x00000008,
96520+ GR_OVERRIDE = 0x00000010,
96521+ /* just a placeholder, this mode is only used in userspace */
96522+ GR_DUMMY = 0x00000020,
96523+ GR_PROTSHM = 0x00000040,
96524+ GR_KILLPROC = 0x00000080,
96525+ GR_KILLIPPROC = 0x00000100,
96526+ /* just a placeholder, this mode is only used in userspace */
96527+ GR_NOTROJAN = 0x00000200,
96528+ GR_PROTPROCFD = 0x00000400,
96529+ GR_PROCACCT = 0x00000800,
96530+ GR_RELAXPTRACE = 0x00001000,
96531+ //GR_NESTED = 0x00002000,
96532+ GR_INHERITLEARN = 0x00004000,
96533+ GR_PROCFIND = 0x00008000,
96534+ GR_POVERRIDE = 0x00010000,
96535+ GR_KERNELAUTH = 0x00020000,
96536+ GR_ATSECURE = 0x00040000,
96537+ GR_SHMEXEC = 0x00080000
96538+};
96539+
96540+enum {
96541+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
96542+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
96543+ GR_PAX_ENABLE_MPROTECT = 0x0004,
96544+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
96545+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
96546+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
96547+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
96548+ GR_PAX_DISABLE_MPROTECT = 0x0400,
96549+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
96550+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
96551+};
96552+
96553+enum {
96554+ GR_ID_USER = 0x01,
96555+ GR_ID_GROUP = 0x02,
96556+};
96557+
96558+enum {
96559+ GR_ID_ALLOW = 0x01,
96560+ GR_ID_DENY = 0x02,
96561+};
96562+
96563+#define GR_CRASH_RES 31
96564+#define GR_UIDTABLE_MAX 500
96565+
96566+/* begin resource learning section */
96567+enum {
96568+ GR_RLIM_CPU_BUMP = 60,
96569+ GR_RLIM_FSIZE_BUMP = 50000,
96570+ GR_RLIM_DATA_BUMP = 10000,
96571+ GR_RLIM_STACK_BUMP = 1000,
96572+ GR_RLIM_CORE_BUMP = 10000,
96573+ GR_RLIM_RSS_BUMP = 500000,
96574+ GR_RLIM_NPROC_BUMP = 1,
96575+ GR_RLIM_NOFILE_BUMP = 5,
96576+ GR_RLIM_MEMLOCK_BUMP = 50000,
96577+ GR_RLIM_AS_BUMP = 500000,
96578+ GR_RLIM_LOCKS_BUMP = 2,
96579+ GR_RLIM_SIGPENDING_BUMP = 5,
96580+ GR_RLIM_MSGQUEUE_BUMP = 10000,
96581+ GR_RLIM_NICE_BUMP = 1,
96582+ GR_RLIM_RTPRIO_BUMP = 1,
96583+ GR_RLIM_RTTIME_BUMP = 1000000
96584+};
96585+
96586+#endif
96587diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
96588new file mode 100644
96589index 0000000..fb1de5d
96590--- /dev/null
96591+++ b/include/linux/grinternal.h
96592@@ -0,0 +1,230 @@
96593+#ifndef __GRINTERNAL_H
96594+#define __GRINTERNAL_H
96595+
96596+#ifdef CONFIG_GRKERNSEC
96597+
96598+#include <linux/fs.h>
96599+#include <linux/mnt_namespace.h>
96600+#include <linux/nsproxy.h>
96601+#include <linux/gracl.h>
96602+#include <linux/grdefs.h>
96603+#include <linux/grmsg.h>
96604+
96605+void gr_add_learn_entry(const char *fmt, ...)
96606+ __attribute__ ((format (printf, 1, 2)));
96607+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
96608+ const struct vfsmount *mnt);
96609+__u32 gr_check_create(const struct dentry *new_dentry,
96610+ const struct dentry *parent,
96611+ const struct vfsmount *mnt, const __u32 mode);
96612+int gr_check_protected_task(const struct task_struct *task);
96613+__u32 to_gr_audit(const __u32 reqmode);
96614+int gr_set_acls(const int type);
96615+int gr_acl_is_enabled(void);
96616+char gr_roletype_to_char(void);
96617+
96618+void gr_handle_alertkill(struct task_struct *task);
96619+char *gr_to_filename(const struct dentry *dentry,
96620+ const struct vfsmount *mnt);
96621+char *gr_to_filename1(const struct dentry *dentry,
96622+ const struct vfsmount *mnt);
96623+char *gr_to_filename2(const struct dentry *dentry,
96624+ const struct vfsmount *mnt);
96625+char *gr_to_filename3(const struct dentry *dentry,
96626+ const struct vfsmount *mnt);
96627+
96628+extern int grsec_enable_ptrace_readexec;
96629+extern int grsec_enable_harden_ptrace;
96630+extern int grsec_enable_link;
96631+extern int grsec_enable_fifo;
96632+extern int grsec_enable_execve;
96633+extern int grsec_enable_shm;
96634+extern int grsec_enable_execlog;
96635+extern int grsec_enable_signal;
96636+extern int grsec_enable_audit_ptrace;
96637+extern int grsec_enable_forkfail;
96638+extern int grsec_enable_time;
96639+extern int grsec_enable_rofs;
96640+extern int grsec_deny_new_usb;
96641+extern int grsec_enable_chroot_shmat;
96642+extern int grsec_enable_chroot_mount;
96643+extern int grsec_enable_chroot_double;
96644+extern int grsec_enable_chroot_pivot;
96645+extern int grsec_enable_chroot_chdir;
96646+extern int grsec_enable_chroot_chmod;
96647+extern int grsec_enable_chroot_mknod;
96648+extern int grsec_enable_chroot_fchdir;
96649+extern int grsec_enable_chroot_nice;
96650+extern int grsec_enable_chroot_execlog;
96651+extern int grsec_enable_chroot_caps;
96652+extern int grsec_enable_chroot_rename;
96653+extern int grsec_enable_chroot_sysctl;
96654+extern int grsec_enable_chroot_unix;
96655+extern int grsec_enable_symlinkown;
96656+extern kgid_t grsec_symlinkown_gid;
96657+extern int grsec_enable_tpe;
96658+extern kgid_t grsec_tpe_gid;
96659+extern int grsec_enable_tpe_all;
96660+extern int grsec_enable_tpe_invert;
96661+extern int grsec_enable_socket_all;
96662+extern kgid_t grsec_socket_all_gid;
96663+extern int grsec_enable_socket_client;
96664+extern kgid_t grsec_socket_client_gid;
96665+extern int grsec_enable_socket_server;
96666+extern kgid_t grsec_socket_server_gid;
96667+extern kgid_t grsec_audit_gid;
96668+extern int grsec_enable_group;
96669+extern int grsec_enable_log_rwxmaps;
96670+extern int grsec_enable_mount;
96671+extern int grsec_enable_chdir;
96672+extern int grsec_resource_logging;
96673+extern int grsec_enable_blackhole;
96674+extern int grsec_lastack_retries;
96675+extern int grsec_enable_brute;
96676+extern int grsec_enable_harden_ipc;
96677+extern int grsec_lock;
96678+
96679+extern spinlock_t grsec_alert_lock;
96680+extern unsigned long grsec_alert_wtime;
96681+extern unsigned long grsec_alert_fyet;
96682+
96683+extern spinlock_t grsec_audit_lock;
96684+
96685+extern rwlock_t grsec_exec_file_lock;
96686+
96687+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
96688+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
96689+ (tsk)->exec_file->f_path.mnt) : "/")
96690+
96691+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
96692+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
96693+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
96694+
96695+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
96696+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
96697+ (tsk)->exec_file->f_path.mnt) : "/")
96698+
96699+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
96700+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
96701+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
96702+
96703+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
96704+
96705+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
96706+
96707+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
96708+{
96709+ if (file1 && file2) {
96710+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
96711+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
96712+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
96713+ return true;
96714+ }
96715+
96716+ return false;
96717+}
96718+
96719+#define GR_CHROOT_CAPS {{ \
96720+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
96721+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
96722+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
96723+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
96724+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
96725+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
96726+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
96727+
96728+#define security_learn(normal_msg,args...) \
96729+({ \
96730+ read_lock(&grsec_exec_file_lock); \
96731+ gr_add_learn_entry(normal_msg "\n", ## args); \
96732+ read_unlock(&grsec_exec_file_lock); \
96733+})
96734+
96735+enum {
96736+ GR_DO_AUDIT,
96737+ GR_DONT_AUDIT,
96738+ /* used for non-audit messages that we shouldn't kill the task on */
96739+ GR_DONT_AUDIT_GOOD
96740+};
96741+
96742+enum {
96743+ GR_TTYSNIFF,
96744+ GR_RBAC,
96745+ GR_RBAC_STR,
96746+ GR_STR_RBAC,
96747+ GR_RBAC_MODE2,
96748+ GR_RBAC_MODE3,
96749+ GR_FILENAME,
96750+ GR_SYSCTL_HIDDEN,
96751+ GR_NOARGS,
96752+ GR_ONE_INT,
96753+ GR_ONE_INT_TWO_STR,
96754+ GR_ONE_STR,
96755+ GR_STR_INT,
96756+ GR_TWO_STR_INT,
96757+ GR_TWO_INT,
96758+ GR_TWO_U64,
96759+ GR_THREE_INT,
96760+ GR_FIVE_INT_TWO_STR,
96761+ GR_TWO_STR,
96762+ GR_THREE_STR,
96763+ GR_FOUR_STR,
96764+ GR_STR_FILENAME,
96765+ GR_FILENAME_STR,
96766+ GR_FILENAME_TWO_INT,
96767+ GR_FILENAME_TWO_INT_STR,
96768+ GR_TEXTREL,
96769+ GR_PTRACE,
96770+ GR_RESOURCE,
96771+ GR_CAP,
96772+ GR_SIG,
96773+ GR_SIG2,
96774+ GR_CRASH1,
96775+ GR_CRASH2,
96776+ GR_PSACCT,
96777+ GR_RWXMAP,
96778+ GR_RWXMAPVMA
96779+};
96780+
96781+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
96782+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
96783+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
96784+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
96785+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
96786+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
96787+#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)
96788+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
96789+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
96790+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
96791+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
96792+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
96793+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
96794+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
96795+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
96796+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
96797+#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)
96798+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
96799+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
96800+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
96801+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
96802+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
96803+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
96804+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
96805+#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)
96806+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
96807+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
96808+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
96809+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
96810+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
96811+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
96812+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
96813+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
96814+#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)
96815+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
96816+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
96817+
96818+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
96819+
96820+#endif
96821+
96822+#endif
96823diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
96824new file mode 100644
96825index 0000000..26ef560
96826--- /dev/null
96827+++ b/include/linux/grmsg.h
96828@@ -0,0 +1,118 @@
96829+#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"
96830+#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"
96831+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
96832+#define GR_STOPMOD_MSG "denied modification of module state by "
96833+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
96834+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
96835+#define GR_IOPERM_MSG "denied use of ioperm() by "
96836+#define GR_IOPL_MSG "denied use of iopl() by "
96837+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
96838+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
96839+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
96840+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
96841+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
96842+#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"
96843+#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"
96844+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
96845+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
96846+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
96847+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
96848+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
96849+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
96850+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
96851+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
96852+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
96853+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
96854+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
96855+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
96856+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
96857+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
96858+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
96859+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
96860+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
96861+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
96862+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
96863+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
96864+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
96865+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
96866+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
96867+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
96868+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
96869+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
96870+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
96871+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
96872+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
96873+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
96874+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
96875+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
96876+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
96877+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
96878+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
96879+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
96880+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
96881+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
96882+#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"
96883+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
96884+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
96885+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
96886+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
96887+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
96888+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
96889+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
96890+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
96891+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
96892+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
96893+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
96894+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
96895+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
96896+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
96897+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
96898+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
96899+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
96900+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
96901+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
96902+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
96903+#define GR_FAILFORK_MSG "failed fork with errno %s by "
96904+#define GR_NICE_CHROOT_MSG "denied priority change by "
96905+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
96906+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
96907+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
96908+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
96909+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
96910+#define GR_TIME_MSG "time set by "
96911+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
96912+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
96913+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
96914+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
96915+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
96916+#define GR_BIND_MSG "denied bind() by "
96917+#define GR_CONNECT_MSG "denied connect() by "
96918+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
96919+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
96920+#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"
96921+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
96922+#define GR_CAP_ACL_MSG "use of %s denied for "
96923+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
96924+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
96925+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
96926+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
96927+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
96928+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
96929+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
96930+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
96931+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
96932+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
96933+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
96934+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
96935+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
96936+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
96937+#define GR_VM86_MSG "denied use of vm86 by "
96938+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
96939+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
96940+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
96941+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
96942+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
96943+#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 "
96944+#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 "
96945+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
96946+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
96947diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
96948new file mode 100644
96949index 0000000..085a746
96950--- /dev/null
96951+++ b/include/linux/grsecurity.h
96952@@ -0,0 +1,247 @@
96953+#ifndef GR_SECURITY_H
96954+#define GR_SECURITY_H
96955+#include <linux/fs.h>
96956+#include <linux/fs_struct.h>
96957+#include <linux/binfmts.h>
96958+#include <linux/gracl.h>
96959+
96960+/* notify of brain-dead configs */
96961+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
96962+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
96963+#endif
96964+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
96965+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
96966+#endif
96967+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
96968+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
96969+#endif
96970+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
96971+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
96972+#endif
96973+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
96974+#error "CONFIG_PAX enabled, but no PaX options are enabled."
96975+#endif
96976+
96977+int gr_handle_new_usb(void);
96978+
96979+void gr_handle_brute_attach(int dumpable);
96980+void gr_handle_brute_check(void);
96981+void gr_handle_kernel_exploit(void);
96982+
96983+char gr_roletype_to_char(void);
96984+
96985+int gr_proc_is_restricted(void);
96986+
96987+int gr_acl_enable_at_secure(void);
96988+
96989+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
96990+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
96991+
96992+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
96993+
96994+void gr_del_task_from_ip_table(struct task_struct *p);
96995+
96996+int gr_pid_is_chrooted(struct task_struct *p);
96997+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
96998+int gr_handle_chroot_nice(void);
96999+int gr_handle_chroot_sysctl(const int op);
97000+int gr_handle_chroot_setpriority(struct task_struct *p,
97001+ const int niceval);
97002+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
97003+int gr_chroot_fhandle(void);
97004+int gr_handle_chroot_chroot(const struct dentry *dentry,
97005+ const struct vfsmount *mnt);
97006+void gr_handle_chroot_chdir(const struct path *path);
97007+int gr_handle_chroot_chmod(const struct dentry *dentry,
97008+ const struct vfsmount *mnt, const int mode);
97009+int gr_handle_chroot_mknod(const struct dentry *dentry,
97010+ const struct vfsmount *mnt, const int mode);
97011+int gr_handle_chroot_mount(const struct dentry *dentry,
97012+ const struct vfsmount *mnt,
97013+ const char *dev_name);
97014+int gr_handle_chroot_pivot(void);
97015+int gr_handle_chroot_unix(const pid_t pid);
97016+
97017+int gr_handle_rawio(const struct inode *inode);
97018+
97019+void gr_handle_ioperm(void);
97020+void gr_handle_iopl(void);
97021+void gr_handle_msr_write(void);
97022+
97023+umode_t gr_acl_umask(void);
97024+
97025+int gr_tpe_allow(const struct file *file);
97026+
97027+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
97028+void gr_clear_chroot_entries(struct task_struct *task);
97029+
97030+void gr_log_forkfail(const int retval);
97031+void gr_log_timechange(void);
97032+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
97033+void gr_log_chdir(const struct dentry *dentry,
97034+ const struct vfsmount *mnt);
97035+void gr_log_chroot_exec(const struct dentry *dentry,
97036+ const struct vfsmount *mnt);
97037+void gr_log_remount(const char *devname, const int retval);
97038+void gr_log_unmount(const char *devname, const int retval);
97039+void gr_log_mount(const char *from, struct path *to, const int retval);
97040+void gr_log_textrel(struct vm_area_struct *vma);
97041+void gr_log_ptgnustack(struct file *file);
97042+void gr_log_rwxmmap(struct file *file);
97043+void gr_log_rwxmprotect(struct vm_area_struct *vma);
97044+
97045+int gr_handle_follow_link(const struct dentry *dentry,
97046+ const struct vfsmount *mnt);
97047+int gr_handle_fifo(const struct dentry *dentry,
97048+ const struct vfsmount *mnt,
97049+ const struct dentry *dir, const int flag,
97050+ const int acc_mode);
97051+int gr_handle_hardlink(const struct dentry *dentry,
97052+ const struct vfsmount *mnt,
97053+ const struct filename *to);
97054+
97055+int gr_is_capable(const int cap);
97056+int gr_is_capable_nolog(const int cap);
97057+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
97058+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
97059+
97060+void gr_copy_label(struct task_struct *tsk);
97061+void gr_handle_crash(struct task_struct *task, const int sig);
97062+int gr_handle_signal(const struct task_struct *p, const int sig);
97063+int gr_check_crash_uid(const kuid_t uid);
97064+int gr_check_protected_task(const struct task_struct *task);
97065+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
97066+int gr_acl_handle_mmap(const struct file *file,
97067+ const unsigned long prot);
97068+int gr_acl_handle_mprotect(const struct file *file,
97069+ const unsigned long prot);
97070+int gr_check_hidden_task(const struct task_struct *tsk);
97071+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
97072+ const struct vfsmount *mnt);
97073+__u32 gr_acl_handle_utime(const struct dentry *dentry,
97074+ const struct vfsmount *mnt);
97075+__u32 gr_acl_handle_access(const struct dentry *dentry,
97076+ const struct vfsmount *mnt, const int fmode);
97077+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
97078+ const struct vfsmount *mnt, umode_t *mode);
97079+__u32 gr_acl_handle_chown(const struct dentry *dentry,
97080+ const struct vfsmount *mnt);
97081+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
97082+ const struct vfsmount *mnt);
97083+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
97084+ const struct vfsmount *mnt);
97085+int gr_handle_ptrace(struct task_struct *task, const long request);
97086+int gr_handle_proc_ptrace(struct task_struct *task);
97087+__u32 gr_acl_handle_execve(const struct dentry *dentry,
97088+ const struct vfsmount *mnt);
97089+int gr_check_crash_exec(const struct file *filp);
97090+int gr_acl_is_enabled(void);
97091+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
97092+ const kgid_t gid);
97093+int gr_set_proc_label(const struct dentry *dentry,
97094+ const struct vfsmount *mnt,
97095+ const int unsafe_flags);
97096+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
97097+ const struct vfsmount *mnt);
97098+__u32 gr_acl_handle_open(const struct dentry *dentry,
97099+ const struct vfsmount *mnt, int acc_mode);
97100+__u32 gr_acl_handle_creat(const struct dentry *dentry,
97101+ const struct dentry *p_dentry,
97102+ const struct vfsmount *p_mnt,
97103+ int open_flags, int acc_mode, const int imode);
97104+void gr_handle_create(const struct dentry *dentry,
97105+ const struct vfsmount *mnt);
97106+void gr_handle_proc_create(const struct dentry *dentry,
97107+ const struct inode *inode);
97108+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
97109+ const struct dentry *parent_dentry,
97110+ const struct vfsmount *parent_mnt,
97111+ const int mode);
97112+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
97113+ const struct dentry *parent_dentry,
97114+ const struct vfsmount *parent_mnt);
97115+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
97116+ const struct vfsmount *mnt);
97117+void gr_handle_delete(const u64 ino, const dev_t dev);
97118+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
97119+ const struct vfsmount *mnt);
97120+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
97121+ const struct dentry *parent_dentry,
97122+ const struct vfsmount *parent_mnt,
97123+ const struct filename *from);
97124+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
97125+ const struct dentry *parent_dentry,
97126+ const struct vfsmount *parent_mnt,
97127+ const struct dentry *old_dentry,
97128+ const struct vfsmount *old_mnt, const struct filename *to);
97129+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
97130+int gr_acl_handle_rename(struct dentry *new_dentry,
97131+ struct dentry *parent_dentry,
97132+ const struct vfsmount *parent_mnt,
97133+ struct dentry *old_dentry,
97134+ struct inode *old_parent_inode,
97135+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
97136+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
97137+ struct dentry *old_dentry,
97138+ struct dentry *new_dentry,
97139+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
97140+__u32 gr_check_link(const struct dentry *new_dentry,
97141+ const struct dentry *parent_dentry,
97142+ const struct vfsmount *parent_mnt,
97143+ const struct dentry *old_dentry,
97144+ const struct vfsmount *old_mnt);
97145+int gr_acl_handle_filldir(const struct file *file, const char *name,
97146+ const unsigned int namelen, const u64 ino);
97147+
97148+__u32 gr_acl_handle_unix(const struct dentry *dentry,
97149+ const struct vfsmount *mnt);
97150+void gr_acl_handle_exit(void);
97151+void gr_acl_handle_psacct(struct task_struct *task, const long code);
97152+int gr_acl_handle_procpidmem(const struct task_struct *task);
97153+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
97154+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
97155+void gr_audit_ptrace(struct task_struct *task);
97156+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
97157+u64 gr_get_ino_from_dentry(struct dentry *dentry);
97158+void gr_put_exec_file(struct task_struct *task);
97159+
97160+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
97161+
97162+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
97163+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
97164+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
97165+ struct dentry *newdentry, struct vfsmount *newmnt);
97166+
97167+#ifdef CONFIG_GRKERNSEC_RESLOG
97168+extern void gr_log_resource(const struct task_struct *task, const int res,
97169+ const unsigned long wanted, const int gt);
97170+#else
97171+static inline void gr_log_resource(const struct task_struct *task, const int res,
97172+ const unsigned long wanted, const int gt)
97173+{
97174+}
97175+#endif
97176+
97177+#ifdef CONFIG_GRKERNSEC
97178+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
97179+void gr_handle_vm86(void);
97180+void gr_handle_mem_readwrite(u64 from, u64 to);
97181+
97182+void gr_log_badprocpid(const char *entry);
97183+
97184+extern int grsec_enable_dmesg;
97185+extern int grsec_disable_privio;
97186+
97187+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
97188+extern kgid_t grsec_proc_gid;
97189+#endif
97190+
97191+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
97192+extern int grsec_enable_chroot_findtask;
97193+#endif
97194+#ifdef CONFIG_GRKERNSEC_SETXID
97195+extern int grsec_enable_setxid;
97196+#endif
97197+#endif
97198+
97199+#endif
97200diff --git a/include/linux/grsock.h b/include/linux/grsock.h
97201new file mode 100644
97202index 0000000..e7ffaaf
97203--- /dev/null
97204+++ b/include/linux/grsock.h
97205@@ -0,0 +1,19 @@
97206+#ifndef __GRSOCK_H
97207+#define __GRSOCK_H
97208+
97209+extern void gr_attach_curr_ip(const struct sock *sk);
97210+extern int gr_handle_sock_all(const int family, const int type,
97211+ const int protocol);
97212+extern int gr_handle_sock_server(const struct sockaddr *sck);
97213+extern int gr_handle_sock_server_other(const struct sock *sck);
97214+extern int gr_handle_sock_client(const struct sockaddr *sck);
97215+extern int gr_search_connect(struct socket * sock,
97216+ struct sockaddr_in * addr);
97217+extern int gr_search_bind(struct socket * sock,
97218+ struct sockaddr_in * addr);
97219+extern int gr_search_listen(struct socket * sock);
97220+extern int gr_search_accept(struct socket * sock);
97221+extern int gr_search_socket(const int domain, const int type,
97222+ const int protocol);
97223+
97224+#endif
97225diff --git a/include/linux/highmem.h b/include/linux/highmem.h
97226index 9286a46..373f27f 100644
97227--- a/include/linux/highmem.h
97228+++ b/include/linux/highmem.h
97229@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
97230 kunmap_atomic(kaddr);
97231 }
97232
97233+static inline void sanitize_highpage(struct page *page)
97234+{
97235+ void *kaddr;
97236+ unsigned long flags;
97237+
97238+ local_irq_save(flags);
97239+ kaddr = kmap_atomic(page);
97240+ clear_page(kaddr);
97241+ kunmap_atomic(kaddr);
97242+ local_irq_restore(flags);
97243+}
97244+
97245 static inline void zero_user_segments(struct page *page,
97246 unsigned start1, unsigned end1,
97247 unsigned start2, unsigned end2)
97248diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
97249index 1c7b89a..7dda400 100644
97250--- a/include/linux/hwmon-sysfs.h
97251+++ b/include/linux/hwmon-sysfs.h
97252@@ -25,7 +25,8 @@
97253 struct sensor_device_attribute{
97254 struct device_attribute dev_attr;
97255 int index;
97256-};
97257+} __do_const;
97258+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
97259 #define to_sensor_dev_attr(_dev_attr) \
97260 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
97261
97262@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
97263 struct device_attribute dev_attr;
97264 u8 index;
97265 u8 nr;
97266-};
97267+} __do_const;
97268+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
97269 #define to_sensor_dev_attr_2(_dev_attr) \
97270 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
97271
97272diff --git a/include/linux/i2c.h b/include/linux/i2c.h
97273index e83a738..8b323fa 100644
97274--- a/include/linux/i2c.h
97275+++ b/include/linux/i2c.h
97276@@ -409,6 +409,7 @@ struct i2c_algorithm {
97277 int (*unreg_slave)(struct i2c_client *client);
97278 #endif
97279 };
97280+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
97281
97282 /**
97283 * struct i2c_bus_recovery_info - I2C bus recovery information
97284diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
97285index 66a7d76..5e68d20 100644
97286--- a/include/linux/if_pppox.h
97287+++ b/include/linux/if_pppox.h
97288@@ -78,7 +78,7 @@ struct pppox_proto {
97289 int (*ioctl)(struct socket *sock, unsigned int cmd,
97290 unsigned long arg);
97291 struct module *owner;
97292-};
97293+} __do_const;
97294
97295 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
97296 extern void unregister_pppox_proto(int proto_num);
97297diff --git a/include/linux/init.h b/include/linux/init.h
97298index 21b6d76..4a6775c 100644
97299--- a/include/linux/init.h
97300+++ b/include/linux/init.h
97301@@ -37,9 +37,17 @@
97302 * section.
97303 */
97304
97305+#define add_init_latent_entropy __latent_entropy
97306+
97307+#ifdef CONFIG_MEMORY_HOTPLUG
97308+#define add_meminit_latent_entropy
97309+#else
97310+#define add_meminit_latent_entropy __latent_entropy
97311+#endif
97312+
97313 /* These are for everybody (although not all archs will actually
97314 discard it in modules) */
97315-#define __init __section(.init.text) __cold notrace
97316+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
97317 #define __initdata __section(.init.data)
97318 #define __initconst __constsection(.init.rodata)
97319 #define __exitdata __section(.exit.data)
97320@@ -100,7 +108,7 @@
97321 #define __cpuexitconst
97322
97323 /* Used for MEMORY_HOTPLUG */
97324-#define __meminit __section(.meminit.text) __cold notrace
97325+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
97326 #define __meminitdata __section(.meminit.data)
97327 #define __meminitconst __constsection(.meminit.rodata)
97328 #define __memexit __section(.memexit.text) __exitused __cold notrace
97329diff --git a/include/linux/init_task.h b/include/linux/init_task.h
97330index 696d223..6d6b39f 100644
97331--- a/include/linux/init_task.h
97332+++ b/include/linux/init_task.h
97333@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
97334
97335 #define INIT_TASK_COMM "swapper"
97336
97337+#ifdef CONFIG_X86
97338+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
97339+#else
97340+#define INIT_TASK_THREAD_INFO
97341+#endif
97342+
97343 #ifdef CONFIG_RT_MUTEXES
97344 # define INIT_RT_MUTEXES(tsk) \
97345 .pi_waiters = RB_ROOT, \
97346@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
97347 RCU_POINTER_INITIALIZER(cred, &init_cred), \
97348 .comm = INIT_TASK_COMM, \
97349 .thread = INIT_THREAD, \
97350+ INIT_TASK_THREAD_INFO \
97351 .fs = &init_fs, \
97352 .files = &init_files, \
97353 .signal = &init_signals, \
97354diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
97355index 950ae45..df6ac60 100644
97356--- a/include/linux/interrupt.h
97357+++ b/include/linux/interrupt.h
97358@@ -432,8 +432,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
97359
97360 struct softirq_action
97361 {
97362- void (*action)(struct softirq_action *);
97363-};
97364+ void (*action)(void);
97365+} __no_const;
97366
97367 asmlinkage void do_softirq(void);
97368 asmlinkage void __do_softirq(void);
97369@@ -447,7 +447,7 @@ static inline void do_softirq_own_stack(void)
97370 }
97371 #endif
97372
97373-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
97374+extern void open_softirq(int nr, void (*action)(void));
97375 extern void softirq_init(void);
97376 extern void __raise_softirq_irqoff(unsigned int nr);
97377
97378diff --git a/include/linux/iommu.h b/include/linux/iommu.h
97379index 0546b87..46fd5b6 100644
97380--- a/include/linux/iommu.h
97381+++ b/include/linux/iommu.h
97382@@ -174,7 +174,7 @@ struct iommu_ops {
97383
97384 unsigned long pgsize_bitmap;
97385 void *priv;
97386-};
97387+} __do_const;
97388
97389 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
97390 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
97391@@ -234,7 +234,7 @@ extern int iommu_domain_set_attr(struct iommu_domain *domain, enum iommu_attr,
97392 void *data);
97393 struct device *iommu_device_create(struct device *parent, void *drvdata,
97394 const struct attribute_group **groups,
97395- const char *fmt, ...);
97396+ const char *fmt, ...) __printf(4, 5);
97397 void iommu_device_destroy(struct device *dev);
97398 int iommu_device_link(struct device *dev, struct device *link);
97399 void iommu_device_unlink(struct device *dev, struct device *link);
97400diff --git a/include/linux/ioport.h b/include/linux/ioport.h
97401index 388e3ae..d7e45a1 100644
97402--- a/include/linux/ioport.h
97403+++ b/include/linux/ioport.h
97404@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
97405 int adjust_resource(struct resource *res, resource_size_t start,
97406 resource_size_t size);
97407 resource_size_t resource_alignment(struct resource *res);
97408-static inline resource_size_t resource_size(const struct resource *res)
97409+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
97410 {
97411 return res->end - res->start + 1;
97412 }
97413diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
97414index 1eee6bc..9cf4912 100644
97415--- a/include/linux/ipc_namespace.h
97416+++ b/include/linux/ipc_namespace.h
97417@@ -60,7 +60,7 @@ struct ipc_namespace {
97418 struct user_namespace *user_ns;
97419
97420 struct ns_common ns;
97421-};
97422+} __randomize_layout;
97423
97424 extern struct ipc_namespace init_ipc_ns;
97425 extern atomic_t nr_ipc_ns;
97426diff --git a/include/linux/irq.h b/include/linux/irq.h
97427index 62c6901..827f8f6 100644
97428--- a/include/linux/irq.h
97429+++ b/include/linux/irq.h
97430@@ -370,7 +370,8 @@ struct irq_chip {
97431 int (*irq_set_irqchip_state)(struct irq_data *data, enum irqchip_irq_state which, bool state);
97432
97433 unsigned long flags;
97434-};
97435+} __do_const;
97436+typedef struct irq_chip __no_const irq_chip_no_const;
97437
97438 /*
97439 * irq_chip specific flags
97440diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
97441index dd1109f..4f4fdda 100644
97442--- a/include/linux/irqdesc.h
97443+++ b/include/linux/irqdesc.h
97444@@ -61,7 +61,7 @@ struct irq_desc {
97445 unsigned int irq_count; /* For detecting broken IRQs */
97446 unsigned long last_unhandled; /* Aging timer for unhandled count */
97447 unsigned int irqs_unhandled;
97448- atomic_t threads_handled;
97449+ atomic_unchecked_t threads_handled;
97450 int threads_handled_last;
97451 raw_spinlock_t lock;
97452 struct cpumask *percpu_enabled;
97453diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
97454index 676d730..8d3a1ad 100644
97455--- a/include/linux/irqdomain.h
97456+++ b/include/linux/irqdomain.h
97457@@ -40,6 +40,7 @@ struct device_node;
97458 struct irq_domain;
97459 struct of_device_id;
97460 struct irq_chip;
97461+typedef struct irq_chip __no_const irq_chip_no_const;
97462 struct irq_data;
97463
97464 /* Number of irqs reserved for a legacy isa controller */
97465diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
97466index c367cbd..c9b79e6 100644
97467--- a/include/linux/jiffies.h
97468+++ b/include/linux/jiffies.h
97469@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
97470 /*
97471 * Convert various time units to each other:
97472 */
97473-extern unsigned int jiffies_to_msecs(const unsigned long j);
97474-extern unsigned int jiffies_to_usecs(const unsigned long j);
97475+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
97476+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
97477
97478-static inline u64 jiffies_to_nsecs(const unsigned long j)
97479+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
97480 {
97481 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
97482 }
97483
97484-extern unsigned long msecs_to_jiffies(const unsigned int m);
97485-extern unsigned long usecs_to_jiffies(const unsigned int u);
97486+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
97487+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
97488 extern unsigned long timespec_to_jiffies(const struct timespec *value);
97489 extern void jiffies_to_timespec(const unsigned long jiffies,
97490- struct timespec *value);
97491-extern unsigned long timeval_to_jiffies(const struct timeval *value);
97492+ struct timespec *value) __intentional_overflow(-1);
97493+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
97494 extern void jiffies_to_timeval(const unsigned long jiffies,
97495 struct timeval *value);
97496
97497diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
97498index 6883e19..e854fcb 100644
97499--- a/include/linux/kallsyms.h
97500+++ b/include/linux/kallsyms.h
97501@@ -15,7 +15,8 @@
97502
97503 struct module;
97504
97505-#ifdef CONFIG_KALLSYMS
97506+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
97507+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
97508 /* Lookup the address for a symbol. Returns 0 if not found. */
97509 unsigned long kallsyms_lookup_name(const char *name);
97510
97511@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
97512 /* Stupid that this does nothing, but I didn't create this mess. */
97513 #define __print_symbol(fmt, addr)
97514 #endif /*CONFIG_KALLSYMS*/
97515+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
97516+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
97517+extern unsigned long kallsyms_lookup_name(const char *name);
97518+extern void __print_symbol(const char *fmt, unsigned long address);
97519+extern int sprint_backtrace(char *buffer, unsigned long address);
97520+extern int sprint_symbol(char *buffer, unsigned long address);
97521+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
97522+const char *kallsyms_lookup(unsigned long addr,
97523+ unsigned long *symbolsize,
97524+ unsigned long *offset,
97525+ char **modname, char *namebuf);
97526+extern int kallsyms_lookup_size_offset(unsigned long addr,
97527+ unsigned long *symbolsize,
97528+ unsigned long *offset);
97529+#endif
97530
97531 /* This macro allows us to keep printk typechecking */
97532 static __printf(1, 2)
97533diff --git a/include/linux/kernel.h b/include/linux/kernel.h
97534index 3a5b48e..240107b 100644
97535--- a/include/linux/kernel.h
97536+++ b/include/linux/kernel.h
97537@@ -390,7 +390,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
97538 /* Obsolete, do not use. Use kstrto<foo> instead */
97539
97540 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
97541-extern long simple_strtol(const char *,char **,unsigned int);
97542+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
97543 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
97544 extern long long simple_strtoll(const char *,char **,unsigned int);
97545
97546@@ -410,7 +410,8 @@ extern __printf(3, 0)
97547 int vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
97548 extern __printf(2, 3)
97549 char *kasprintf(gfp_t gfp, const char *fmt, ...);
97550-extern char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
97551+extern __printf(2, 0)
97552+char *kvasprintf(gfp_t gfp, const char *fmt, va_list args);
97553
97554 extern __scanf(2, 3)
97555 int sscanf(const char *, const char *, ...);
97556@@ -681,10 +682,10 @@ do { \
97557 __ftrace_vprintk(_THIS_IP_, fmt, vargs); \
97558 } while (0)
97559
97560-extern int
97561+extern __printf(2, 0) int
97562 __ftrace_vbprintk(unsigned long ip, const char *fmt, va_list ap);
97563
97564-extern int
97565+extern __printf(2, 0) int
97566 __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap);
97567
97568 extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);
97569@@ -704,7 +705,7 @@ int trace_printk(const char *fmt, ...)
97570 {
97571 return 0;
97572 }
97573-static inline int
97574+static __printf(1, 0) inline int
97575 ftrace_vprintk(const char *fmt, va_list ap)
97576 {
97577 return 0;
97578diff --git a/include/linux/key-type.h b/include/linux/key-type.h
97579index ff9f1d3..6712be5 100644
97580--- a/include/linux/key-type.h
97581+++ b/include/linux/key-type.h
97582@@ -152,7 +152,7 @@ struct key_type {
97583 /* internal fields */
97584 struct list_head link; /* link in types list */
97585 struct lock_class_key lock_class; /* key->sem lock class */
97586-};
97587+} __do_const;
97588
97589 extern struct key_type key_type_keyring;
97590
97591diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
97592index e465bb1..19f605fd 100644
97593--- a/include/linux/kgdb.h
97594+++ b/include/linux/kgdb.h
97595@@ -52,7 +52,7 @@ extern int kgdb_connected;
97596 extern int kgdb_io_module_registered;
97597
97598 extern atomic_t kgdb_setting_breakpoint;
97599-extern atomic_t kgdb_cpu_doing_single_step;
97600+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
97601
97602 extern struct task_struct *kgdb_usethread;
97603 extern struct task_struct *kgdb_contthread;
97604@@ -254,7 +254,7 @@ struct kgdb_arch {
97605 void (*correct_hw_break)(void);
97606
97607 void (*enable_nmi)(bool on);
97608-};
97609+} __do_const;
97610
97611 /**
97612 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
97613@@ -279,7 +279,7 @@ struct kgdb_io {
97614 void (*pre_exception) (void);
97615 void (*post_exception) (void);
97616 int is_console;
97617-};
97618+} __do_const;
97619
97620 extern struct kgdb_arch arch_kgdb_ops;
97621
97622diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
97623index d0a1f99..0bd8b7c 100644
97624--- a/include/linux/kmemleak.h
97625+++ b/include/linux/kmemleak.h
97626@@ -27,7 +27,7 @@
97627
97628 extern void kmemleak_init(void) __ref;
97629 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
97630- gfp_t gfp) __ref;
97631+ gfp_t gfp) __ref __size_overflow(2);
97632 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size,
97633 gfp_t gfp) __ref;
97634 extern void kmemleak_free(const void *ptr) __ref;
97635@@ -63,7 +63,7 @@ static inline void kmemleak_erase(void **ptr)
97636 static inline void kmemleak_init(void)
97637 {
97638 }
97639-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
97640+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
97641 gfp_t gfp)
97642 {
97643 }
97644diff --git a/include/linux/kmod.h b/include/linux/kmod.h
97645index 0555cc6..40116ce 100644
97646--- a/include/linux/kmod.h
97647+++ b/include/linux/kmod.h
97648@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
97649 * usually useless though. */
97650 extern __printf(2, 3)
97651 int __request_module(bool wait, const char *name, ...);
97652+extern __printf(3, 4)
97653+int ___request_module(bool wait, char *param_name, const char *name, ...);
97654 #define request_module(mod...) __request_module(true, mod)
97655 #define request_module_nowait(mod...) __request_module(false, mod)
97656 #define try_then_request_module(x, mod...) \
97657@@ -57,6 +59,9 @@ struct subprocess_info {
97658 struct work_struct work;
97659 struct completion *complete;
97660 char *path;
97661+#ifdef CONFIG_GRKERNSEC
97662+ char *origpath;
97663+#endif
97664 char **argv;
97665 char **envp;
97666 int wait;
97667diff --git a/include/linux/kobject.h b/include/linux/kobject.h
97668index 2d61b90..3d69945 100644
97669--- a/include/linux/kobject.h
97670+++ b/include/linux/kobject.h
97671@@ -80,8 +80,9 @@ struct kobject {
97672
97673 extern __printf(2, 3)
97674 int kobject_set_name(struct kobject *kobj, const char *name, ...);
97675-extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
97676- va_list vargs);
97677+extern __printf(2, 0)
97678+int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
97679+ va_list vargs);
97680
97681 static inline const char *kobject_name(const struct kobject *kobj)
97682 {
97683@@ -118,7 +119,7 @@ struct kobj_type {
97684 struct attribute **default_attrs;
97685 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
97686 const void *(*namespace)(struct kobject *kobj);
97687-};
97688+} __do_const;
97689
97690 struct kobj_uevent_env {
97691 char *argv[3];
97692@@ -142,6 +143,7 @@ struct kobj_attribute {
97693 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
97694 const char *buf, size_t count);
97695 };
97696+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
97697
97698 extern const struct sysfs_ops kobj_sysfs_ops;
97699
97700@@ -169,7 +171,7 @@ struct kset {
97701 spinlock_t list_lock;
97702 struct kobject kobj;
97703 const struct kset_uevent_ops *uevent_ops;
97704-};
97705+} __randomize_layout;
97706
97707 extern void kset_init(struct kset *kset);
97708 extern int __must_check kset_register(struct kset *kset);
97709diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
97710index df32d25..fb52e27 100644
97711--- a/include/linux/kobject_ns.h
97712+++ b/include/linux/kobject_ns.h
97713@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
97714 const void *(*netlink_ns)(struct sock *sk);
97715 const void *(*initial_ns)(void);
97716 void (*drop_ns)(void *);
97717-};
97718+} __do_const;
97719
97720 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
97721 int kobj_ns_type_registered(enum kobj_ns_type type);
97722diff --git a/include/linux/kref.h b/include/linux/kref.h
97723index 484604d..0f6c5b6 100644
97724--- a/include/linux/kref.h
97725+++ b/include/linux/kref.h
97726@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
97727 static inline int kref_sub(struct kref *kref, unsigned int count,
97728 void (*release)(struct kref *kref))
97729 {
97730- WARN_ON(release == NULL);
97731+ BUG_ON(release == NULL);
97732
97733 if (atomic_sub_and_test((int) count, &kref->refcount)) {
97734 release(kref);
97735diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
97736index ad45054..7c54663 100644
97737--- a/include/linux/kvm_host.h
97738+++ b/include/linux/kvm_host.h
97739@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
97740 {
97741 }
97742 #endif
97743-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
97744+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
97745 struct module *module);
97746 void kvm_exit(void);
97747
97748@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
97749 struct kvm_guest_debug *dbg);
97750 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
97751
97752-int kvm_arch_init(void *opaque);
97753+int kvm_arch_init(const void *opaque);
97754 void kvm_arch_exit(void);
97755
97756 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
97757diff --git a/include/linux/libata.h b/include/linux/libata.h
97758index e0e3378..38e206f 100644
97759--- a/include/linux/libata.h
97760+++ b/include/linux/libata.h
97761@@ -991,7 +991,7 @@ struct ata_port_operations {
97762 * fields must be pointers.
97763 */
97764 const struct ata_port_operations *inherits;
97765-};
97766+} __do_const;
97767
97768 struct ata_port_info {
97769 unsigned long flags;
97770diff --git a/include/linux/linkage.h b/include/linux/linkage.h
97771index a6a42dd..6c5ebce 100644
97772--- a/include/linux/linkage.h
97773+++ b/include/linux/linkage.h
97774@@ -36,6 +36,7 @@
97775 #endif
97776
97777 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
97778+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
97779 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
97780
97781 /*
97782diff --git a/include/linux/list.h b/include/linux/list.h
97783index feb773c..98f3075 100644
97784--- a/include/linux/list.h
97785+++ b/include/linux/list.h
97786@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
97787 extern void list_del(struct list_head *entry);
97788 #endif
97789
97790+extern void __pax_list_add(struct list_head *new,
97791+ struct list_head *prev,
97792+ struct list_head *next);
97793+static inline void pax_list_add(struct list_head *new, struct list_head *head)
97794+{
97795+ __pax_list_add(new, head, head->next);
97796+}
97797+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
97798+{
97799+ __pax_list_add(new, head->prev, head);
97800+}
97801+extern void pax_list_del(struct list_head *entry);
97802+
97803 /**
97804 * list_replace - replace old entry by new one
97805 * @old : the element to be replaced
97806@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
97807 INIT_LIST_HEAD(entry);
97808 }
97809
97810+extern void pax_list_del_init(struct list_head *entry);
97811+
97812 /**
97813 * list_move - delete from one list and add as another's head
97814 * @list: the entry to move
97815diff --git a/include/linux/lockref.h b/include/linux/lockref.h
97816index b10b122..d37b3de 100644
97817--- a/include/linux/lockref.h
97818+++ b/include/linux/lockref.h
97819@@ -28,7 +28,7 @@ struct lockref {
97820 #endif
97821 struct {
97822 spinlock_t lock;
97823- int count;
97824+ atomic_t count;
97825 };
97826 };
97827 };
97828@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
97829 extern int lockref_get_not_dead(struct lockref *);
97830
97831 /* Must be called under spinlock for reliable results */
97832-static inline int __lockref_is_dead(const struct lockref *l)
97833+static inline int __lockref_is_dead(const struct lockref *lockref)
97834 {
97835- return ((int)l->count < 0);
97836+ return atomic_read(&lockref->count) < 0;
97837+}
97838+
97839+static inline int __lockref_read(const struct lockref *lockref)
97840+{
97841+ return atomic_read(&lockref->count);
97842+}
97843+
97844+static inline void __lockref_set(struct lockref *lockref, int count)
97845+{
97846+ atomic_set(&lockref->count, count);
97847+}
97848+
97849+static inline void __lockref_inc(struct lockref *lockref)
97850+{
97851+ atomic_inc(&lockref->count);
97852+}
97853+
97854+static inline void __lockref_dec(struct lockref *lockref)
97855+{
97856+ atomic_dec(&lockref->count);
97857 }
97858
97859 #endif /* __LINUX_LOCKREF_H */
97860diff --git a/include/linux/math64.h b/include/linux/math64.h
97861index c45c089..298841c 100644
97862--- a/include/linux/math64.h
97863+++ b/include/linux/math64.h
97864@@ -15,7 +15,7 @@
97865 * This is commonly provided by 32bit archs to provide an optimized 64bit
97866 * divide.
97867 */
97868-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97869+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97870 {
97871 *remainder = dividend % divisor;
97872 return dividend / divisor;
97873@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
97874 /**
97875 * div64_u64 - unsigned 64bit divide with 64bit divisor
97876 */
97877-static inline u64 div64_u64(u64 dividend, u64 divisor)
97878+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
97879 {
97880 return dividend / divisor;
97881 }
97882@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
97883 #define div64_ul(x, y) div_u64((x), (y))
97884
97885 #ifndef div_u64_rem
97886-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97887+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
97888 {
97889 *remainder = do_div(dividend, divisor);
97890 return dividend;
97891@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
97892 #endif
97893
97894 #ifndef div64_u64
97895-extern u64 div64_u64(u64 dividend, u64 divisor);
97896+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
97897 #endif
97898
97899 #ifndef div64_s64
97900@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
97901 * divide.
97902 */
97903 #ifndef div_u64
97904-static inline u64 div_u64(u64 dividend, u32 divisor)
97905+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
97906 {
97907 u32 remainder;
97908 return div_u64_rem(dividend, divisor, &remainder);
97909diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
97910index 3d385c8..deacb6a 100644
97911--- a/include/linux/mempolicy.h
97912+++ b/include/linux/mempolicy.h
97913@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
97914 }
97915
97916 #define vma_policy(vma) ((vma)->vm_policy)
97917+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
97918+{
97919+ vma->vm_policy = pol;
97920+}
97921
97922 static inline void mpol_get(struct mempolicy *pol)
97923 {
97924@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
97925 }
97926
97927 #define vma_policy(vma) NULL
97928+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
97929+{
97930+}
97931
97932 static inline int
97933 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
97934diff --git a/include/linux/mm.h b/include/linux/mm.h
97935index 0755b9f..bf8eab1 100644
97936--- a/include/linux/mm.h
97937+++ b/include/linux/mm.h
97938@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
97939
97940 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
97941 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
97942+
97943+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
97944+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
97945+#endif
97946+
97947 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
97948 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
97949 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
97950@@ -257,8 +262,8 @@ struct vm_operations_struct {
97951 /* called by access_process_vm when get_user_pages() fails, typically
97952 * for use by special VMAs that can switch between memory and hardware
97953 */
97954- int (*access)(struct vm_area_struct *vma, unsigned long addr,
97955- void *buf, int len, int write);
97956+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
97957+ void *buf, size_t len, int write);
97958
97959 /* Called by the /proc/PID/maps code to ask the vma whether it
97960 * has a special name. Returning non-NULL will also cause this
97961@@ -296,6 +301,7 @@ struct vm_operations_struct {
97962 struct page *(*find_special_page)(struct vm_area_struct *vma,
97963 unsigned long addr);
97964 };
97965+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
97966
97967 struct mmu_gather;
97968 struct inode;
97969@@ -1002,6 +1008,34 @@ static inline int page_mapped(struct page *page)
97970 }
97971
97972 /*
97973+ * Return true only if the page has been allocated with
97974+ * ALLOC_NO_WATERMARKS and the low watermark was not
97975+ * met implying that the system is under some pressure.
97976+ */
97977+static inline bool page_is_pfmemalloc(struct page *page)
97978+{
97979+ /*
97980+ * Page index cannot be this large so this must be
97981+ * a pfmemalloc page.
97982+ */
97983+ return page->index == -1UL;
97984+}
97985+
97986+/*
97987+ * Only to be called by the page allocator on a freshly allocated
97988+ * page.
97989+ */
97990+static inline void set_page_pfmemalloc(struct page *page)
97991+{
97992+ page->index = -1UL;
97993+}
97994+
97995+static inline void clear_page_pfmemalloc(struct page *page)
97996+{
97997+ page->index = 0;
97998+}
97999+
98000+/*
98001 * Different kinds of faults, as returned by handle_mm_fault().
98002 * Used to decide whether a process gets delivered SIGBUS or
98003 * just gets major/minor fault counters bumped up.
98004@@ -1131,8 +1165,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
98005 unsigned long *pfn);
98006 int follow_phys(struct vm_area_struct *vma, unsigned long address,
98007 unsigned int flags, unsigned long *prot, resource_size_t *phys);
98008-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
98009- void *buf, int len, int write);
98010+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
98011+ void *buf, size_t len, int write);
98012
98013 static inline void unmap_shared_mapping_range(struct address_space *mapping,
98014 loff_t const holebegin, loff_t const holelen)
98015@@ -1172,9 +1206,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
98016 }
98017 #endif
98018
98019-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
98020-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
98021- void *buf, int len, int write);
98022+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
98023+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
98024+ void *buf, size_t len, int write);
98025
98026 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
98027 unsigned long start, unsigned long nr_pages,
98028@@ -1219,34 +1253,6 @@ int clear_page_dirty_for_io(struct page *page);
98029
98030 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
98031
98032-/* Is the vma a continuation of the stack vma above it? */
98033-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
98034-{
98035- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
98036-}
98037-
98038-static inline int stack_guard_page_start(struct vm_area_struct *vma,
98039- unsigned long addr)
98040-{
98041- return (vma->vm_flags & VM_GROWSDOWN) &&
98042- (vma->vm_start == addr) &&
98043- !vma_growsdown(vma->vm_prev, addr);
98044-}
98045-
98046-/* Is the vma a continuation of the stack vma below it? */
98047-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
98048-{
98049- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
98050-}
98051-
98052-static inline int stack_guard_page_end(struct vm_area_struct *vma,
98053- unsigned long addr)
98054-{
98055- return (vma->vm_flags & VM_GROWSUP) &&
98056- (vma->vm_end == addr) &&
98057- !vma_growsup(vma->vm_next, addr);
98058-}
98059-
98060 extern struct task_struct *task_of_stack(struct task_struct *task,
98061 struct vm_area_struct *vma, bool in_group);
98062
98063@@ -1369,8 +1375,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
98064 {
98065 return 0;
98066 }
98067+
98068+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
98069+ unsigned long address)
98070+{
98071+ return 0;
98072+}
98073 #else
98074 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
98075+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
98076 #endif
98077
98078 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
98079@@ -1380,6 +1393,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
98080 return 0;
98081 }
98082
98083+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
98084+ unsigned long address)
98085+{
98086+ return 0;
98087+}
98088+
98089 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
98090
98091 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
98092@@ -1392,6 +1411,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
98093
98094 #else
98095 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
98096+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
98097
98098 static inline void mm_nr_pmds_init(struct mm_struct *mm)
98099 {
98100@@ -1429,11 +1449,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
98101 NULL: pud_offset(pgd, address);
98102 }
98103
98104+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
98105+{
98106+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
98107+ NULL: pud_offset(pgd, address);
98108+}
98109+
98110 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
98111 {
98112 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
98113 NULL: pmd_offset(pud, address);
98114 }
98115+
98116+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
98117+{
98118+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
98119+ NULL: pmd_offset(pud, address);
98120+}
98121 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
98122
98123 #if USE_SPLIT_PTE_PTLOCKS
98124@@ -1810,12 +1842,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
98125 bool *need_rmap_locks);
98126 extern void exit_mmap(struct mm_struct *);
98127
98128+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
98129+extern void gr_learn_resource(const struct task_struct *task, const int res,
98130+ const unsigned long wanted, const int gt);
98131+#else
98132+static inline void gr_learn_resource(const struct task_struct *task, const int res,
98133+ const unsigned long wanted, const int gt)
98134+{
98135+}
98136+#endif
98137+
98138 static inline int check_data_rlimit(unsigned long rlim,
98139 unsigned long new,
98140 unsigned long start,
98141 unsigned long end_data,
98142 unsigned long start_data)
98143 {
98144+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
98145 if (rlim < RLIM_INFINITY) {
98146 if (((new - start) + (end_data - start_data)) > rlim)
98147 return -ENOSPC;
98148@@ -1840,7 +1883,7 @@ extern int install_special_mapping(struct mm_struct *mm,
98149 unsigned long addr, unsigned long len,
98150 unsigned long flags, struct page **pages);
98151
98152-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
98153+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
98154
98155 extern unsigned long mmap_region(struct file *file, unsigned long addr,
98156 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
98157@@ -1848,6 +1891,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
98158 unsigned long len, unsigned long prot, unsigned long flags,
98159 unsigned long pgoff, unsigned long *populate);
98160 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
98161+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
98162
98163 #ifdef CONFIG_MMU
98164 extern int __mm_populate(unsigned long addr, unsigned long len,
98165@@ -1876,10 +1920,11 @@ struct vm_unmapped_area_info {
98166 unsigned long high_limit;
98167 unsigned long align_mask;
98168 unsigned long align_offset;
98169+ unsigned long threadstack_offset;
98170 };
98171
98172-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
98173-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
98174+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
98175+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
98176
98177 /*
98178 * Search for an unmapped address range.
98179@@ -1891,7 +1936,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
98180 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
98181 */
98182 static inline unsigned long
98183-vm_unmapped_area(struct vm_unmapped_area_info *info)
98184+vm_unmapped_area(const struct vm_unmapped_area_info *info)
98185 {
98186 if (info->flags & VM_UNMAPPED_AREA_TOPDOWN)
98187 return unmapped_area_topdown(info);
98188@@ -1953,6 +1998,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
98189 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
98190 struct vm_area_struct **pprev);
98191
98192+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
98193+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
98194+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
98195+
98196 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
98197 NULL if none. Assume start_addr < end_addr. */
98198 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
98199@@ -1982,10 +2031,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
98200 }
98201
98202 #ifdef CONFIG_MMU
98203-pgprot_t vm_get_page_prot(unsigned long vm_flags);
98204+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
98205 void vma_set_page_prot(struct vm_area_struct *vma);
98206 #else
98207-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
98208+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
98209 {
98210 return __pgprot(0);
98211 }
98212@@ -2047,6 +2096,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
98213 static inline void vm_stat_account(struct mm_struct *mm,
98214 unsigned long flags, struct file *file, long pages)
98215 {
98216+
98217+#ifdef CONFIG_PAX_RANDMMAP
98218+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
98219+#endif
98220+
98221 mm->total_vm += pages;
98222 }
98223 #endif /* CONFIG_PROC_FS */
98224@@ -2149,7 +2203,7 @@ extern int unpoison_memory(unsigned long pfn);
98225 extern int sysctl_memory_failure_early_kill;
98226 extern int sysctl_memory_failure_recovery;
98227 extern void shake_page(struct page *p, int access);
98228-extern atomic_long_t num_poisoned_pages;
98229+extern atomic_long_unchecked_t num_poisoned_pages;
98230 extern int soft_offline_page(struct page *page, int flags);
98231
98232 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
98233@@ -2200,5 +2254,11 @@ void __init setup_nr_node_ids(void);
98234 static inline void setup_nr_node_ids(void) {}
98235 #endif
98236
98237+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
98238+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
98239+#else
98240+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
98241+#endif
98242+
98243 #endif /* __KERNEL__ */
98244 #endif /* _LINUX_MM_H */
98245diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
98246index 8d37e26..29c54c9 100644
98247--- a/include/linux/mm_types.h
98248+++ b/include/linux/mm_types.h
98249@@ -63,15 +63,6 @@ struct page {
98250 union {
98251 pgoff_t index; /* Our offset within mapping. */
98252 void *freelist; /* sl[aou]b first free object */
98253- bool pfmemalloc; /* If set by the page allocator,
98254- * ALLOC_NO_WATERMARKS was set
98255- * and the low watermark was not
98256- * met implying that the system
98257- * is under some pressure. The
98258- * caller should try ensure
98259- * this page is only used to
98260- * free other pages.
98261- */
98262 };
98263
98264 union {
98265@@ -313,7 +304,9 @@ struct vm_area_struct {
98266 #ifdef CONFIG_NUMA
98267 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
98268 #endif
98269-};
98270+
98271+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
98272+} __randomize_layout;
98273
98274 struct core_thread {
98275 struct task_struct *task;
98276@@ -466,7 +459,25 @@ struct mm_struct {
98277 /* address of the bounds directory */
98278 void __user *bd_addr;
98279 #endif
98280-};
98281+
98282+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
98283+ unsigned long pax_flags;
98284+#endif
98285+
98286+#ifdef CONFIG_PAX_DLRESOLVE
98287+ unsigned long call_dl_resolve;
98288+#endif
98289+
98290+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
98291+ unsigned long call_syscall;
98292+#endif
98293+
98294+#ifdef CONFIG_PAX_ASLR
98295+ unsigned long delta_mmap; /* randomized offset */
98296+ unsigned long delta_stack; /* randomized offset */
98297+#endif
98298+
98299+} __randomize_layout;
98300
98301 static inline void mm_init_cpumask(struct mm_struct *mm)
98302 {
98303diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
98304index c5d5278..85cd5ce 100644
98305--- a/include/linux/mmiotrace.h
98306+++ b/include/linux/mmiotrace.h
98307@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
98308 /* Called from ioremap.c */
98309 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
98310 void __iomem *addr);
98311-extern void mmiotrace_iounmap(volatile void __iomem *addr);
98312+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
98313
98314 /* For anyone to insert markers. Remember trailing newline. */
98315 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
98316@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
98317 {
98318 }
98319
98320-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
98321+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
98322 {
98323 }
98324
98325@@ -106,6 +106,6 @@ extern void enable_mmiotrace(void);
98326 extern void disable_mmiotrace(void);
98327 extern void mmio_trace_rw(struct mmiotrace_rw *rw);
98328 extern void mmio_trace_mapping(struct mmiotrace_map *map);
98329-extern int mmio_trace_printk(const char *fmt, va_list args);
98330+extern __printf(1, 0) int mmio_trace_printk(const char *fmt, va_list args);
98331
98332 #endif /* _LINUX_MMIOTRACE_H */
98333diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
98334index 54d74f6..0728424 100644
98335--- a/include/linux/mmzone.h
98336+++ b/include/linux/mmzone.h
98337@@ -526,7 +526,7 @@ struct zone {
98338
98339 ZONE_PADDING(_pad3_)
98340 /* Zone statistics */
98341- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
98342+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
98343 } ____cacheline_internodealigned_in_smp;
98344
98345 enum zone_flags {
98346diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
98347index 3bfd567..72e7d8f 100644
98348--- a/include/linux/mod_devicetable.h
98349+++ b/include/linux/mod_devicetable.h
98350@@ -139,7 +139,7 @@ struct usb_device_id {
98351 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
98352 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
98353
98354-#define HID_ANY_ID (~0)
98355+#define HID_ANY_ID (~0U)
98356 #define HID_BUS_ANY 0xffff
98357 #define HID_GROUP_ANY 0x0000
98358
98359@@ -470,7 +470,7 @@ struct dmi_system_id {
98360 const char *ident;
98361 struct dmi_strmatch matches[4];
98362 void *driver_data;
98363-};
98364+} __do_const;
98365 /*
98366 * struct dmi_device_id appears during expansion of
98367 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
98368diff --git a/include/linux/module.h b/include/linux/module.h
98369index c883b86..516812e 100644
98370--- a/include/linux/module.h
98371+++ b/include/linux/module.h
98372@@ -17,9 +17,11 @@
98373 #include <linux/moduleparam.h>
98374 #include <linux/jump_label.h>
98375 #include <linux/export.h>
98376+#include <linux/fs.h>
98377
98378 #include <linux/percpu.h>
98379 #include <asm/module.h>
98380+#include <asm/pgtable.h>
98381
98382 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
98383 #define MODULE_SIG_STRING "~Module signature appended~\n"
98384@@ -42,7 +44,7 @@ struct module_kobject {
98385 struct kobject *drivers_dir;
98386 struct module_param_attrs *mp;
98387 struct completion *kobj_completion;
98388-};
98389+} __randomize_layout;
98390
98391 struct module_attribute {
98392 struct attribute attr;
98393@@ -54,12 +56,13 @@ struct module_attribute {
98394 int (*test)(struct module *);
98395 void (*free)(struct module *);
98396 };
98397+typedef struct module_attribute __no_const module_attribute_no_const;
98398
98399 struct module_version_attribute {
98400 struct module_attribute mattr;
98401 const char *module_name;
98402 const char *version;
98403-} __attribute__ ((__aligned__(sizeof(void *))));
98404+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
98405
98406 extern ssize_t __modver_version_show(struct module_attribute *,
98407 struct module_kobject *, char *);
98408@@ -221,7 +224,7 @@ struct module {
98409
98410 /* Sysfs stuff. */
98411 struct module_kobject mkobj;
98412- struct module_attribute *modinfo_attrs;
98413+ module_attribute_no_const *modinfo_attrs;
98414 const char *version;
98415 const char *srcversion;
98416 struct kobject *holders_dir;
98417@@ -270,19 +273,16 @@ struct module {
98418 int (*init)(void);
98419
98420 /* If this is non-NULL, vfree after init() returns */
98421- void *module_init;
98422+ void *module_init_rx, *module_init_rw;
98423
98424 /* Here is the actual code + data, vfree'd on unload. */
98425- void *module_core;
98426+ void *module_core_rx, *module_core_rw;
98427
98428 /* Here are the sizes of the init and core sections */
98429- unsigned int init_size, core_size;
98430+ unsigned int init_size_rw, core_size_rw;
98431
98432 /* The size of the executable code in each section. */
98433- unsigned int init_text_size, core_text_size;
98434-
98435- /* Size of RO sections of the module (text+rodata) */
98436- unsigned int init_ro_size, core_ro_size;
98437+ unsigned int init_size_rx, core_size_rx;
98438
98439 /* Arch-specific module values */
98440 struct mod_arch_specific arch;
98441@@ -340,6 +340,10 @@ struct module {
98442 unsigned int num_trace_events;
98443 struct trace_enum_map **trace_enums;
98444 unsigned int num_trace_enums;
98445+ struct file_operations trace_id;
98446+ struct file_operations trace_enable;
98447+ struct file_operations trace_format;
98448+ struct file_operations trace_filter;
98449 #endif
98450 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
98451 unsigned int num_ftrace_callsites;
98452@@ -367,7 +371,7 @@ struct module {
98453 ctor_fn_t *ctors;
98454 unsigned int num_ctors;
98455 #endif
98456-};
98457+} __randomize_layout;
98458 #ifndef MODULE_ARCH_INIT
98459 #define MODULE_ARCH_INIT {}
98460 #endif
98461@@ -388,18 +392,48 @@ bool is_module_address(unsigned long addr);
98462 bool is_module_percpu_address(unsigned long addr);
98463 bool is_module_text_address(unsigned long addr);
98464
98465+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
98466+{
98467+
98468+#ifdef CONFIG_PAX_KERNEXEC
98469+ if (ktla_ktva(addr) >= (unsigned long)start &&
98470+ ktla_ktva(addr) < (unsigned long)start + size)
98471+ return 1;
98472+#endif
98473+
98474+ return ((void *)addr >= start && (void *)addr < start + size);
98475+}
98476+
98477+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
98478+{
98479+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
98480+}
98481+
98482+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
98483+{
98484+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
98485+}
98486+
98487+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
98488+{
98489+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
98490+}
98491+
98492+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
98493+{
98494+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
98495+}
98496+
98497 static inline bool within_module_core(unsigned long addr,
98498 const struct module *mod)
98499 {
98500- return (unsigned long)mod->module_core <= addr &&
98501- addr < (unsigned long)mod->module_core + mod->core_size;
98502+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
98503 }
98504
98505 static inline bool within_module_init(unsigned long addr,
98506 const struct module *mod)
98507 {
98508- return (unsigned long)mod->module_init <= addr &&
98509- addr < (unsigned long)mod->module_init + mod->init_size;
98510+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
98511 }
98512
98513 static inline bool within_module(unsigned long addr, const struct module *mod)
98514diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
98515index 4d0cb9b..3169ac7 100644
98516--- a/include/linux/moduleloader.h
98517+++ b/include/linux/moduleloader.h
98518@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
98519 sections. Returns NULL on failure. */
98520 void *module_alloc(unsigned long size);
98521
98522+#ifdef CONFIG_PAX_KERNEXEC
98523+void *module_alloc_exec(unsigned long size);
98524+#else
98525+#define module_alloc_exec(x) module_alloc(x)
98526+#endif
98527+
98528 /* Free memory returned from module_alloc. */
98529 void module_memfree(void *module_region);
98530
98531+#ifdef CONFIG_PAX_KERNEXEC
98532+void module_memfree_exec(void *module_region);
98533+#else
98534+#define module_memfree_exec(x) module_memfree((x))
98535+#endif
98536+
98537 /*
98538 * Apply the given relocation to the (simplified) ELF. Return -error
98539 * or 0.
98540@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
98541 unsigned int relsec,
98542 struct module *me)
98543 {
98544+#ifdef CONFIG_MODULES
98545 printk(KERN_ERR "module %s: REL relocation unsupported\n",
98546 module_name(me));
98547+#endif
98548 return -ENOEXEC;
98549 }
98550 #endif
98551@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
98552 unsigned int relsec,
98553 struct module *me)
98554 {
98555+#ifdef CONFIG_MODULES
98556 printk(KERN_ERR "module %s: REL relocation unsupported\n",
98557 module_name(me));
98558+#endif
98559 return -ENOEXEC;
98560 }
98561 #endif
98562diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
98563index 1c9effa..1160bdd 100644
98564--- a/include/linux/moduleparam.h
98565+++ b/include/linux/moduleparam.h
98566@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
98567 * @len is usually just sizeof(string).
98568 */
98569 #define module_param_string(name, string, len, perm) \
98570- static const struct kparam_string __param_string_##name \
98571+ static const struct kparam_string __param_string_##name __used \
98572 = { len, string }; \
98573 __module_param_call(MODULE_PARAM_PREFIX, name, \
98574 &param_ops_string, \
98575@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
98576 */
98577 #define module_param_array_named(name, array, type, nump, perm) \
98578 param_check_##type(name, &(array)[0]); \
98579- static const struct kparam_array __param_arr_##name \
98580+ static const struct kparam_array __param_arr_##name __used \
98581 = { .max = ARRAY_SIZE(array), .num = nump, \
98582 .ops = &param_ops_##type, \
98583 .elemsize = sizeof(array[0]), .elem = array }; \
98584diff --git a/include/linux/mount.h b/include/linux/mount.h
98585index f822c3c..958ca0a 100644
98586--- a/include/linux/mount.h
98587+++ b/include/linux/mount.h
98588@@ -67,7 +67,7 @@ struct vfsmount {
98589 struct dentry *mnt_root; /* root of the mounted tree */
98590 struct super_block *mnt_sb; /* pointer to superblock */
98591 int mnt_flags;
98592-};
98593+} __randomize_layout;
98594
98595 struct file; /* forward dec */
98596 struct path;
98597diff --git a/include/linux/namei.h b/include/linux/namei.h
98598index c899077..b9a2010 100644
98599--- a/include/linux/namei.h
98600+++ b/include/linux/namei.h
98601@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
98602 extern void unlock_rename(struct dentry *, struct dentry *);
98603
98604 extern void nd_jump_link(struct nameidata *nd, struct path *path);
98605-extern void nd_set_link(struct nameidata *nd, char *path);
98606-extern char *nd_get_link(struct nameidata *nd);
98607+extern void nd_set_link(struct nameidata *nd, const char *path);
98608+extern const char *nd_get_link(const struct nameidata *nd);
98609
98610 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
98611 {
98612diff --git a/include/linux/net.h b/include/linux/net.h
98613index 738ea48..409dc09 100644
98614--- a/include/linux/net.h
98615+++ b/include/linux/net.h
98616@@ -190,7 +190,7 @@ struct net_proto_family {
98617 int (*create)(struct net *net, struct socket *sock,
98618 int protocol, int kern);
98619 struct module *owner;
98620-};
98621+} __do_const;
98622
98623 struct iovec;
98624 struct kvec;
98625diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
98626index 05b9a69..4d7e300 100644
98627--- a/include/linux/netdevice.h
98628+++ b/include/linux/netdevice.h
98629@@ -1208,6 +1208,7 @@ struct net_device_ops {
98630 u32 maxrate);
98631 int (*ndo_get_iflink)(const struct net_device *dev);
98632 };
98633+typedef struct net_device_ops __no_const net_device_ops_no_const;
98634
98635 /**
98636 * enum net_device_priv_flags - &struct net_device priv_flags
98637@@ -1515,7 +1516,7 @@ struct net_device {
98638 unsigned long base_addr;
98639 int irq;
98640
98641- atomic_t carrier_changes;
98642+ atomic_unchecked_t carrier_changes;
98643
98644 /*
98645 * Some hardware also needs these fields (state,dev_list,
98646@@ -1554,8 +1555,8 @@ struct net_device {
98647
98648 struct net_device_stats stats;
98649
98650- atomic_long_t rx_dropped;
98651- atomic_long_t tx_dropped;
98652+ atomic_long_unchecked_t rx_dropped;
98653+ atomic_long_unchecked_t tx_dropped;
98654
98655 #ifdef CONFIG_WIRELESS_EXT
98656 const struct iw_handler_def * wireless_handlers;
98657diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
98658index 63560d0..64aba5c 100644
98659--- a/include/linux/netfilter.h
98660+++ b/include/linux/netfilter.h
98661@@ -113,7 +113,7 @@ struct nf_sockopt_ops {
98662 #endif
98663 /* Use the module struct to lock set/get code in place */
98664 struct module *owner;
98665-};
98666+} __do_const;
98667
98668 /* Function to register/unregister hook points. */
98669 int nf_register_hook(struct nf_hook_ops *reg);
98670diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
98671index e955d47..04a5338 100644
98672--- a/include/linux/netfilter/nfnetlink.h
98673+++ b/include/linux/netfilter/nfnetlink.h
98674@@ -19,7 +19,7 @@ struct nfnl_callback {
98675 const struct nlattr * const cda[]);
98676 const struct nla_policy *policy; /* netlink attribute policy */
98677 const u_int16_t attr_count; /* number of nlattr's */
98678-};
98679+} __do_const;
98680
98681 struct nfnetlink_subsystem {
98682 const char *name;
98683diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
98684new file mode 100644
98685index 0000000..33f4af8
98686--- /dev/null
98687+++ b/include/linux/netfilter/xt_gradm.h
98688@@ -0,0 +1,9 @@
98689+#ifndef _LINUX_NETFILTER_XT_GRADM_H
98690+#define _LINUX_NETFILTER_XT_GRADM_H 1
98691+
98692+struct xt_gradm_mtinfo {
98693+ __u16 flags;
98694+ __u16 invflags;
98695+};
98696+
98697+#endif
98698diff --git a/include/linux/nls.h b/include/linux/nls.h
98699index 520681b..2b7fabb 100644
98700--- a/include/linux/nls.h
98701+++ b/include/linux/nls.h
98702@@ -31,7 +31,7 @@ struct nls_table {
98703 const unsigned char *charset2upper;
98704 struct module *owner;
98705 struct nls_table *next;
98706-};
98707+} __do_const;
98708
98709 /* this value hold the maximum octet of charset */
98710 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
98711@@ -46,7 +46,7 @@ enum utf16_endian {
98712 /* nls_base.c */
98713 extern int __register_nls(struct nls_table *, struct module *);
98714 extern int unregister_nls(struct nls_table *);
98715-extern struct nls_table *load_nls(char *);
98716+extern struct nls_table *load_nls(const char *);
98717 extern void unload_nls(struct nls_table *);
98718 extern struct nls_table *load_nls_default(void);
98719 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
98720diff --git a/include/linux/notifier.h b/include/linux/notifier.h
98721index d14a4c3..a078786 100644
98722--- a/include/linux/notifier.h
98723+++ b/include/linux/notifier.h
98724@@ -54,7 +54,8 @@ struct notifier_block {
98725 notifier_fn_t notifier_call;
98726 struct notifier_block __rcu *next;
98727 int priority;
98728-};
98729+} __do_const;
98730+typedef struct notifier_block __no_const notifier_block_no_const;
98731
98732 struct atomic_notifier_head {
98733 spinlock_t lock;
98734diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
98735index b2a0f15..4d7da32 100644
98736--- a/include/linux/oprofile.h
98737+++ b/include/linux/oprofile.h
98738@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
98739 int oprofilefs_create_ro_ulong(struct dentry * root,
98740 char const * name, ulong * val);
98741
98742-/** Create a file for read-only access to an atomic_t. */
98743+/** Create a file for read-only access to an atomic_unchecked_t. */
98744 int oprofilefs_create_ro_atomic(struct dentry * root,
98745- char const * name, atomic_t * val);
98746+ char const * name, atomic_unchecked_t * val);
98747
98748 /** create a directory */
98749 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
98750diff --git a/include/linux/padata.h b/include/linux/padata.h
98751index 4386946..f50c615 100644
98752--- a/include/linux/padata.h
98753+++ b/include/linux/padata.h
98754@@ -129,7 +129,7 @@ struct parallel_data {
98755 struct padata_serial_queue __percpu *squeue;
98756 atomic_t reorder_objects;
98757 atomic_t refcnt;
98758- atomic_t seq_nr;
98759+ atomic_unchecked_t seq_nr;
98760 struct padata_cpumask cpumask;
98761 spinlock_t lock ____cacheline_aligned;
98762 unsigned int processed;
98763diff --git a/include/linux/path.h b/include/linux/path.h
98764index d137218..be0c176 100644
98765--- a/include/linux/path.h
98766+++ b/include/linux/path.h
98767@@ -1,13 +1,15 @@
98768 #ifndef _LINUX_PATH_H
98769 #define _LINUX_PATH_H
98770
98771+#include <linux/compiler.h>
98772+
98773 struct dentry;
98774 struct vfsmount;
98775
98776 struct path {
98777 struct vfsmount *mnt;
98778 struct dentry *dentry;
98779-};
98780+} __randomize_layout;
98781
98782 extern void path_get(const struct path *);
98783 extern void path_put(const struct path *);
98784diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
98785index 8c78950..0d74ed9 100644
98786--- a/include/linux/pci_hotplug.h
98787+++ b/include/linux/pci_hotplug.h
98788@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
98789 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
98790 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
98791 int (*reset_slot) (struct hotplug_slot *slot, int probe);
98792-};
98793+} __do_const;
98794+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
98795
98796 /**
98797 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
98798diff --git a/include/linux/percpu.h b/include/linux/percpu.h
98799index caebf2a..4c3ae9d 100644
98800--- a/include/linux/percpu.h
98801+++ b/include/linux/percpu.h
98802@@ -34,7 +34,7 @@
98803 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
98804 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
98805 */
98806-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
98807+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
98808 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
98809
98810 /*
98811diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
98812index d8a82a8..8b580f0 100644
98813--- a/include/linux/perf_event.h
98814+++ b/include/linux/perf_event.h
98815@@ -379,8 +379,8 @@ struct perf_event {
98816
98817 enum perf_event_active_state state;
98818 unsigned int attach_state;
98819- local64_t count;
98820- atomic64_t child_count;
98821+ local64_t count; /* PaX: fix it one day */
98822+ atomic64_unchecked_t child_count;
98823
98824 /*
98825 * These are the total time in nanoseconds that the event
98826@@ -431,8 +431,8 @@ struct perf_event {
98827 * These accumulate total time (in nanoseconds) that children
98828 * events have been enabled and running, respectively.
98829 */
98830- atomic64_t child_total_time_enabled;
98831- atomic64_t child_total_time_running;
98832+ atomic64_unchecked_t child_total_time_enabled;
98833+ atomic64_unchecked_t child_total_time_running;
98834
98835 /*
98836 * Protect attach/detach and child_list:
98837@@ -812,7 +812,7 @@ static inline void perf_event_task_sched_out(struct task_struct *prev,
98838
98839 static inline u64 __perf_event_count(struct perf_event *event)
98840 {
98841- return local64_read(&event->count) + atomic64_read(&event->child_count);
98842+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
98843 }
98844
98845 extern void perf_event_mmap(struct vm_area_struct *vma);
98846@@ -836,7 +836,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
98847 entry->ip[entry->nr++] = ip;
98848 }
98849
98850-extern int sysctl_perf_event_paranoid;
98851+extern int sysctl_perf_event_legitimately_concerned;
98852 extern int sysctl_perf_event_mlock;
98853 extern int sysctl_perf_event_sample_rate;
98854 extern int sysctl_perf_cpu_time_max_percent;
98855@@ -851,19 +851,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
98856 loff_t *ppos);
98857
98858
98859+static inline bool perf_paranoid_any(void)
98860+{
98861+ return sysctl_perf_event_legitimately_concerned > 2;
98862+}
98863+
98864 static inline bool perf_paranoid_tracepoint_raw(void)
98865 {
98866- return sysctl_perf_event_paranoid > -1;
98867+ return sysctl_perf_event_legitimately_concerned > -1;
98868 }
98869
98870 static inline bool perf_paranoid_cpu(void)
98871 {
98872- return sysctl_perf_event_paranoid > 0;
98873+ return sysctl_perf_event_legitimately_concerned > 0;
98874 }
98875
98876 static inline bool perf_paranoid_kernel(void)
98877 {
98878- return sysctl_perf_event_paranoid > 1;
98879+ return sysctl_perf_event_legitimately_concerned > 1;
98880 }
98881
98882 extern void perf_event_init(void);
98883@@ -1017,7 +1022,7 @@ struct perf_pmu_events_attr {
98884 struct device_attribute attr;
98885 u64 id;
98886 const char *event_str;
98887-};
98888+} __do_const;
98889
98890 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
98891 char *page);
98892diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
98893index 918b117..7af374b7 100644
98894--- a/include/linux/pid_namespace.h
98895+++ b/include/linux/pid_namespace.h
98896@@ -45,7 +45,7 @@ struct pid_namespace {
98897 int hide_pid;
98898 int reboot; /* group exit code if this pidns was rebooted */
98899 struct ns_common ns;
98900-};
98901+} __randomize_layout;
98902
98903 extern struct pid_namespace init_pid_ns;
98904
98905diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
98906index eb8b8ac..62649e1 100644
98907--- a/include/linux/pipe_fs_i.h
98908+++ b/include/linux/pipe_fs_i.h
98909@@ -47,10 +47,10 @@ struct pipe_inode_info {
98910 struct mutex mutex;
98911 wait_queue_head_t wait;
98912 unsigned int nrbufs, curbuf, buffers;
98913- unsigned int readers;
98914- unsigned int writers;
98915- unsigned int files;
98916- unsigned int waiting_writers;
98917+ atomic_t readers;
98918+ atomic_t writers;
98919+ atomic_t files;
98920+ atomic_t waiting_writers;
98921 unsigned int r_counter;
98922 unsigned int w_counter;
98923 struct page *tmp_page;
98924diff --git a/include/linux/pm.h b/include/linux/pm.h
98925index 2d29c64..1b25b2a 100644
98926--- a/include/linux/pm.h
98927+++ b/include/linux/pm.h
98928@@ -616,6 +616,7 @@ struct dev_pm_domain {
98929 void (*sync)(struct device *dev);
98930 void (*dismiss)(struct device *dev);
98931 };
98932+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
98933
98934 /*
98935 * The PM_EVENT_ messages are also used by drivers implementing the legacy
98936diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
98937index 681ccb0..a90e0b7 100644
98938--- a/include/linux/pm_domain.h
98939+++ b/include/linux/pm_domain.h
98940@@ -39,11 +39,11 @@ struct gpd_dev_ops {
98941 int (*save_state)(struct device *dev);
98942 int (*restore_state)(struct device *dev);
98943 bool (*active_wakeup)(struct device *dev);
98944-};
98945+} __no_const;
98946
98947 struct gpd_cpuidle_data {
98948 unsigned int saved_exit_latency;
98949- struct cpuidle_state *idle_state;
98950+ cpuidle_state_no_const *idle_state;
98951 };
98952
98953 struct generic_pm_domain {
98954diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
98955index 30e84d4..22278b4 100644
98956--- a/include/linux/pm_runtime.h
98957+++ b/include/linux/pm_runtime.h
98958@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
98959
98960 static inline void pm_runtime_mark_last_busy(struct device *dev)
98961 {
98962- ACCESS_ONCE(dev->power.last_busy) = jiffies;
98963+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
98964 }
98965
98966 static inline bool pm_runtime_is_irq_safe(struct device *dev)
98967diff --git a/include/linux/pnp.h b/include/linux/pnp.h
98968index 5df733b..d55f252 100644
98969--- a/include/linux/pnp.h
98970+++ b/include/linux/pnp.h
98971@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
98972 struct pnp_fixup {
98973 char id[7];
98974 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
98975-};
98976+} __do_const;
98977
98978 /* config parameters */
98979 #define PNP_CONFIG_NORMAL 0x0001
98980diff --git a/include/linux/poison.h b/include/linux/poison.h
98981index 2110a81..13a11bb 100644
98982--- a/include/linux/poison.h
98983+++ b/include/linux/poison.h
98984@@ -19,8 +19,8 @@
98985 * under normal circumstances, used to verify that nobody uses
98986 * non-initialized list entries.
98987 */
98988-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
98989-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
98990+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
98991+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
98992
98993 /********** include/linux/timer.h **********/
98994 /*
98995diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
98996index d8b187c3..9a9257a 100644
98997--- a/include/linux/power/smartreflex.h
98998+++ b/include/linux/power/smartreflex.h
98999@@ -238,7 +238,7 @@ struct omap_sr_class_data {
99000 int (*notify)(struct omap_sr *sr, u32 status);
99001 u8 notify_flags;
99002 u8 class_type;
99003-};
99004+} __do_const;
99005
99006 /**
99007 * struct omap_sr_nvalue_table - Smartreflex n-target value info
99008diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
99009index 4ea1d37..80f4b33 100644
99010--- a/include/linux/ppp-comp.h
99011+++ b/include/linux/ppp-comp.h
99012@@ -84,7 +84,7 @@ struct compressor {
99013 struct module *owner;
99014 /* Extra skb space needed by the compressor algorithm */
99015 unsigned int comp_extra;
99016-};
99017+} __do_const;
99018
99019 /*
99020 * The return value from decompress routine is the length of the
99021diff --git a/include/linux/preempt.h b/include/linux/preempt.h
99022index de83b4e..c4b997d 100644
99023--- a/include/linux/preempt.h
99024+++ b/include/linux/preempt.h
99025@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
99026 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
99027 #endif
99028
99029+#define raw_preempt_count_add(val) __preempt_count_add(val)
99030+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
99031+
99032 #define __preempt_count_inc() __preempt_count_add(1)
99033 #define __preempt_count_dec() __preempt_count_sub(1)
99034
99035 #define preempt_count_inc() preempt_count_add(1)
99036+#define raw_preempt_count_inc() raw_preempt_count_add(1)
99037 #define preempt_count_dec() preempt_count_sub(1)
99038+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
99039
99040 #ifdef CONFIG_PREEMPT_COUNT
99041
99042@@ -41,6 +46,12 @@ do { \
99043 barrier(); \
99044 } while (0)
99045
99046+#define raw_preempt_disable() \
99047+do { \
99048+ raw_preempt_count_inc(); \
99049+ barrier(); \
99050+} while (0)
99051+
99052 #define sched_preempt_enable_no_resched() \
99053 do { \
99054 barrier(); \
99055@@ -49,6 +60,12 @@ do { \
99056
99057 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
99058
99059+#define raw_preempt_enable_no_resched() \
99060+do { \
99061+ barrier(); \
99062+ raw_preempt_count_dec(); \
99063+} while (0)
99064+
99065 #ifdef CONFIG_PREEMPT
99066 #define preempt_enable() \
99067 do { \
99068@@ -113,8 +130,10 @@ do { \
99069 * region.
99070 */
99071 #define preempt_disable() barrier()
99072+#define raw_preempt_disable() barrier()
99073 #define sched_preempt_enable_no_resched() barrier()
99074 #define preempt_enable_no_resched() barrier()
99075+#define raw_preempt_enable_no_resched() barrier()
99076 #define preempt_enable() barrier()
99077 #define preempt_check_resched() do { } while (0)
99078
99079@@ -128,11 +147,13 @@ do { \
99080 /*
99081 * Modules have no business playing preemption tricks.
99082 */
99083+#ifndef CONFIG_PAX_KERNEXEC
99084 #undef sched_preempt_enable_no_resched
99085 #undef preempt_enable_no_resched
99086 #undef preempt_enable_no_resched_notrace
99087 #undef preempt_check_resched
99088 #endif
99089+#endif
99090
99091 #define preempt_set_need_resched() \
99092 do { \
99093diff --git a/include/linux/printk.h b/include/linux/printk.h
99094index 9b30871..1aebc2d 100644
99095--- a/include/linux/printk.h
99096+++ b/include/linux/printk.h
99097@@ -120,7 +120,8 @@ static inline __printf(1, 2) __cold
99098 void early_printk(const char *s, ...) { }
99099 #endif
99100
99101-typedef int(*printk_func_t)(const char *fmt, va_list args);
99102+typedef __printf(1, 0) int (*printk_func_t)(const char *fmt, va_list args);
99103+extern int kptr_restrict;
99104
99105 #ifdef CONFIG_PRINTK
99106 asmlinkage __printf(5, 0)
99107@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
99108
99109 extern int printk_delay_msec;
99110 extern int dmesg_restrict;
99111-extern int kptr_restrict;
99112
99113 extern void wake_up_klogd(void);
99114
99115@@ -164,7 +164,7 @@ char *log_buf_addr_get(void);
99116 u32 log_buf_len_get(void);
99117 void log_buf_kexec_setup(void);
99118 void __init setup_log_buf(int early);
99119-void dump_stack_set_arch_desc(const char *fmt, ...);
99120+__printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...);
99121 void dump_stack_print_info(const char *log_lvl);
99122 void show_regs_print_info(const char *log_lvl);
99123 #else
99124@@ -215,7 +215,7 @@ static inline void setup_log_buf(int early)
99125 {
99126 }
99127
99128-static inline void dump_stack_set_arch_desc(const char *fmt, ...)
99129+static inline __printf(1, 2) void dump_stack_set_arch_desc(const char *fmt, ...)
99130 {
99131 }
99132
99133diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
99134index b97bf2e..f14c92d4 100644
99135--- a/include/linux/proc_fs.h
99136+++ b/include/linux/proc_fs.h
99137@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
99138 extern struct proc_dir_entry *proc_symlink(const char *,
99139 struct proc_dir_entry *, const char *);
99140 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
99141+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
99142 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
99143 struct proc_dir_entry *, void *);
99144+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
99145+ struct proc_dir_entry *, void *);
99146 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
99147 struct proc_dir_entry *);
99148
99149@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
99150 return proc_create_data(name, mode, parent, proc_fops, NULL);
99151 }
99152
99153+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
99154+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
99155+{
99156+#ifdef CONFIG_GRKERNSEC_PROC_USER
99157+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
99158+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99159+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
99160+#else
99161+ return proc_create_data(name, mode, parent, proc_fops, NULL);
99162+#endif
99163+}
99164+
99165+
99166 extern void proc_set_size(struct proc_dir_entry *, loff_t);
99167 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
99168 extern void *PDE_DATA(const struct inode *);
99169@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
99170 struct proc_dir_entry *parent,const char *dest) { return NULL;}
99171 static inline struct proc_dir_entry *proc_mkdir(const char *name,
99172 struct proc_dir_entry *parent) {return NULL;}
99173+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
99174+ struct proc_dir_entry *parent) { return NULL; }
99175 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
99176 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
99177+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
99178+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
99179 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
99180 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
99181 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
99182@@ -79,7 +99,7 @@ struct net;
99183 static inline struct proc_dir_entry *proc_net_mkdir(
99184 struct net *net, const char *name, struct proc_dir_entry *parent)
99185 {
99186- return proc_mkdir_data(name, 0, parent, net);
99187+ return proc_mkdir_data_restrict(name, 0, parent, net);
99188 }
99189
99190 #endif /* _LINUX_PROC_FS_H */
99191diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
99192index 42dfc61..8113a99 100644
99193--- a/include/linux/proc_ns.h
99194+++ b/include/linux/proc_ns.h
99195@@ -16,7 +16,7 @@ struct proc_ns_operations {
99196 struct ns_common *(*get)(struct task_struct *task);
99197 void (*put)(struct ns_common *ns);
99198 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
99199-};
99200+} __do_const __randomize_layout;
99201
99202 extern const struct proc_ns_operations netns_operations;
99203 extern const struct proc_ns_operations utsns_operations;
99204diff --git a/include/linux/quota.h b/include/linux/quota.h
99205index b2505ac..5f7ab55 100644
99206--- a/include/linux/quota.h
99207+++ b/include/linux/quota.h
99208@@ -76,7 +76,7 @@ struct kqid { /* Type in which we store the quota identifier */
99209
99210 extern bool qid_eq(struct kqid left, struct kqid right);
99211 extern bool qid_lt(struct kqid left, struct kqid right);
99212-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
99213+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
99214 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
99215 extern bool qid_valid(struct kqid qid);
99216
99217diff --git a/include/linux/random.h b/include/linux/random.h
99218index b05856e..0a9f14e 100644
99219--- a/include/linux/random.h
99220+++ b/include/linux/random.h
99221@@ -9,9 +9,19 @@
99222 #include <uapi/linux/random.h>
99223
99224 extern void add_device_randomness(const void *, unsigned int);
99225+
99226+static inline void add_latent_entropy(void)
99227+{
99228+
99229+#ifdef LATENT_ENTROPY_PLUGIN
99230+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
99231+#endif
99232+
99233+}
99234+
99235 extern void add_input_randomness(unsigned int type, unsigned int code,
99236- unsigned int value);
99237-extern void add_interrupt_randomness(int irq, int irq_flags);
99238+ unsigned int value) __latent_entropy;
99239+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
99240
99241 extern void get_random_bytes(void *buf, int nbytes);
99242 extern void get_random_bytes_arch(void *buf, int nbytes);
99243@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
99244 extern const struct file_operations random_fops, urandom_fops;
99245 #endif
99246
99247-unsigned int get_random_int(void);
99248+unsigned int __intentional_overflow(-1) get_random_int(void);
99249 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
99250
99251-u32 prandom_u32(void);
99252+u32 prandom_u32(void) __intentional_overflow(-1);
99253 void prandom_bytes(void *buf, size_t nbytes);
99254 void prandom_seed(u32 seed);
99255 void prandom_reseed_late(void);
99256@@ -37,6 +47,11 @@ struct rnd_state {
99257 u32 prandom_u32_state(struct rnd_state *state);
99258 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
99259
99260+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
99261+{
99262+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
99263+}
99264+
99265 /**
99266 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
99267 * @ep_ro: right open interval endpoint
99268@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
99269 *
99270 * Returns: pseudo-random number in interval [0, ep_ro)
99271 */
99272-static inline u32 prandom_u32_max(u32 ep_ro)
99273+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
99274 {
99275 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
99276 }
99277diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
99278index 378c5ee..aa84a47 100644
99279--- a/include/linux/rbtree_augmented.h
99280+++ b/include/linux/rbtree_augmented.h
99281@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
99282 old->rbaugmented = rbcompute(old); \
99283 } \
99284 rbstatic const struct rb_augment_callbacks rbname = { \
99285- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
99286+ .propagate = rbname ## _propagate, \
99287+ .copy = rbname ## _copy, \
99288+ .rotate = rbname ## _rotate \
99289 };
99290
99291
99292diff --git a/include/linux/rculist.h b/include/linux/rculist.h
99293index a18b16f..2683096 100644
99294--- a/include/linux/rculist.h
99295+++ b/include/linux/rculist.h
99296@@ -29,8 +29,8 @@
99297 */
99298 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
99299 {
99300- ACCESS_ONCE(list->next) = list;
99301- ACCESS_ONCE(list->prev) = list;
99302+ ACCESS_ONCE_RW(list->next) = list;
99303+ ACCESS_ONCE_RW(list->prev) = list;
99304 }
99305
99306 /*
99307@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
99308 struct list_head *prev, struct list_head *next);
99309 #endif
99310
99311+void __pax_list_add_rcu(struct list_head *new,
99312+ struct list_head *prev, struct list_head *next);
99313+
99314 /**
99315 * list_add_rcu - add a new entry to rcu-protected list
99316 * @new: new entry to be added
99317@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
99318 __list_add_rcu(new, head, head->next);
99319 }
99320
99321+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
99322+{
99323+ __pax_list_add_rcu(new, head, head->next);
99324+}
99325+
99326 /**
99327 * list_add_tail_rcu - add a new entry to rcu-protected list
99328 * @new: new entry to be added
99329@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
99330 __list_add_rcu(new, head->prev, head);
99331 }
99332
99333+static inline void pax_list_add_tail_rcu(struct list_head *new,
99334+ struct list_head *head)
99335+{
99336+ __pax_list_add_rcu(new, head->prev, head);
99337+}
99338+
99339 /**
99340 * list_del_rcu - deletes entry from list without re-initialization
99341 * @entry: the element to delete from the list.
99342@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
99343 entry->prev = LIST_POISON2;
99344 }
99345
99346+extern void pax_list_del_rcu(struct list_head *entry);
99347+
99348 /**
99349 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
99350 * @n: the element to delete from the hash list.
99351diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
99352index 573a5af..de97a14 100644
99353--- a/include/linux/rcupdate.h
99354+++ b/include/linux/rcupdate.h
99355@@ -365,7 +365,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
99356 do { \
99357 rcu_all_qs(); \
99358 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
99359- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
99360+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
99361 } while (0)
99362 #else /* #ifdef CONFIG_TASKS_RCU */
99363 #define TASKS_RCU(x) do { } while (0)
99364diff --git a/include/linux/reboot.h b/include/linux/reboot.h
99365index a7ff409..03e2fa8 100644
99366--- a/include/linux/reboot.h
99367+++ b/include/linux/reboot.h
99368@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
99369 */
99370
99371 extern void migrate_to_reboot_cpu(void);
99372-extern void machine_restart(char *cmd);
99373-extern void machine_halt(void);
99374-extern void machine_power_off(void);
99375+extern void machine_restart(char *cmd) __noreturn;
99376+extern void machine_halt(void) __noreturn;
99377+extern void machine_power_off(void) __noreturn;
99378
99379 extern void machine_shutdown(void);
99380 struct pt_regs;
99381@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
99382 */
99383
99384 extern void kernel_restart_prepare(char *cmd);
99385-extern void kernel_restart(char *cmd);
99386-extern void kernel_halt(void);
99387-extern void kernel_power_off(void);
99388+extern void kernel_restart(char *cmd) __noreturn;
99389+extern void kernel_halt(void) __noreturn;
99390+extern void kernel_power_off(void) __noreturn;
99391
99392 extern int C_A_D; /* for sysctl */
99393 void ctrl_alt_del(void);
99394@@ -77,7 +77,7 @@ extern void orderly_reboot(void);
99395 * Emergency restart, callable from an interrupt handler.
99396 */
99397
99398-extern void emergency_restart(void);
99399+extern void emergency_restart(void) __noreturn;
99400 #include <asm/emergency-restart.h>
99401
99402 #endif /* _LINUX_REBOOT_H */
99403diff --git a/include/linux/regset.h b/include/linux/regset.h
99404index 8e0c9fe..ac4d221 100644
99405--- a/include/linux/regset.h
99406+++ b/include/linux/regset.h
99407@@ -161,7 +161,8 @@ struct user_regset {
99408 unsigned int align;
99409 unsigned int bias;
99410 unsigned int core_note_type;
99411-};
99412+} __do_const;
99413+typedef struct user_regset __no_const user_regset_no_const;
99414
99415 /**
99416 * struct user_regset_view - available regsets
99417diff --git a/include/linux/relay.h b/include/linux/relay.h
99418index d7c8359..818daf5 100644
99419--- a/include/linux/relay.h
99420+++ b/include/linux/relay.h
99421@@ -157,7 +157,7 @@ struct rchan_callbacks
99422 * The callback should return 0 if successful, negative if not.
99423 */
99424 int (*remove_buf_file)(struct dentry *dentry);
99425-};
99426+} __no_const;
99427
99428 /*
99429 * CONFIG_RELAY kernel API, kernel/relay.c
99430diff --git a/include/linux/rio.h b/include/linux/rio.h
99431index 6bda06f..bf39a9b 100644
99432--- a/include/linux/rio.h
99433+++ b/include/linux/rio.h
99434@@ -358,7 +358,7 @@ struct rio_ops {
99435 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
99436 u64 rstart, u32 size, u32 flags);
99437 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
99438-};
99439+} __no_const;
99440
99441 #define RIO_RESOURCE_MEM 0x00000100
99442 #define RIO_RESOURCE_DOORBELL 0x00000200
99443diff --git a/include/linux/rmap.h b/include/linux/rmap.h
99444index c89c53a..aa0a65a 100644
99445--- a/include/linux/rmap.h
99446+++ b/include/linux/rmap.h
99447@@ -146,8 +146,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
99448 void anon_vma_init(void); /* create anon_vma_cachep */
99449 int anon_vma_prepare(struct vm_area_struct *);
99450 void unlink_anon_vmas(struct vm_area_struct *);
99451-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
99452-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
99453+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
99454+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
99455
99456 static inline void anon_vma_merge(struct vm_area_struct *vma,
99457 struct vm_area_struct *next)
99458diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
99459index ed8f9e70..2e627f2 100644
99460--- a/include/linux/scatterlist.h
99461+++ b/include/linux/scatterlist.h
99462@@ -1,6 +1,7 @@
99463 #ifndef _LINUX_SCATTERLIST_H
99464 #define _LINUX_SCATTERLIST_H
99465
99466+#include <linux/sched.h>
99467 #include <linux/string.h>
99468 #include <linux/bug.h>
99469 #include <linux/mm.h>
99470@@ -111,10 +112,17 @@ static inline struct page *sg_page(struct scatterlist *sg)
99471 static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
99472 unsigned int buflen)
99473 {
99474+ const void *realbuf = buf;
99475+
99476+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99477+ if (object_starts_on_stack(buf))
99478+ realbuf = buf - current->stack + current->lowmem_stack;
99479+#endif
99480+
99481 #ifdef CONFIG_DEBUG_SG
99482- BUG_ON(!virt_addr_valid(buf));
99483+ BUG_ON(!virt_addr_valid(realbuf));
99484 #endif
99485- sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
99486+ sg_set_page(sg, virt_to_page(realbuf), buflen, offset_in_page(realbuf));
99487 }
99488
99489 /*
99490diff --git a/include/linux/sched.h b/include/linux/sched.h
99491index 26a2e61..36bbf4b 100644
99492--- a/include/linux/sched.h
99493+++ b/include/linux/sched.h
99494@@ -132,6 +132,7 @@ struct fs_struct;
99495 struct perf_event_context;
99496 struct blk_plug;
99497 struct filename;
99498+struct linux_binprm;
99499
99500 #define VMACACHE_BITS 2
99501 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
99502@@ -413,7 +414,7 @@ extern char __sched_text_start[], __sched_text_end[];
99503 extern int in_sched_functions(unsigned long addr);
99504
99505 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
99506-extern signed long schedule_timeout(signed long timeout);
99507+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
99508 extern signed long schedule_timeout_interruptible(signed long timeout);
99509 extern signed long schedule_timeout_killable(signed long timeout);
99510 extern signed long schedule_timeout_uninterruptible(signed long timeout);
99511@@ -431,6 +432,19 @@ struct nsproxy;
99512 struct user_namespace;
99513
99514 #ifdef CONFIG_MMU
99515+
99516+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
99517+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
99518+#else
99519+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
99520+{
99521+ return 0;
99522+}
99523+#endif
99524+
99525+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
99526+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
99527+
99528 extern void arch_pick_mmap_layout(struct mm_struct *mm);
99529 extern unsigned long
99530 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
99531@@ -729,6 +743,17 @@ struct signal_struct {
99532 #ifdef CONFIG_TASKSTATS
99533 struct taskstats *stats;
99534 #endif
99535+
99536+#ifdef CONFIG_GRKERNSEC
99537+ u32 curr_ip;
99538+ u32 saved_ip;
99539+ u32 gr_saddr;
99540+ u32 gr_daddr;
99541+ u16 gr_sport;
99542+ u16 gr_dport;
99543+ u8 used_accept:1;
99544+#endif
99545+
99546 #ifdef CONFIG_AUDIT
99547 unsigned audit_tty;
99548 unsigned audit_tty_log_passwd;
99549@@ -755,7 +780,7 @@ struct signal_struct {
99550 struct mutex cred_guard_mutex; /* guard against foreign influences on
99551 * credential calculations
99552 * (notably. ptrace) */
99553-};
99554+} __randomize_layout;
99555
99556 /*
99557 * Bits in flags field of signal_struct.
99558@@ -808,6 +833,14 @@ struct user_struct {
99559 struct key *session_keyring; /* UID's default session keyring */
99560 #endif
99561
99562+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
99563+ unsigned char kernel_banned;
99564+#endif
99565+#ifdef CONFIG_GRKERNSEC_BRUTE
99566+ unsigned char suid_banned;
99567+ unsigned long suid_ban_expires;
99568+#endif
99569+
99570 /* Hash table maintenance information */
99571 struct hlist_node uidhash_node;
99572 kuid_t uid;
99573@@ -815,7 +848,7 @@ struct user_struct {
99574 #ifdef CONFIG_PERF_EVENTS
99575 atomic_long_t locked_vm;
99576 #endif
99577-};
99578+} __randomize_layout;
99579
99580 extern int uids_sysfs_init(void);
99581
99582@@ -1292,6 +1325,9 @@ enum perf_event_task_context {
99583 struct task_struct {
99584 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
99585 void *stack;
99586+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99587+ void *lowmem_stack;
99588+#endif
99589 atomic_t usage;
99590 unsigned int flags; /* per process flags, defined below */
99591 unsigned int ptrace;
99592@@ -1425,8 +1461,8 @@ struct task_struct {
99593 struct list_head thread_node;
99594
99595 struct completion *vfork_done; /* for vfork() */
99596- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
99597- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
99598+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
99599+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
99600
99601 cputime_t utime, stime, utimescaled, stimescaled;
99602 cputime_t gtime;
99603@@ -1451,11 +1487,6 @@ struct task_struct {
99604 struct task_cputime cputime_expires;
99605 struct list_head cpu_timers[3];
99606
99607-/* process credentials */
99608- const struct cred __rcu *real_cred; /* objective and real subjective task
99609- * credentials (COW) */
99610- const struct cred __rcu *cred; /* effective (overridable) subjective task
99611- * credentials (COW) */
99612 char comm[TASK_COMM_LEN]; /* executable name excluding path
99613 - access with [gs]et_task_comm (which lock
99614 it with task_lock())
99615@@ -1473,6 +1504,10 @@ struct task_struct {
99616 #endif
99617 /* CPU-specific state of this task */
99618 struct thread_struct thread;
99619+/* thread_info moved to task_struct */
99620+#ifdef CONFIG_X86
99621+ struct thread_info tinfo;
99622+#endif
99623 /* filesystem information */
99624 struct fs_struct *fs;
99625 /* open file information */
99626@@ -1547,6 +1582,10 @@ struct task_struct {
99627 gfp_t lockdep_reclaim_gfp;
99628 #endif
99629
99630+/* process credentials */
99631+ const struct cred __rcu *real_cred; /* objective and real subjective task
99632+ * credentials (COW) */
99633+
99634 /* journalling filesystem info */
99635 void *journal_info;
99636
99637@@ -1585,6 +1624,10 @@ struct task_struct {
99638 /* cg_list protected by css_set_lock and tsk->alloc_lock */
99639 struct list_head cg_list;
99640 #endif
99641+
99642+ const struct cred __rcu *cred; /* effective (overridable) subjective task
99643+ * credentials (COW) */
99644+
99645 #ifdef CONFIG_FUTEX
99646 struct robust_list_head __user *robust_list;
99647 #ifdef CONFIG_COMPAT
99648@@ -1696,7 +1739,7 @@ struct task_struct {
99649 * Number of functions that haven't been traced
99650 * because of depth overrun.
99651 */
99652- atomic_t trace_overrun;
99653+ atomic_unchecked_t trace_overrun;
99654 /* Pause for the tracing */
99655 atomic_t tracing_graph_pause;
99656 #endif
99657@@ -1724,7 +1767,78 @@ struct task_struct {
99658 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
99659 unsigned long task_state_change;
99660 #endif
99661-};
99662+
99663+#ifdef CONFIG_GRKERNSEC
99664+ /* grsecurity */
99665+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
99666+ u64 exec_id;
99667+#endif
99668+#ifdef CONFIG_GRKERNSEC_SETXID
99669+ const struct cred *delayed_cred;
99670+#endif
99671+ struct dentry *gr_chroot_dentry;
99672+ struct acl_subject_label *acl;
99673+ struct acl_subject_label *tmpacl;
99674+ struct acl_role_label *role;
99675+ struct file *exec_file;
99676+ unsigned long brute_expires;
99677+ u16 acl_role_id;
99678+ u8 inherited;
99679+ /* is this the task that authenticated to the special role */
99680+ u8 acl_sp_role;
99681+ u8 is_writable;
99682+ u8 brute;
99683+ u8 gr_is_chrooted;
99684+#endif
99685+
99686+} __randomize_layout;
99687+
99688+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
99689+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
99690+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
99691+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
99692+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
99693+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
99694+
99695+#ifdef CONFIG_PAX_SOFTMODE
99696+extern int pax_softmode;
99697+#endif
99698+
99699+extern int pax_check_flags(unsigned long *);
99700+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
99701+
99702+/* if tsk != current then task_lock must be held on it */
99703+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
99704+static inline unsigned long pax_get_flags(struct task_struct *tsk)
99705+{
99706+ if (likely(tsk->mm))
99707+ return tsk->mm->pax_flags;
99708+ else
99709+ return 0UL;
99710+}
99711+
99712+/* if tsk != current then task_lock must be held on it */
99713+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
99714+{
99715+ if (likely(tsk->mm)) {
99716+ tsk->mm->pax_flags = flags;
99717+ return 0;
99718+ }
99719+ return -EINVAL;
99720+}
99721+#endif
99722+
99723+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
99724+extern void pax_set_initial_flags(struct linux_binprm *bprm);
99725+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
99726+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
99727+#endif
99728+
99729+struct path;
99730+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
99731+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
99732+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
99733+extern void pax_report_refcount_overflow(struct pt_regs *regs);
99734
99735 /* Future-safe accessor for struct task_struct's cpus_allowed. */
99736 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
99737@@ -1807,7 +1921,7 @@ struct pid_namespace;
99738 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
99739 struct pid_namespace *ns);
99740
99741-static inline pid_t task_pid_nr(struct task_struct *tsk)
99742+static inline pid_t task_pid_nr(const struct task_struct *tsk)
99743 {
99744 return tsk->pid;
99745 }
99746@@ -2175,6 +2289,25 @@ extern u64 sched_clock_cpu(int cpu);
99747
99748 extern void sched_clock_init(void);
99749
99750+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99751+static inline void populate_stack(void)
99752+{
99753+ struct task_struct *curtask = current;
99754+ int c;
99755+ int *ptr = curtask->stack;
99756+ int *end = curtask->stack + THREAD_SIZE;
99757+
99758+ while (ptr < end) {
99759+ c = *(volatile int *)ptr;
99760+ ptr += PAGE_SIZE/sizeof(int);
99761+ }
99762+}
99763+#else
99764+static inline void populate_stack(void)
99765+{
99766+}
99767+#endif
99768+
99769 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
99770 static inline void sched_clock_tick(void)
99771 {
99772@@ -2303,7 +2436,9 @@ extern void set_curr_task(int cpu, struct task_struct *p);
99773 void yield(void);
99774
99775 union thread_union {
99776+#ifndef CONFIG_X86
99777 struct thread_info thread_info;
99778+#endif
99779 unsigned long stack[THREAD_SIZE/sizeof(long)];
99780 };
99781
99782@@ -2336,6 +2471,7 @@ extern struct pid_namespace init_pid_ns;
99783 */
99784
99785 extern struct task_struct *find_task_by_vpid(pid_t nr);
99786+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
99787 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
99788 struct pid_namespace *ns);
99789
99790@@ -2500,7 +2636,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
99791 extern void exit_itimers(struct signal_struct *);
99792 extern void flush_itimer_signals(void);
99793
99794-extern void do_group_exit(int);
99795+extern __noreturn void do_group_exit(int);
99796
99797 extern int do_execve(struct filename *,
99798 const char __user * const __user *,
99799@@ -2721,9 +2857,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
99800 #define task_stack_end_corrupted(task) \
99801 (*(end_of_stack(task)) != STACK_END_MAGIC)
99802
99803-static inline int object_is_on_stack(void *obj)
99804+static inline int object_starts_on_stack(const void *obj)
99805 {
99806- void *stack = task_stack_page(current);
99807+ const void *stack = task_stack_page(current);
99808
99809 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
99810 }
99811diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
99812index 596a0e0..bea77ec 100644
99813--- a/include/linux/sched/sysctl.h
99814+++ b/include/linux/sched/sysctl.h
99815@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
99816 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
99817
99818 extern int sysctl_max_map_count;
99819+extern unsigned long sysctl_heap_stack_gap;
99820
99821 extern unsigned int sysctl_sched_latency;
99822 extern unsigned int sysctl_sched_min_granularity;
99823diff --git a/include/linux/security.h b/include/linux/security.h
99824index 18264ea..e0238e4 100644
99825--- a/include/linux/security.h
99826+++ b/include/linux/security.h
99827@@ -27,6 +27,7 @@
99828 #include <linux/slab.h>
99829 #include <linux/err.h>
99830 #include <linux/string.h>
99831+#include <linux/grsecurity.h>
99832
99833 struct linux_binprm;
99834 struct cred;
99835@@ -116,8 +117,6 @@ struct seq_file;
99836
99837 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
99838
99839-void reset_security_ops(void);
99840-
99841 #ifdef CONFIG_MMU
99842 extern unsigned long mmap_min_addr;
99843 extern unsigned long dac_mmap_min_addr;
99844@@ -1755,7 +1754,7 @@ struct security_operations {
99845 struct audit_context *actx);
99846 void (*audit_rule_free) (void *lsmrule);
99847 #endif /* CONFIG_AUDIT */
99848-};
99849+} __randomize_layout;
99850
99851 /* prototypes */
99852 extern int security_init(void);
99853diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
99854index dc368b8..e895209 100644
99855--- a/include/linux/semaphore.h
99856+++ b/include/linux/semaphore.h
99857@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
99858 }
99859
99860 extern void down(struct semaphore *sem);
99861-extern int __must_check down_interruptible(struct semaphore *sem);
99862+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
99863 extern int __must_check down_killable(struct semaphore *sem);
99864 extern int __must_check down_trylock(struct semaphore *sem);
99865 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
99866diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
99867index afbb1fd..e1d205d 100644
99868--- a/include/linux/seq_file.h
99869+++ b/include/linux/seq_file.h
99870@@ -27,6 +27,9 @@ struct seq_file {
99871 struct mutex lock;
99872 const struct seq_operations *op;
99873 int poll_event;
99874+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
99875+ u64 exec_id;
99876+#endif
99877 #ifdef CONFIG_USER_NS
99878 struct user_namespace *user_ns;
99879 #endif
99880@@ -39,6 +42,7 @@ struct seq_operations {
99881 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
99882 int (*show) (struct seq_file *m, void *v);
99883 };
99884+typedef struct seq_operations __no_const seq_operations_no_const;
99885
99886 #define SEQ_SKIP 1
99887
99888@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
99889
99890 char *mangle_path(char *s, const char *p, const char *esc);
99891 int seq_open(struct file *, const struct seq_operations *);
99892+int seq_open_restrict(struct file *, const struct seq_operations *);
99893 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
99894 loff_t seq_lseek(struct file *, loff_t, int);
99895 int seq_release(struct inode *, struct file *);
99896@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
99897 const struct path *root, const char *esc);
99898
99899 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
99900+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
99901 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
99902 int single_release(struct inode *, struct file *);
99903 void *__seq_open_private(struct file *, const struct seq_operations *, int);
99904diff --git a/include/linux/shm.h b/include/linux/shm.h
99905index 6fb8016..ab4465e 100644
99906--- a/include/linux/shm.h
99907+++ b/include/linux/shm.h
99908@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
99909 /* The task created the shm object. NULL if the task is dead. */
99910 struct task_struct *shm_creator;
99911 struct list_head shm_clist; /* list by creator */
99912+#ifdef CONFIG_GRKERNSEC
99913+ u64 shm_createtime;
99914+ pid_t shm_lapid;
99915+#endif
99916 };
99917
99918 /* shm_mode upper byte flags */
99919diff --git a/include/linux/signal.h b/include/linux/signal.h
99920index ab1e039..ad4229e 100644
99921--- a/include/linux/signal.h
99922+++ b/include/linux/signal.h
99923@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
99924 * know it'll be handled, so that they don't get converted to
99925 * SIGKILL or just silently dropped.
99926 */
99927- kernel_sigaction(sig, (__force __sighandler_t)2);
99928+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
99929 }
99930
99931 static inline void disallow_signal(int sig)
99932diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
99933index f15154a..17b985a 100644
99934--- a/include/linux/skbuff.h
99935+++ b/include/linux/skbuff.h
99936@@ -776,7 +776,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
99937 int node);
99938 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
99939 struct sk_buff *build_skb(void *data, unsigned int frag_size);
99940-static inline struct sk_buff *alloc_skb(unsigned int size,
99941+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
99942 gfp_t priority)
99943 {
99944 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
99945@@ -1590,20 +1590,16 @@ static inline void __skb_fill_page_desc(struct sk_buff *skb, int i,
99946 skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
99947
99948 /*
99949- * Propagate page->pfmemalloc to the skb if we can. The problem is
99950- * that not all callers have unique ownership of the page. If
99951- * pfmemalloc is set, we check the mapping as a mapping implies
99952- * page->index is set (index and pfmemalloc share space).
99953- * If it's a valid mapping, we cannot use page->pfmemalloc but we
99954- * do not lose pfmemalloc information as the pages would not be
99955- * allocated using __GFP_MEMALLOC.
99956+ * Propagate page pfmemalloc to the skb if we can. The problem is
99957+ * that not all callers have unique ownership of the page but rely
99958+ * on page_is_pfmemalloc doing the right thing(tm).
99959 */
99960 frag->page.p = page;
99961 frag->page_offset = off;
99962 skb_frag_size_set(frag, size);
99963
99964 page = compound_head(page);
99965- if (page->pfmemalloc && !page->mapping)
99966+ if (page_is_pfmemalloc(page))
99967 skb->pfmemalloc = true;
99968 }
99969
99970@@ -1971,7 +1967,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
99971 return skb->inner_transport_header - skb->inner_network_header;
99972 }
99973
99974-static inline int skb_network_offset(const struct sk_buff *skb)
99975+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
99976 {
99977 return skb_network_header(skb) - skb->data;
99978 }
99979@@ -2031,7 +2027,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
99980 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
99981 */
99982 #ifndef NET_SKB_PAD
99983-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
99984+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
99985 #endif
99986
99987 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
99988@@ -2250,7 +2246,7 @@ static inline struct page *dev_alloc_page(void)
99989 static inline void skb_propagate_pfmemalloc(struct page *page,
99990 struct sk_buff *skb)
99991 {
99992- if (page && page->pfmemalloc)
99993+ if (page_is_pfmemalloc(page))
99994 skb->pfmemalloc = true;
99995 }
99996
99997@@ -2673,9 +2669,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
99998 int *err);
99999 unsigned int datagram_poll(struct file *file, struct socket *sock,
100000 struct poll_table_struct *wait);
100001-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
100002+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
100003 struct iov_iter *to, int size);
100004-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
100005+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
100006 struct msghdr *msg, int size)
100007 {
100008 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
100009@@ -3197,6 +3193,9 @@ static inline void nf_reset(struct sk_buff *skb)
100010 nf_bridge_put(skb->nf_bridge);
100011 skb->nf_bridge = NULL;
100012 #endif
100013+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
100014+ skb->nf_trace = 0;
100015+#endif
100016 }
100017
100018 static inline void nf_reset_trace(struct sk_buff *skb)
100019diff --git a/include/linux/slab.h b/include/linux/slab.h
100020index ffd24c8..cbbe7de 100644
100021--- a/include/linux/slab.h
100022+++ b/include/linux/slab.h
100023@@ -15,14 +15,29 @@
100024 #include <linux/types.h>
100025 #include <linux/workqueue.h>
100026
100027+#include <linux/err.h>
100028
100029 /*
100030 * Flags to pass to kmem_cache_create().
100031 * The ones marked DEBUG are only valid if CONFIG_DEBUG_SLAB is set.
100032 */
100033 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
100034+
100035+#ifdef CONFIG_PAX_USERCOPY_SLABS
100036+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
100037+#else
100038+#define SLAB_USERCOPY 0x00000000UL
100039+#endif
100040+
100041 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
100042 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
100043+
100044+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100045+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
100046+#else
100047+#define SLAB_NO_SANITIZE 0x00000000UL
100048+#endif
100049+
100050 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
100051 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
100052 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
100053@@ -98,10 +113,13 @@
100054 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
100055 * Both make kfree a no-op.
100056 */
100057-#define ZERO_SIZE_PTR ((void *)16)
100058+#define ZERO_SIZE_PTR \
100059+({ \
100060+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
100061+ (void *)(-MAX_ERRNO-1L); \
100062+})
100063
100064-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
100065- (unsigned long)ZERO_SIZE_PTR)
100066+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
100067
100068 #include <linux/kmemleak.h>
100069 #include <linux/kasan.h>
100070@@ -143,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
100071 void kfree(const void *);
100072 void kzfree(const void *);
100073 size_t ksize(const void *);
100074+const char *check_heap_object(const void *ptr, unsigned long n);
100075+bool is_usercopy_object(const void *ptr);
100076
100077 /*
100078 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
100079@@ -235,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
100080 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
100081 #endif
100082
100083+#ifdef CONFIG_PAX_USERCOPY_SLABS
100084+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
100085+#endif
100086+
100087 /*
100088 * Figure out which kmalloc slab an allocation of a certain size
100089 * belongs to.
100090@@ -243,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
100091 * 2 = 120 .. 192 bytes
100092 * n = 2^(n-1) .. 2^n -1
100093 */
100094-static __always_inline int kmalloc_index(size_t size)
100095+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
100096 {
100097 if (!size)
100098 return 0;
100099@@ -286,15 +310,15 @@ static __always_inline int kmalloc_index(size_t size)
100100 }
100101 #endif /* !CONFIG_SLOB */
100102
100103-void *__kmalloc(size_t size, gfp_t flags);
100104+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
100105 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
100106 void kmem_cache_free(struct kmem_cache *, void *);
100107
100108 #ifdef CONFIG_NUMA
100109-void *__kmalloc_node(size_t size, gfp_t flags, int node);
100110+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
100111 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
100112 #else
100113-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
100114+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
100115 {
100116 return __kmalloc(size, flags);
100117 }
100118diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
100119index 33d0490..70a6313 100644
100120--- a/include/linux/slab_def.h
100121+++ b/include/linux/slab_def.h
100122@@ -40,7 +40,7 @@ struct kmem_cache {
100123 /* 4) cache creation/removal */
100124 const char *name;
100125 struct list_head list;
100126- int refcount;
100127+ atomic_t refcount;
100128 int object_size;
100129 int align;
100130
100131@@ -56,10 +56,14 @@ struct kmem_cache {
100132 unsigned long node_allocs;
100133 unsigned long node_frees;
100134 unsigned long node_overflow;
100135- atomic_t allochit;
100136- atomic_t allocmiss;
100137- atomic_t freehit;
100138- atomic_t freemiss;
100139+ atomic_unchecked_t allochit;
100140+ atomic_unchecked_t allocmiss;
100141+ atomic_unchecked_t freehit;
100142+ atomic_unchecked_t freemiss;
100143+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100144+ atomic_unchecked_t sanitized;
100145+ atomic_unchecked_t not_sanitized;
100146+#endif
100147
100148 /*
100149 * If debugging is enabled, then the allocator can add additional
100150diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
100151index 3388511..6252f90 100644
100152--- a/include/linux/slub_def.h
100153+++ b/include/linux/slub_def.h
100154@@ -74,7 +74,7 @@ struct kmem_cache {
100155 struct kmem_cache_order_objects max;
100156 struct kmem_cache_order_objects min;
100157 gfp_t allocflags; /* gfp flags to use on each alloc */
100158- int refcount; /* Refcount for slab cache destroy */
100159+ atomic_t refcount; /* Refcount for slab cache destroy */
100160 void (*ctor)(void *);
100161 int inuse; /* Offset to metadata */
100162 int align; /* Alignment */
100163diff --git a/include/linux/smp.h b/include/linux/smp.h
100164index c441407..f487b83 100644
100165--- a/include/linux/smp.h
100166+++ b/include/linux/smp.h
100167@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
100168 #endif
100169
100170 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
100171+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
100172 #define put_cpu() preempt_enable()
100173+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
100174
100175 /*
100176 * Callback to arch code if there's nosmp or maxcpus=0 on the
100177diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
100178index 083ac38..b23e3e8 100644
100179--- a/include/linux/sock_diag.h
100180+++ b/include/linux/sock_diag.h
100181@@ -11,7 +11,7 @@ struct sock;
100182 struct sock_diag_handler {
100183 __u8 family;
100184 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
100185-};
100186+} __do_const;
100187
100188 int sock_diag_register(const struct sock_diag_handler *h);
100189 void sock_diag_unregister(const struct sock_diag_handler *h);
100190diff --git a/include/linux/sonet.h b/include/linux/sonet.h
100191index 680f9a3..f13aeb0 100644
100192--- a/include/linux/sonet.h
100193+++ b/include/linux/sonet.h
100194@@ -7,7 +7,7 @@
100195 #include <uapi/linux/sonet.h>
100196
100197 struct k_sonet_stats {
100198-#define __HANDLE_ITEM(i) atomic_t i
100199+#define __HANDLE_ITEM(i) atomic_unchecked_t i
100200 __SONET_ITEMS
100201 #undef __HANDLE_ITEM
100202 };
100203diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
100204index 07d8e53..dc934c9 100644
100205--- a/include/linux/sunrpc/addr.h
100206+++ b/include/linux/sunrpc/addr.h
100207@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
100208 {
100209 switch (sap->sa_family) {
100210 case AF_INET:
100211- return ntohs(((struct sockaddr_in *)sap)->sin_port);
100212+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
100213 case AF_INET6:
100214- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
100215+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
100216 }
100217 return 0;
100218 }
100219@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
100220 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
100221 const struct sockaddr *src)
100222 {
100223- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
100224+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
100225 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
100226
100227 dsin->sin_family = ssin->sin_family;
100228@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
100229 if (sa->sa_family != AF_INET6)
100230 return 0;
100231
100232- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
100233+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
100234 }
100235
100236 #endif /* _LINUX_SUNRPC_ADDR_H */
100237diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
100238index 598ba80..d90cba6 100644
100239--- a/include/linux/sunrpc/clnt.h
100240+++ b/include/linux/sunrpc/clnt.h
100241@@ -100,7 +100,7 @@ struct rpc_procinfo {
100242 unsigned int p_timer; /* Which RTT timer to use */
100243 u32 p_statidx; /* Which procedure to account */
100244 const char * p_name; /* name of procedure */
100245-};
100246+} __do_const;
100247
100248 #ifdef __KERNEL__
100249
100250diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
100251index fae6fb9..023fbcd 100644
100252--- a/include/linux/sunrpc/svc.h
100253+++ b/include/linux/sunrpc/svc.h
100254@@ -420,7 +420,7 @@ struct svc_procedure {
100255 unsigned int pc_count; /* call count */
100256 unsigned int pc_cachetype; /* cache info (NFS) */
100257 unsigned int pc_xdrressize; /* maximum size of XDR reply */
100258-};
100259+} __do_const;
100260
100261 /*
100262 * Function prototypes.
100263diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
100264index df8edf8..d140fec 100644
100265--- a/include/linux/sunrpc/svc_rdma.h
100266+++ b/include/linux/sunrpc/svc_rdma.h
100267@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
100268 extern unsigned int svcrdma_max_requests;
100269 extern unsigned int svcrdma_max_req_size;
100270
100271-extern atomic_t rdma_stat_recv;
100272-extern atomic_t rdma_stat_read;
100273-extern atomic_t rdma_stat_write;
100274-extern atomic_t rdma_stat_sq_starve;
100275-extern atomic_t rdma_stat_rq_starve;
100276-extern atomic_t rdma_stat_rq_poll;
100277-extern atomic_t rdma_stat_rq_prod;
100278-extern atomic_t rdma_stat_sq_poll;
100279-extern atomic_t rdma_stat_sq_prod;
100280+extern atomic_unchecked_t rdma_stat_recv;
100281+extern atomic_unchecked_t rdma_stat_read;
100282+extern atomic_unchecked_t rdma_stat_write;
100283+extern atomic_unchecked_t rdma_stat_sq_starve;
100284+extern atomic_unchecked_t rdma_stat_rq_starve;
100285+extern atomic_unchecked_t rdma_stat_rq_poll;
100286+extern atomic_unchecked_t rdma_stat_rq_prod;
100287+extern atomic_unchecked_t rdma_stat_sq_poll;
100288+extern atomic_unchecked_t rdma_stat_sq_prod;
100289
100290 /*
100291 * Contexts are built when an RDMA request is created and are a
100292diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
100293index 8d71d65..f79586e 100644
100294--- a/include/linux/sunrpc/svcauth.h
100295+++ b/include/linux/sunrpc/svcauth.h
100296@@ -120,7 +120,7 @@ struct auth_ops {
100297 int (*release)(struct svc_rqst *rq);
100298 void (*domain_release)(struct auth_domain *);
100299 int (*set_client)(struct svc_rqst *rq);
100300-};
100301+} __do_const;
100302
100303 #define SVC_GARBAGE 1
100304 #define SVC_SYSERR 2
100305diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
100306index e7a018e..49f8b17 100644
100307--- a/include/linux/swiotlb.h
100308+++ b/include/linux/swiotlb.h
100309@@ -60,7 +60,8 @@ extern void
100310
100311 extern void
100312 swiotlb_free_coherent(struct device *hwdev, size_t size,
100313- void *vaddr, dma_addr_t dma_handle);
100314+ void *vaddr, dma_addr_t dma_handle,
100315+ struct dma_attrs *attrs);
100316
100317 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
100318 unsigned long offset, size_t size,
100319diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
100320index 76d1e38..200776e 100644
100321--- a/include/linux/syscalls.h
100322+++ b/include/linux/syscalls.h
100323@@ -102,7 +102,12 @@ union bpf_attr;
100324 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
100325 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
100326 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
100327-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
100328+#define __SC_LONG(t, a) __typeof__( \
100329+ __builtin_choose_expr( \
100330+ sizeof(t) > sizeof(int), \
100331+ (t) 0, \
100332+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
100333+ )) a
100334 #define __SC_CAST(t, a) (t) a
100335 #define __SC_ARGS(t, a) a
100336 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
100337@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
100338 asmlinkage long sys_fsync(unsigned int fd);
100339 asmlinkage long sys_fdatasync(unsigned int fd);
100340 asmlinkage long sys_bdflush(int func, long data);
100341-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
100342- char __user *type, unsigned long flags,
100343+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
100344+ const char __user *type, unsigned long flags,
100345 void __user *data);
100346-asmlinkage long sys_umount(char __user *name, int flags);
100347-asmlinkage long sys_oldumount(char __user *name);
100348+asmlinkage long sys_umount(const char __user *name, int flags);
100349+asmlinkage long sys_oldumount(const char __user *name);
100350 asmlinkage long sys_truncate(const char __user *path, long length);
100351 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
100352 asmlinkage long sys_stat(const char __user *filename,
100353@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
100354 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
100355 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
100356 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
100357- struct sockaddr __user *, int);
100358+ struct sockaddr __user *, int) __intentional_overflow(0);
100359 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
100360 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
100361 unsigned int vlen, unsigned flags);
100362@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
100363
100364 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
100365 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
100366- unsigned nsops);
100367+ long nsops);
100368 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
100369 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
100370- unsigned nsops,
100371+ long nsops,
100372 const struct timespec __user *timeout);
100373 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
100374 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
100375diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
100376index 27b3b0b..e093dd9 100644
100377--- a/include/linux/syscore_ops.h
100378+++ b/include/linux/syscore_ops.h
100379@@ -16,7 +16,7 @@ struct syscore_ops {
100380 int (*suspend)(void);
100381 void (*resume)(void);
100382 void (*shutdown)(void);
100383-};
100384+} __do_const;
100385
100386 extern void register_syscore_ops(struct syscore_ops *ops);
100387 extern void unregister_syscore_ops(struct syscore_ops *ops);
100388diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
100389index fa7bc29..0d96561 100644
100390--- a/include/linux/sysctl.h
100391+++ b/include/linux/sysctl.h
100392@@ -39,10 +39,16 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
100393
100394 extern int proc_dostring(struct ctl_table *, int,
100395 void __user *, size_t *, loff_t *);
100396+extern int proc_dostring_modpriv(struct ctl_table *, int,
100397+ void __user *, size_t *, loff_t *);
100398 extern int proc_dointvec(struct ctl_table *, int,
100399 void __user *, size_t *, loff_t *);
100400+extern int proc_dointvec_secure(struct ctl_table *, int,
100401+ void __user *, size_t *, loff_t *);
100402 extern int proc_dointvec_minmax(struct ctl_table *, int,
100403 void __user *, size_t *, loff_t *);
100404+extern int proc_dointvec_minmax_secure(struct ctl_table *, int,
100405+ void __user *, size_t *, loff_t *);
100406 extern int proc_dointvec_jiffies(struct ctl_table *, int,
100407 void __user *, size_t *, loff_t *);
100408 extern int proc_dointvec_userhz_jiffies(struct ctl_table *, int,
100409@@ -113,7 +119,8 @@ struct ctl_table
100410 struct ctl_table_poll *poll;
100411 void *extra1;
100412 void *extra2;
100413-};
100414+} __do_const __randomize_layout;
100415+typedef struct ctl_table __no_const ctl_table_no_const;
100416
100417 struct ctl_node {
100418 struct rb_node node;
100419diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
100420index 9f65758..487a6f1 100644
100421--- a/include/linux/sysfs.h
100422+++ b/include/linux/sysfs.h
100423@@ -34,7 +34,8 @@ struct attribute {
100424 struct lock_class_key *key;
100425 struct lock_class_key skey;
100426 #endif
100427-};
100428+} __do_const;
100429+typedef struct attribute __no_const attribute_no_const;
100430
100431 /**
100432 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
100433@@ -78,7 +79,8 @@ struct attribute_group {
100434 struct attribute *, int);
100435 struct attribute **attrs;
100436 struct bin_attribute **bin_attrs;
100437-};
100438+} __do_const;
100439+typedef struct attribute_group __no_const attribute_group_no_const;
100440
100441 /**
100442 * Use these macros to make defining attributes easier. See include/linux/device.h
100443@@ -152,7 +154,8 @@ struct bin_attribute {
100444 char *, loff_t, size_t);
100445 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
100446 struct vm_area_struct *vma);
100447-};
100448+} __do_const;
100449+typedef struct bin_attribute __no_const bin_attribute_no_const;
100450
100451 /**
100452 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
100453diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
100454index 387fa7d..3fcde6b 100644
100455--- a/include/linux/sysrq.h
100456+++ b/include/linux/sysrq.h
100457@@ -16,6 +16,7 @@
100458
100459 #include <linux/errno.h>
100460 #include <linux/types.h>
100461+#include <linux/compiler.h>
100462
100463 /* Possible values of bitmask for enabling sysrq functions */
100464 /* 0x0001 is reserved for enable everything */
100465@@ -33,7 +34,7 @@ struct sysrq_key_op {
100466 char *help_msg;
100467 char *action_msg;
100468 int enable_mask;
100469-};
100470+} __do_const;
100471
100472 #ifdef CONFIG_MAGIC_SYSRQ
100473
100474diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
100475index ff307b5..f1a4468 100644
100476--- a/include/linux/thread_info.h
100477+++ b/include/linux/thread_info.h
100478@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
100479 #error "no set_restore_sigmask() provided and default one won't work"
100480 #endif
100481
100482+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
100483+
100484+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
100485+{
100486+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
100487+}
100488+
100489 #endif /* __KERNEL__ */
100490
100491 #endif /* _LINUX_THREAD_INFO_H */
100492diff --git a/include/linux/tty.h b/include/linux/tty.h
100493index d76631f..de91e82 100644
100494--- a/include/linux/tty.h
100495+++ b/include/linux/tty.h
100496@@ -225,7 +225,7 @@ struct tty_port {
100497 const struct tty_port_operations *ops; /* Port operations */
100498 spinlock_t lock; /* Lock protecting tty field */
100499 int blocked_open; /* Waiting to open */
100500- int count; /* Usage count */
100501+ atomic_t count; /* Usage count */
100502 wait_queue_head_t open_wait; /* Open waiters */
100503 wait_queue_head_t close_wait; /* Close waiters */
100504 wait_queue_head_t delta_msr_wait; /* Modem status change */
100505@@ -313,7 +313,7 @@ struct tty_struct {
100506 /* If the tty has a pending do_SAK, queue it here - akpm */
100507 struct work_struct SAK_work;
100508 struct tty_port *port;
100509-};
100510+} __randomize_layout;
100511
100512 /* Each of a tty's open files has private_data pointing to tty_file_private */
100513 struct tty_file_private {
100514@@ -573,7 +573,7 @@ extern int tty_port_open(struct tty_port *port,
100515 struct tty_struct *tty, struct file *filp);
100516 static inline int tty_port_users(struct tty_port *port)
100517 {
100518- return port->count + port->blocked_open;
100519+ return atomic_read(&port->count) + port->blocked_open;
100520 }
100521
100522 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
100523diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
100524index 92e337c..f46757b 100644
100525--- a/include/linux/tty_driver.h
100526+++ b/include/linux/tty_driver.h
100527@@ -291,7 +291,7 @@ struct tty_operations {
100528 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
100529 #endif
100530 const struct file_operations *proc_fops;
100531-};
100532+} __do_const __randomize_layout;
100533
100534 struct tty_driver {
100535 int magic; /* magic number for this structure */
100536@@ -325,7 +325,7 @@ struct tty_driver {
100537
100538 const struct tty_operations *ops;
100539 struct list_head tty_drivers;
100540-};
100541+} __randomize_layout;
100542
100543 extern struct list_head tty_drivers;
100544
100545diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
100546index 00c9d68..bc0188b 100644
100547--- a/include/linux/tty_ldisc.h
100548+++ b/include/linux/tty_ldisc.h
100549@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
100550
100551 struct module *owner;
100552
100553- int refcount;
100554+ atomic_t refcount;
100555 };
100556
100557 struct tty_ldisc {
100558diff --git a/include/linux/types.h b/include/linux/types.h
100559index 8715287..1be77ee 100644
100560--- a/include/linux/types.h
100561+++ b/include/linux/types.h
100562@@ -176,10 +176,26 @@ typedef struct {
100563 int counter;
100564 } atomic_t;
100565
100566+#ifdef CONFIG_PAX_REFCOUNT
100567+typedef struct {
100568+ int counter;
100569+} atomic_unchecked_t;
100570+#else
100571+typedef atomic_t atomic_unchecked_t;
100572+#endif
100573+
100574 #ifdef CONFIG_64BIT
100575 typedef struct {
100576 long counter;
100577 } atomic64_t;
100578+
100579+#ifdef CONFIG_PAX_REFCOUNT
100580+typedef struct {
100581+ long counter;
100582+} atomic64_unchecked_t;
100583+#else
100584+typedef atomic64_t atomic64_unchecked_t;
100585+#endif
100586 #endif
100587
100588 struct list_head {
100589diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
100590index ecd3319..8a36ded 100644
100591--- a/include/linux/uaccess.h
100592+++ b/include/linux/uaccess.h
100593@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
100594 long ret; \
100595 mm_segment_t old_fs = get_fs(); \
100596 \
100597- set_fs(KERNEL_DS); \
100598 pagefault_disable(); \
100599- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
100600- pagefault_enable(); \
100601+ set_fs(KERNEL_DS); \
100602+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
100603 set_fs(old_fs); \
100604+ pagefault_enable(); \
100605 ret; \
100606 })
100607
100608diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
100609index 0383552..a0125dd 100644
100610--- a/include/linux/uidgid.h
100611+++ b/include/linux/uidgid.h
100612@@ -187,4 +187,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
100613
100614 #endif /* CONFIG_USER_NS */
100615
100616+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
100617+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
100618+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
100619+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
100620+
100621 #endif /* _LINUX_UIDGID_H */
100622diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
100623index 32c0e83..671eb35 100644
100624--- a/include/linux/uio_driver.h
100625+++ b/include/linux/uio_driver.h
100626@@ -67,7 +67,7 @@ struct uio_device {
100627 struct module *owner;
100628 struct device *dev;
100629 int minor;
100630- atomic_t event;
100631+ atomic_unchecked_t event;
100632 struct fasync_struct *async_queue;
100633 wait_queue_head_t wait;
100634 struct uio_info *info;
100635diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
100636index 99c1b4d..562e6f3 100644
100637--- a/include/linux/unaligned/access_ok.h
100638+++ b/include/linux/unaligned/access_ok.h
100639@@ -4,34 +4,34 @@
100640 #include <linux/kernel.h>
100641 #include <asm/byteorder.h>
100642
100643-static inline u16 get_unaligned_le16(const void *p)
100644+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
100645 {
100646- return le16_to_cpup((__le16 *)p);
100647+ return le16_to_cpup((const __le16 *)p);
100648 }
100649
100650-static inline u32 get_unaligned_le32(const void *p)
100651+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
100652 {
100653- return le32_to_cpup((__le32 *)p);
100654+ return le32_to_cpup((const __le32 *)p);
100655 }
100656
100657-static inline u64 get_unaligned_le64(const void *p)
100658+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
100659 {
100660- return le64_to_cpup((__le64 *)p);
100661+ return le64_to_cpup((const __le64 *)p);
100662 }
100663
100664-static inline u16 get_unaligned_be16(const void *p)
100665+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
100666 {
100667- return be16_to_cpup((__be16 *)p);
100668+ return be16_to_cpup((const __be16 *)p);
100669 }
100670
100671-static inline u32 get_unaligned_be32(const void *p)
100672+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
100673 {
100674- return be32_to_cpup((__be32 *)p);
100675+ return be32_to_cpup((const __be32 *)p);
100676 }
100677
100678-static inline u64 get_unaligned_be64(const void *p)
100679+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
100680 {
100681- return be64_to_cpup((__be64 *)p);
100682+ return be64_to_cpup((const __be64 *)p);
100683 }
100684
100685 static inline void put_unaligned_le16(u16 val, void *p)
100686diff --git a/include/linux/usb.h b/include/linux/usb.h
100687index 447fe29..9fc875f 100644
100688--- a/include/linux/usb.h
100689+++ b/include/linux/usb.h
100690@@ -592,7 +592,7 @@ struct usb_device {
100691 int maxchild;
100692
100693 u32 quirks;
100694- atomic_t urbnum;
100695+ atomic_unchecked_t urbnum;
100696
100697 unsigned long active_duration;
100698
100699@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
100700
100701 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
100702 __u8 request, __u8 requesttype, __u16 value, __u16 index,
100703- void *data, __u16 size, int timeout);
100704+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
100705 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
100706 void *data, int len, int *actual_length, int timeout);
100707 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
100708diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
100709index f06529c..dfeabd8 100644
100710--- a/include/linux/usb/renesas_usbhs.h
100711+++ b/include/linux/usb/renesas_usbhs.h
100712@@ -39,7 +39,7 @@ enum {
100713 */
100714 struct renesas_usbhs_driver_callback {
100715 int (*notify_hotplug)(struct platform_device *pdev);
100716-};
100717+} __no_const;
100718
100719 /*
100720 * callback functions for platform
100721diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
100722index 8297e5b..0dfae27 100644
100723--- a/include/linux/user_namespace.h
100724+++ b/include/linux/user_namespace.h
100725@@ -39,7 +39,7 @@ struct user_namespace {
100726 struct key *persistent_keyring_register;
100727 struct rw_semaphore persistent_keyring_register_sem;
100728 #endif
100729-};
100730+} __randomize_layout;
100731
100732 extern struct user_namespace init_user_ns;
100733
100734diff --git a/include/linux/utsname.h b/include/linux/utsname.h
100735index 5093f58..c103e58 100644
100736--- a/include/linux/utsname.h
100737+++ b/include/linux/utsname.h
100738@@ -25,7 +25,7 @@ struct uts_namespace {
100739 struct new_utsname name;
100740 struct user_namespace *user_ns;
100741 struct ns_common ns;
100742-};
100743+} __randomize_layout;
100744 extern struct uts_namespace init_uts_ns;
100745
100746 #ifdef CONFIG_UTS_NS
100747diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
100748index 6f8fbcf..4efc177 100644
100749--- a/include/linux/vermagic.h
100750+++ b/include/linux/vermagic.h
100751@@ -25,9 +25,42 @@
100752 #define MODULE_ARCH_VERMAGIC ""
100753 #endif
100754
100755+#ifdef CONFIG_PAX_REFCOUNT
100756+#define MODULE_PAX_REFCOUNT "REFCOUNT "
100757+#else
100758+#define MODULE_PAX_REFCOUNT ""
100759+#endif
100760+
100761+#ifdef CONSTIFY_PLUGIN
100762+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
100763+#else
100764+#define MODULE_CONSTIFY_PLUGIN ""
100765+#endif
100766+
100767+#ifdef STACKLEAK_PLUGIN
100768+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
100769+#else
100770+#define MODULE_STACKLEAK_PLUGIN ""
100771+#endif
100772+
100773+#ifdef RANDSTRUCT_PLUGIN
100774+#include <generated/randomize_layout_hash.h>
100775+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
100776+#else
100777+#define MODULE_RANDSTRUCT_PLUGIN
100778+#endif
100779+
100780+#ifdef CONFIG_GRKERNSEC
100781+#define MODULE_GRSEC "GRSEC "
100782+#else
100783+#define MODULE_GRSEC ""
100784+#endif
100785+
100786 #define VERMAGIC_STRING \
100787 UTS_RELEASE " " \
100788 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
100789 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
100790- MODULE_ARCH_VERMAGIC
100791+ MODULE_ARCH_VERMAGIC \
100792+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
100793+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
100794
100795diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
100796index b483abd..af305ad 100644
100797--- a/include/linux/vga_switcheroo.h
100798+++ b/include/linux/vga_switcheroo.h
100799@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
100800
100801 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
100802
100803-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
100804+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
100805 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
100806-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
100807+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
100808 #else
100809
100810 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
100811@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
100812
100813 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
100814
100815-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
100816+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
100817 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
100818-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
100819+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
100820
100821 #endif
100822 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
100823diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
100824index 0ec5983..d5888bb 100644
100825--- a/include/linux/vmalloc.h
100826+++ b/include/linux/vmalloc.h
100827@@ -18,6 +18,14 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
100828 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
100829 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
100830 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
100831+
100832+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
100833+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
100834+#endif
100835+
100836+#define VM_USERCOPY 0x00000200 /* allocation intended for copies to userland */
100837+
100838+
100839 /* bits [20..32] reserved for arch specific ioremap internals */
100840
100841 /*
100842@@ -67,6 +75,7 @@ static inline void vmalloc_init(void)
100843 #endif
100844
100845 extern void *vmalloc(unsigned long size);
100846+extern void *vmalloc_usercopy(unsigned long size);
100847 extern void *vzalloc(unsigned long size);
100848 extern void *vmalloc_user(unsigned long size);
100849 extern void *vmalloc_node(unsigned long size, int node);
100850@@ -86,6 +95,10 @@ extern void *vmap(struct page **pages, unsigned int count,
100851 unsigned long flags, pgprot_t prot);
100852 extern void vunmap(const void *addr);
100853
100854+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
100855+extern void unmap_process_stacks(struct task_struct *task);
100856+#endif
100857+
100858 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
100859 unsigned long uaddr, void *kaddr,
100860 unsigned long size);
100861@@ -150,7 +163,7 @@ extern void free_vm_area(struct vm_struct *area);
100862
100863 /* for /dev/kmem */
100864 extern long vread(char *buf, char *addr, unsigned long count);
100865-extern long vwrite(char *buf, char *addr, unsigned long count);
100866+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
100867
100868 /*
100869 * Internals. Dont't use..
100870diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
100871index 82e7db7..f8ce3d0 100644
100872--- a/include/linux/vmstat.h
100873+++ b/include/linux/vmstat.h
100874@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
100875 /*
100876 * Zone based page accounting with per cpu differentials.
100877 */
100878-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
100879+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
100880
100881 static inline void zone_page_state_add(long x, struct zone *zone,
100882 enum zone_stat_item item)
100883 {
100884- atomic_long_add(x, &zone->vm_stat[item]);
100885- atomic_long_add(x, &vm_stat[item]);
100886+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
100887+ atomic_long_add_unchecked(x, &vm_stat[item]);
100888 }
100889
100890-static inline unsigned long global_page_state(enum zone_stat_item item)
100891+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
100892 {
100893- long x = atomic_long_read(&vm_stat[item]);
100894+ long x = atomic_long_read_unchecked(&vm_stat[item]);
100895 #ifdef CONFIG_SMP
100896 if (x < 0)
100897 x = 0;
100898@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
100899 return x;
100900 }
100901
100902-static inline unsigned long zone_page_state(struct zone *zone,
100903+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
100904 enum zone_stat_item item)
100905 {
100906- long x = atomic_long_read(&zone->vm_stat[item]);
100907+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
100908 #ifdef CONFIG_SMP
100909 if (x < 0)
100910 x = 0;
100911@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
100912 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
100913 enum zone_stat_item item)
100914 {
100915- long x = atomic_long_read(&zone->vm_stat[item]);
100916+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
100917
100918 #ifdef CONFIG_SMP
100919 int cpu;
100920@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
100921
100922 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
100923 {
100924- atomic_long_inc(&zone->vm_stat[item]);
100925- atomic_long_inc(&vm_stat[item]);
100926+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
100927+ atomic_long_inc_unchecked(&vm_stat[item]);
100928 }
100929
100930 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
100931 {
100932- atomic_long_dec(&zone->vm_stat[item]);
100933- atomic_long_dec(&vm_stat[item]);
100934+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
100935+ atomic_long_dec_unchecked(&vm_stat[item]);
100936 }
100937
100938 static inline void __inc_zone_page_state(struct page *page,
100939diff --git a/include/linux/xattr.h b/include/linux/xattr.h
100940index 91b0a68..0e9adf6 100644
100941--- a/include/linux/xattr.h
100942+++ b/include/linux/xattr.h
100943@@ -28,7 +28,7 @@ struct xattr_handler {
100944 size_t size, int handler_flags);
100945 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
100946 size_t size, int flags, int handler_flags);
100947-};
100948+} __do_const;
100949
100950 struct xattr {
100951 const char *name;
100952@@ -37,6 +37,9 @@ struct xattr {
100953 };
100954
100955 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
100956+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
100957+ssize_t pax_getxattr(struct dentry *, void *, size_t);
100958+#endif
100959 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
100960 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
100961 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
100962diff --git a/include/linux/zlib.h b/include/linux/zlib.h
100963index 92dbbd3..13ab0b3 100644
100964--- a/include/linux/zlib.h
100965+++ b/include/linux/zlib.h
100966@@ -31,6 +31,7 @@
100967 #define _ZLIB_H
100968
100969 #include <linux/zconf.h>
100970+#include <linux/compiler.h>
100971
100972 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
100973 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
100974@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
100975
100976 /* basic functions */
100977
100978-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
100979+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
100980 /*
100981 Returns the number of bytes that needs to be allocated for a per-
100982 stream workspace with the specified parameters. A pointer to this
100983diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
100984index acbcd2f..c3abe84 100644
100985--- a/include/media/v4l2-dev.h
100986+++ b/include/media/v4l2-dev.h
100987@@ -74,7 +74,7 @@ struct v4l2_file_operations {
100988 int (*mmap) (struct file *, struct vm_area_struct *);
100989 int (*open) (struct file *);
100990 int (*release) (struct file *);
100991-};
100992+} __do_const;
100993
100994 /*
100995 * Newer version of video_device, handled by videodev2.c
100996diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
100997index 9c58157..d86ebf5 100644
100998--- a/include/media/v4l2-device.h
100999+++ b/include/media/v4l2-device.h
101000@@ -93,7 +93,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
101001 this function returns 0. If the name ends with a digit (e.g. cx18),
101002 then the name will be set to cx18-0 since cx180 looks really odd. */
101003 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
101004- atomic_t *instance);
101005+ atomic_unchecked_t *instance);
101006
101007 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
101008 Since the parent disappears this ensures that v4l2_dev doesn't have an
101009diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
101010index 5122b5e..598b440 100644
101011--- a/include/net/9p/transport.h
101012+++ b/include/net/9p/transport.h
101013@@ -62,7 +62,7 @@ struct p9_trans_module {
101014 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
101015 int (*zc_request)(struct p9_client *, struct p9_req_t *,
101016 struct iov_iter *, struct iov_iter *, int , int, int);
101017-};
101018+} __do_const;
101019
101020 void v9fs_register_trans(struct p9_trans_module *m);
101021 void v9fs_unregister_trans(struct p9_trans_module *m);
101022diff --git a/include/net/af_unix.h b/include/net/af_unix.h
101023index a175ba4..196eb8242 100644
101024--- a/include/net/af_unix.h
101025+++ b/include/net/af_unix.h
101026@@ -36,7 +36,7 @@ struct unix_skb_parms {
101027 u32 secid; /* Security ID */
101028 #endif
101029 u32 consumed;
101030-};
101031+} __randomize_layout;
101032
101033 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
101034 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
101035diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
101036index 2239a37..a83461f 100644
101037--- a/include/net/bluetooth/l2cap.h
101038+++ b/include/net/bluetooth/l2cap.h
101039@@ -609,7 +609,7 @@ struct l2cap_ops {
101040 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
101041 unsigned long hdr_len,
101042 unsigned long len, int nb);
101043-};
101044+} __do_const;
101045
101046 struct l2cap_conn {
101047 struct hci_conn *hcon;
101048diff --git a/include/net/bonding.h b/include/net/bonding.h
101049index 78ed135..2f53667 100644
101050--- a/include/net/bonding.h
101051+++ b/include/net/bonding.h
101052@@ -658,7 +658,7 @@ extern struct rtnl_link_ops bond_link_ops;
101053
101054 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
101055 {
101056- atomic_long_inc(&dev->tx_dropped);
101057+ atomic_long_inc_unchecked(&dev->tx_dropped);
101058 dev_kfree_skb_any(skb);
101059 }
101060
101061diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
101062index f2ae33d..c457cf0 100644
101063--- a/include/net/caif/cfctrl.h
101064+++ b/include/net/caif/cfctrl.h
101065@@ -52,7 +52,7 @@ struct cfctrl_rsp {
101066 void (*radioset_rsp)(void);
101067 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
101068 struct cflayer *client_layer);
101069-};
101070+} __no_const;
101071
101072 /* Link Setup Parameters for CAIF-Links. */
101073 struct cfctrl_link_param {
101074@@ -101,8 +101,8 @@ struct cfctrl_request_info {
101075 struct cfctrl {
101076 struct cfsrvl serv;
101077 struct cfctrl_rsp res;
101078- atomic_t req_seq_no;
101079- atomic_t rsp_seq_no;
101080+ atomic_unchecked_t req_seq_no;
101081+ atomic_unchecked_t rsp_seq_no;
101082 struct list_head list;
101083 /* Protects from simultaneous access to first_req list */
101084 spinlock_t info_list_lock;
101085diff --git a/include/net/flow.h b/include/net/flow.h
101086index 8109a15..504466d 100644
101087--- a/include/net/flow.h
101088+++ b/include/net/flow.h
101089@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
101090
101091 void flow_cache_flush(struct net *net);
101092 void flow_cache_flush_deferred(struct net *net);
101093-extern atomic_t flow_cache_genid;
101094+extern atomic_unchecked_t flow_cache_genid;
101095
101096 #endif
101097diff --git a/include/net/genetlink.h b/include/net/genetlink.h
101098index a9af1cc..1f3fa7b 100644
101099--- a/include/net/genetlink.h
101100+++ b/include/net/genetlink.h
101101@@ -128,7 +128,7 @@ struct genl_ops {
101102 u8 cmd;
101103 u8 internal_flags;
101104 u8 flags;
101105-};
101106+} __do_const;
101107
101108 int __genl_register_family(struct genl_family *family);
101109
101110diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
101111index 0f712c0..cd762c4 100644
101112--- a/include/net/gro_cells.h
101113+++ b/include/net/gro_cells.h
101114@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
101115 cell = this_cpu_ptr(gcells->cells);
101116
101117 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
101118- atomic_long_inc(&dev->rx_dropped);
101119+ atomic_long_inc_unchecked(&dev->rx_dropped);
101120 kfree_skb(skb);
101121 return;
101122 }
101123diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
101124index 0320bbb..938789c 100644
101125--- a/include/net/inet_connection_sock.h
101126+++ b/include/net/inet_connection_sock.h
101127@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
101128 int (*bind_conflict)(const struct sock *sk,
101129 const struct inet_bind_bucket *tb, bool relax);
101130 void (*mtu_reduced)(struct sock *sk);
101131-};
101132+} __do_const;
101133
101134 /** inet_connection_sock - INET connection oriented sock
101135 *
101136diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
101137index 8d17655..2f3246d 100644
101138--- a/include/net/inet_frag.h
101139+++ b/include/net/inet_frag.h
101140@@ -21,13 +21,11 @@ struct netns_frags {
101141 * @INET_FRAG_FIRST_IN: first fragment has arrived
101142 * @INET_FRAG_LAST_IN: final fragment has arrived
101143 * @INET_FRAG_COMPLETE: frag queue has been processed and is due for destruction
101144- * @INET_FRAG_EVICTED: frag queue is being evicted
101145 */
101146 enum {
101147 INET_FRAG_FIRST_IN = BIT(0),
101148 INET_FRAG_LAST_IN = BIT(1),
101149 INET_FRAG_COMPLETE = BIT(2),
101150- INET_FRAG_EVICTED = BIT(3)
101151 };
101152
101153 /**
101154@@ -45,6 +43,7 @@ enum {
101155 * @flags: fragment queue flags
101156 * @max_size: (ipv4 only) maximum received fragment size with IP_DF set
101157 * @net: namespace that this frag belongs to
101158+ * @list_evictor: list of queues to forcefully evict (e.g. due to low memory)
101159 */
101160 struct inet_frag_queue {
101161 spinlock_t lock;
101162@@ -59,6 +58,7 @@ struct inet_frag_queue {
101163 __u8 flags;
101164 u16 max_size;
101165 struct netns_frags *net;
101166+ struct hlist_node list_evictor;
101167 };
101168
101169 #define INETFRAGS_HASHSZ 1024
101170@@ -125,6 +125,11 @@ static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f
101171 inet_frag_destroy(q, f);
101172 }
101173
101174+static inline bool inet_frag_evicting(struct inet_frag_queue *q)
101175+{
101176+ return !hlist_unhashed(&q->list_evictor);
101177+}
101178+
101179 /* Memory Tracking Functions. */
101180
101181 /* The default percpu_counter batch size is not big enough to scale to
101182@@ -139,14 +144,14 @@ static inline int frag_mem_limit(struct netns_frags *nf)
101183 return percpu_counter_read(&nf->mem);
101184 }
101185
101186-static inline void sub_frag_mem_limit(struct inet_frag_queue *q, int i)
101187+static inline void sub_frag_mem_limit(struct netns_frags *nf, int i)
101188 {
101189- __percpu_counter_add(&q->net->mem, -i, frag_percpu_counter_batch);
101190+ __percpu_counter_add(&nf->mem, -i, frag_percpu_counter_batch);
101191 }
101192
101193-static inline void add_frag_mem_limit(struct inet_frag_queue *q, int i)
101194+static inline void add_frag_mem_limit(struct netns_frags *nf, int i)
101195 {
101196- __percpu_counter_add(&q->net->mem, i, frag_percpu_counter_batch);
101197+ __percpu_counter_add(&nf->mem, i, frag_percpu_counter_batch);
101198 }
101199
101200 static inline void init_frag_mem_limit(struct netns_frags *nf)
101201diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
101202index d5332dd..10a5c3c 100644
101203--- a/include/net/inetpeer.h
101204+++ b/include/net/inetpeer.h
101205@@ -48,7 +48,7 @@ struct inet_peer {
101206 */
101207 union {
101208 struct {
101209- atomic_t rid; /* Frag reception counter */
101210+ atomic_unchecked_t rid; /* Frag reception counter */
101211 };
101212 struct rcu_head rcu;
101213 struct inet_peer *gc_next;
101214diff --git a/include/net/ip.h b/include/net/ip.h
101215index d14af7e..52816c2 100644
101216--- a/include/net/ip.h
101217+++ b/include/net/ip.h
101218@@ -318,7 +318,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
101219 }
101220 }
101221
101222-u32 ip_idents_reserve(u32 hash, int segs);
101223+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
101224 void __ip_select_ident(struct net *net, struct iphdr *iph, int segs);
101225
101226 static inline void ip_select_ident_segs(struct net *net, struct sk_buff *skb,
101227diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
101228index 54271ed..eb7e0e6 100644
101229--- a/include/net/ip_fib.h
101230+++ b/include/net/ip_fib.h
101231@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
101232
101233 #define FIB_RES_SADDR(net, res) \
101234 ((FIB_RES_NH(res).nh_saddr_genid == \
101235- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
101236+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
101237 FIB_RES_NH(res).nh_saddr : \
101238 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
101239 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
101240diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
101241index 4e3731e..a242e28 100644
101242--- a/include/net/ip_vs.h
101243+++ b/include/net/ip_vs.h
101244@@ -551,7 +551,7 @@ struct ip_vs_conn {
101245 struct ip_vs_conn *control; /* Master control connection */
101246 atomic_t n_control; /* Number of controlled ones */
101247 struct ip_vs_dest *dest; /* real server */
101248- atomic_t in_pkts; /* incoming packet counter */
101249+ atomic_unchecked_t in_pkts; /* incoming packet counter */
101250
101251 /* Packet transmitter for different forwarding methods. If it
101252 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
101253@@ -699,7 +699,7 @@ struct ip_vs_dest {
101254 __be16 port; /* port number of the server */
101255 union nf_inet_addr addr; /* IP address of the server */
101256 volatile unsigned int flags; /* dest status flags */
101257- atomic_t conn_flags; /* flags to copy to conn */
101258+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
101259 atomic_t weight; /* server weight */
101260
101261 atomic_t refcnt; /* reference counter */
101262@@ -946,11 +946,11 @@ struct netns_ipvs {
101263 /* ip_vs_lblc */
101264 int sysctl_lblc_expiration;
101265 struct ctl_table_header *lblc_ctl_header;
101266- struct ctl_table *lblc_ctl_table;
101267+ ctl_table_no_const *lblc_ctl_table;
101268 /* ip_vs_lblcr */
101269 int sysctl_lblcr_expiration;
101270 struct ctl_table_header *lblcr_ctl_header;
101271- struct ctl_table *lblcr_ctl_table;
101272+ ctl_table_no_const *lblcr_ctl_table;
101273 /* ip_vs_est */
101274 struct list_head est_list; /* estimator list */
101275 spinlock_t est_lock;
101276diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
101277index 8d4f588..2e37ad2 100644
101278--- a/include/net/irda/ircomm_tty.h
101279+++ b/include/net/irda/ircomm_tty.h
101280@@ -33,6 +33,7 @@
101281 #include <linux/termios.h>
101282 #include <linux/timer.h>
101283 #include <linux/tty.h> /* struct tty_struct */
101284+#include <asm/local.h>
101285
101286 #include <net/irda/irias_object.h>
101287 #include <net/irda/ircomm_core.h>
101288diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
101289index 714cc9a..ea05f3e 100644
101290--- a/include/net/iucv/af_iucv.h
101291+++ b/include/net/iucv/af_iucv.h
101292@@ -149,7 +149,7 @@ struct iucv_skb_cb {
101293 struct iucv_sock_list {
101294 struct hlist_head head;
101295 rwlock_t lock;
101296- atomic_t autobind_name;
101297+ atomic_unchecked_t autobind_name;
101298 };
101299
101300 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
101301diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
101302index f3be818..bf46196 100644
101303--- a/include/net/llc_c_ac.h
101304+++ b/include/net/llc_c_ac.h
101305@@ -87,7 +87,7 @@
101306 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
101307 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
101308
101309-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
101310+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
101311
101312 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
101313 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
101314diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
101315index 3948cf1..83b28c4 100644
101316--- a/include/net/llc_c_ev.h
101317+++ b/include/net/llc_c_ev.h
101318@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
101319 return (struct llc_conn_state_ev *)skb->cb;
101320 }
101321
101322-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
101323-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
101324+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
101325+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
101326
101327 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
101328 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
101329diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
101330index 48f3f89..0e92c50 100644
101331--- a/include/net/llc_c_st.h
101332+++ b/include/net/llc_c_st.h
101333@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
101334 u8 next_state;
101335 const llc_conn_ev_qfyr_t *ev_qualifiers;
101336 const llc_conn_action_t *ev_actions;
101337-};
101338+} __do_const;
101339
101340 struct llc_conn_state {
101341 u8 current_state;
101342diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
101343index a61b98c..aade1eb 100644
101344--- a/include/net/llc_s_ac.h
101345+++ b/include/net/llc_s_ac.h
101346@@ -23,7 +23,7 @@
101347 #define SAP_ACT_TEST_IND 9
101348
101349 /* All action functions must look like this */
101350-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
101351+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
101352
101353 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
101354 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
101355diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
101356index c4359e2..76dbc4a 100644
101357--- a/include/net/llc_s_st.h
101358+++ b/include/net/llc_s_st.h
101359@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
101360 llc_sap_ev_t ev;
101361 u8 next_state;
101362 const llc_sap_action_t *ev_actions;
101363-};
101364+} __do_const;
101365
101366 struct llc_sap_state {
101367 u8 curr_state;
101368diff --git a/include/net/mac80211.h b/include/net/mac80211.h
101369index fc57f6b..9c1fdb2 100644
101370--- a/include/net/mac80211.h
101371+++ b/include/net/mac80211.h
101372@@ -5104,7 +5104,7 @@ struct rate_control_ops {
101373 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
101374
101375 u32 (*get_expected_throughput)(void *priv_sta);
101376-};
101377+} __do_const;
101378
101379 static inline int rate_supported(struct ieee80211_sta *sta,
101380 enum ieee80211_band band,
101381diff --git a/include/net/neighbour.h b/include/net/neighbour.h
101382index bd33e66..6508d00 100644
101383--- a/include/net/neighbour.h
101384+++ b/include/net/neighbour.h
101385@@ -162,7 +162,7 @@ struct neigh_ops {
101386 void (*error_report)(struct neighbour *, struct sk_buff *);
101387 int (*output)(struct neighbour *, struct sk_buff *);
101388 int (*connected_output)(struct neighbour *, struct sk_buff *);
101389-};
101390+} __do_const;
101391
101392 struct pneigh_entry {
101393 struct pneigh_entry *next;
101394@@ -216,7 +216,7 @@ struct neigh_table {
101395 struct neigh_statistics __percpu *stats;
101396 struct neigh_hash_table __rcu *nht;
101397 struct pneigh_entry **phash_buckets;
101398-};
101399+} __randomize_layout;
101400
101401 enum {
101402 NEIGH_ARP_TABLE = 0,
101403diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
101404index f733656..54053db 100644
101405--- a/include/net/net_namespace.h
101406+++ b/include/net/net_namespace.h
101407@@ -132,8 +132,8 @@ struct net {
101408 struct netns_mpls mpls;
101409 #endif
101410 struct sock *diag_nlsk;
101411- atomic_t fnhe_genid;
101412-};
101413+ atomic_unchecked_t fnhe_genid;
101414+} __randomize_layout;
101415
101416 #include <linux/seq_file_net.h>
101417
101418@@ -268,7 +268,11 @@ static inline struct net *read_pnet(const possible_net_t *pnet)
101419 #define __net_init __init
101420 #define __net_exit __exit_refok
101421 #define __net_initdata __initdata
101422+#ifdef CONSTIFY_PLUGIN
101423 #define __net_initconst __initconst
101424+#else
101425+#define __net_initconst __initdata
101426+#endif
101427 #endif
101428
101429 int peernet2id(struct net *net, struct net *peer);
101430@@ -281,7 +285,7 @@ struct pernet_operations {
101431 void (*exit_batch)(struct list_head *net_exit_list);
101432 int *id;
101433 size_t size;
101434-};
101435+} __do_const;
101436
101437 /*
101438 * Use these carefully. If you implement a network device and it
101439@@ -329,12 +333,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
101440
101441 static inline int rt_genid_ipv4(struct net *net)
101442 {
101443- return atomic_read(&net->ipv4.rt_genid);
101444+ return atomic_read_unchecked(&net->ipv4.rt_genid);
101445 }
101446
101447 static inline void rt_genid_bump_ipv4(struct net *net)
101448 {
101449- atomic_inc(&net->ipv4.rt_genid);
101450+ atomic_inc_unchecked(&net->ipv4.rt_genid);
101451 }
101452
101453 extern void (*__fib6_flush_trees)(struct net *net);
101454@@ -361,12 +365,12 @@ static inline void rt_genid_bump_all(struct net *net)
101455
101456 static inline int fnhe_genid(struct net *net)
101457 {
101458- return atomic_read(&net->fnhe_genid);
101459+ return atomic_read_unchecked(&net->fnhe_genid);
101460 }
101461
101462 static inline void fnhe_genid_bump(struct net *net)
101463 {
101464- atomic_inc(&net->fnhe_genid);
101465+ atomic_inc_unchecked(&net->fnhe_genid);
101466 }
101467
101468 #endif /* __NET_NET_NAMESPACE_H */
101469diff --git a/include/net/netlink.h b/include/net/netlink.h
101470index 2a5dbcc..8243656 100644
101471--- a/include/net/netlink.h
101472+++ b/include/net/netlink.h
101473@@ -521,7 +521,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
101474 {
101475 if (mark) {
101476 WARN_ON((unsigned char *) mark < skb->data);
101477- skb_trim(skb, (unsigned char *) mark - skb->data);
101478+ skb_trim(skb, (const unsigned char *) mark - skb->data);
101479 }
101480 }
101481
101482diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
101483index 29d6a94..235d3d84 100644
101484--- a/include/net/netns/conntrack.h
101485+++ b/include/net/netns/conntrack.h
101486@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
101487 struct nf_proto_net {
101488 #ifdef CONFIG_SYSCTL
101489 struct ctl_table_header *ctl_table_header;
101490- struct ctl_table *ctl_table;
101491+ ctl_table_no_const *ctl_table;
101492 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
101493 struct ctl_table_header *ctl_compat_header;
101494- struct ctl_table *ctl_compat_table;
101495+ ctl_table_no_const *ctl_compat_table;
101496 #endif
101497 #endif
101498 unsigned int users;
101499@@ -60,7 +60,7 @@ struct nf_ip_net {
101500 struct nf_icmp_net icmpv6;
101501 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
101502 struct ctl_table_header *ctl_table_header;
101503- struct ctl_table *ctl_table;
101504+ ctl_table_no_const *ctl_table;
101505 #endif
101506 };
101507
101508diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
101509index 614a49b..0b94386 100644
101510--- a/include/net/netns/ipv4.h
101511+++ b/include/net/netns/ipv4.h
101512@@ -90,7 +90,7 @@ struct netns_ipv4 {
101513
101514 struct ping_group_range ping_group_range;
101515
101516- atomic_t dev_addr_genid;
101517+ atomic_unchecked_t dev_addr_genid;
101518
101519 #ifdef CONFIG_SYSCTL
101520 unsigned long *sysctl_local_reserved_ports;
101521@@ -104,6 +104,6 @@ struct netns_ipv4 {
101522 struct fib_rules_ops *mr_rules_ops;
101523 #endif
101524 #endif
101525- atomic_t rt_genid;
101526+ atomic_unchecked_t rt_genid;
101527 };
101528 #endif
101529diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
101530index d2527bf..2c802d5 100644
101531--- a/include/net/netns/ipv6.h
101532+++ b/include/net/netns/ipv6.h
101533@@ -78,8 +78,8 @@ struct netns_ipv6 {
101534 struct fib_rules_ops *mr6_rules_ops;
101535 #endif
101536 #endif
101537- atomic_t dev_addr_genid;
101538- atomic_t fib6_sernum;
101539+ atomic_unchecked_t dev_addr_genid;
101540+ atomic_unchecked_t fib6_sernum;
101541 };
101542
101543 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
101544diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
101545index 730d82a..045f2c4 100644
101546--- a/include/net/netns/xfrm.h
101547+++ b/include/net/netns/xfrm.h
101548@@ -78,7 +78,7 @@ struct netns_xfrm {
101549
101550 /* flow cache part */
101551 struct flow_cache flow_cache_global;
101552- atomic_t flow_cache_genid;
101553+ atomic_unchecked_t flow_cache_genid;
101554 struct list_head flow_cache_gc_list;
101555 spinlock_t flow_cache_gc_lock;
101556 struct work_struct flow_cache_gc_work;
101557diff --git a/include/net/ping.h b/include/net/ping.h
101558index ac80cb4..ec1ed09 100644
101559--- a/include/net/ping.h
101560+++ b/include/net/ping.h
101561@@ -54,7 +54,7 @@ struct ping_iter_state {
101562
101563 extern struct proto ping_prot;
101564 #if IS_ENABLED(CONFIG_IPV6)
101565-extern struct pingv6_ops pingv6_ops;
101566+extern struct pingv6_ops *pingv6_ops;
101567 #endif
101568
101569 struct pingfakehdr {
101570diff --git a/include/net/protocol.h b/include/net/protocol.h
101571index d6fcc1f..ca277058 100644
101572--- a/include/net/protocol.h
101573+++ b/include/net/protocol.h
101574@@ -49,7 +49,7 @@ struct net_protocol {
101575 * socket lookup?
101576 */
101577 icmp_strict_tag_validation:1;
101578-};
101579+} __do_const;
101580
101581 #if IS_ENABLED(CONFIG_IPV6)
101582 struct inet6_protocol {
101583@@ -62,7 +62,7 @@ struct inet6_protocol {
101584 u8 type, u8 code, int offset,
101585 __be32 info);
101586 unsigned int flags; /* INET6_PROTO_xxx */
101587-};
101588+} __do_const;
101589
101590 #define INET6_PROTO_NOPOLICY 0x1
101591 #define INET6_PROTO_FINAL 0x2
101592diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
101593index 343d922..7959cde 100644
101594--- a/include/net/rtnetlink.h
101595+++ b/include/net/rtnetlink.h
101596@@ -95,7 +95,7 @@ struct rtnl_link_ops {
101597 const struct net_device *dev,
101598 const struct net_device *slave_dev);
101599 struct net *(*get_link_net)(const struct net_device *dev);
101600-};
101601+} __do_const;
101602
101603 int __rtnl_link_register(struct rtnl_link_ops *ops);
101604 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
101605diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
101606index 4a5b9a3..ca27d73 100644
101607--- a/include/net/sctp/checksum.h
101608+++ b/include/net/sctp/checksum.h
101609@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
101610 unsigned int offset)
101611 {
101612 struct sctphdr *sh = sctp_hdr(skb);
101613- __le32 ret, old = sh->checksum;
101614- const struct skb_checksum_ops ops = {
101615+ __le32 ret, old = sh->checksum;
101616+ static const struct skb_checksum_ops ops = {
101617 .update = sctp_csum_update,
101618 .combine = sctp_csum_combine,
101619 };
101620diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
101621index 487ef34..d457f98 100644
101622--- a/include/net/sctp/sm.h
101623+++ b/include/net/sctp/sm.h
101624@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
101625 typedef struct {
101626 sctp_state_fn_t *fn;
101627 const char *name;
101628-} sctp_sm_table_entry_t;
101629+} __do_const sctp_sm_table_entry_t;
101630
101631 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
101632 * currently in use.
101633@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
101634 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
101635
101636 /* Extern declarations for major data structures. */
101637-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
101638+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
101639
101640
101641 /* Get the size of a DATA chunk payload. */
101642diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
101643index 495c87e..5b327ff 100644
101644--- a/include/net/sctp/structs.h
101645+++ b/include/net/sctp/structs.h
101646@@ -513,7 +513,7 @@ struct sctp_pf {
101647 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
101648 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
101649 struct sctp_af *af;
101650-};
101651+} __do_const;
101652
101653
101654 /* Structure to track chunk fragments that have been acked, but peer
101655diff --git a/include/net/sock.h b/include/net/sock.h
101656index 3a4898e..67456ac 100644
101657--- a/include/net/sock.h
101658+++ b/include/net/sock.h
101659@@ -363,7 +363,7 @@ struct sock {
101660 unsigned int sk_napi_id;
101661 unsigned int sk_ll_usec;
101662 #endif
101663- atomic_t sk_drops;
101664+ atomic_unchecked_t sk_drops;
101665 int sk_rcvbuf;
101666
101667 struct sk_filter __rcu *sk_filter;
101668@@ -1039,7 +1039,7 @@ struct proto {
101669 void (*destroy_cgroup)(struct mem_cgroup *memcg);
101670 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
101671 #endif
101672-};
101673+} __randomize_layout;
101674
101675 /*
101676 * Bits in struct cg_proto.flags
101677@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
101678 page_counter_uncharge(&prot->memory_allocated, amt);
101679 }
101680
101681-static inline long
101682+static inline long __intentional_overflow(-1)
101683 sk_memory_allocated(const struct sock *sk)
101684 {
101685 struct proto *prot = sk->sk_prot;
101686@@ -1777,7 +1777,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
101687 }
101688
101689 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
101690- struct iov_iter *from, char *to,
101691+ struct iov_iter *from, unsigned char *to,
101692 int copy, int offset)
101693 {
101694 if (skb->ip_summed == CHECKSUM_NONE) {
101695@@ -2024,7 +2024,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
101696 }
101697 }
101698
101699-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
101700+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
101701
101702 /**
101703 * sk_page_frag - return an appropriate page_frag
101704@@ -2099,7 +2099,7 @@ struct sock_skb_cb {
101705 static inline void
101706 sock_skb_set_dropcount(const struct sock *sk, struct sk_buff *skb)
101707 {
101708- SOCK_SKB_CB(skb)->dropcount = atomic_read(&sk->sk_drops);
101709+ SOCK_SKB_CB(skb)->dropcount = atomic_read_unchecked(&sk->sk_drops);
101710 }
101711
101712 void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
101713diff --git a/include/net/tcp.h b/include/net/tcp.h
101714index 6d204f3..d5a8ff0 100644
101715--- a/include/net/tcp.h
101716+++ b/include/net/tcp.h
101717@@ -523,7 +523,7 @@ void tcp_retransmit_timer(struct sock *sk);
101718 void tcp_xmit_retransmit_queue(struct sock *);
101719 void tcp_simple_retransmit(struct sock *);
101720 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
101721-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
101722+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
101723
101724 void tcp_send_probe0(struct sock *);
101725 void tcp_send_partial(struct sock *);
101726@@ -699,8 +699,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
101727 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
101728 */
101729 struct tcp_skb_cb {
101730- __u32 seq; /* Starting sequence number */
101731- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
101732+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
101733+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
101734 union {
101735 /* Note : tcp_tw_isn is used in input path only
101736 * (isn chosen by tcp_timewait_state_process())
101737@@ -725,7 +725,7 @@ struct tcp_skb_cb {
101738
101739 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
101740 /* 1 byte hole */
101741- __u32 ack_seq; /* Sequence number ACK'd */
101742+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
101743 union {
101744 struct inet_skb_parm h4;
101745 #if IS_ENABLED(CONFIG_IPV6)
101746diff --git a/include/net/xfrm.h b/include/net/xfrm.h
101747index 36ac102..6e8b34b 100644
101748--- a/include/net/xfrm.h
101749+++ b/include/net/xfrm.h
101750@@ -283,7 +283,6 @@ struct xfrm_dst;
101751 struct xfrm_policy_afinfo {
101752 unsigned short family;
101753 struct dst_ops *dst_ops;
101754- void (*garbage_collect)(struct net *net);
101755 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
101756 const xfrm_address_t *saddr,
101757 const xfrm_address_t *daddr);
101758@@ -301,7 +300,7 @@ struct xfrm_policy_afinfo {
101759 struct net_device *dev,
101760 const struct flowi *fl);
101761 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
101762-};
101763+} __do_const;
101764
101765 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
101766 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
101767@@ -340,7 +339,7 @@ struct xfrm_state_afinfo {
101768 int (*transport_finish)(struct sk_buff *skb,
101769 int async);
101770 void (*local_error)(struct sk_buff *skb, u32 mtu);
101771-};
101772+} __do_const;
101773
101774 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
101775 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
101776@@ -435,7 +434,7 @@ struct xfrm_mode {
101777 struct module *owner;
101778 unsigned int encap;
101779 int flags;
101780-};
101781+} __do_const;
101782
101783 /* Flags for xfrm_mode. */
101784 enum {
101785@@ -530,7 +529,7 @@ struct xfrm_policy {
101786 struct timer_list timer;
101787
101788 struct flow_cache_object flo;
101789- atomic_t genid;
101790+ atomic_unchecked_t genid;
101791 u32 priority;
101792 u32 index;
101793 struct xfrm_mark mark;
101794@@ -1163,6 +1162,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
101795 }
101796
101797 void xfrm_garbage_collect(struct net *net);
101798+void xfrm_garbage_collect_deferred(struct net *net);
101799
101800 #else
101801
101802@@ -1201,6 +1201,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
101803 static inline void xfrm_garbage_collect(struct net *net)
101804 {
101805 }
101806+static inline void xfrm_garbage_collect_deferred(struct net *net)
101807+{
101808+}
101809 #endif
101810
101811 static __inline__
101812diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
101813index 1017e0b..227aa4d 100644
101814--- a/include/rdma/iw_cm.h
101815+++ b/include/rdma/iw_cm.h
101816@@ -122,7 +122,7 @@ struct iw_cm_verbs {
101817 int backlog);
101818
101819 int (*destroy_listen)(struct iw_cm_id *cm_id);
101820-};
101821+} __no_const;
101822
101823 /**
101824 * iw_create_cm_id - Create an IW CM identifier.
101825diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
101826index 93d14da..734b3d8 100644
101827--- a/include/scsi/libfc.h
101828+++ b/include/scsi/libfc.h
101829@@ -771,6 +771,7 @@ struct libfc_function_template {
101830 */
101831 void (*disc_stop_final) (struct fc_lport *);
101832 };
101833+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
101834
101835 /**
101836 * struct fc_disc - Discovery context
101837@@ -875,7 +876,7 @@ struct fc_lport {
101838 struct fc_vport *vport;
101839
101840 /* Operational Information */
101841- struct libfc_function_template tt;
101842+ libfc_function_template_no_const tt;
101843 u8 link_up;
101844 u8 qfull;
101845 enum fc_lport_state state;
101846diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
101847index a4c9336..d6f8f34 100644
101848--- a/include/scsi/scsi_device.h
101849+++ b/include/scsi/scsi_device.h
101850@@ -185,9 +185,9 @@ struct scsi_device {
101851 unsigned int max_device_blocked; /* what device_blocked counts down from */
101852 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
101853
101854- atomic_t iorequest_cnt;
101855- atomic_t iodone_cnt;
101856- atomic_t ioerr_cnt;
101857+ atomic_unchecked_t iorequest_cnt;
101858+ atomic_unchecked_t iodone_cnt;
101859+ atomic_unchecked_t ioerr_cnt;
101860
101861 struct device sdev_gendev,
101862 sdev_dev;
101863diff --git a/include/scsi/scsi_driver.h b/include/scsi/scsi_driver.h
101864index 891a658..fcd68df 100644
101865--- a/include/scsi/scsi_driver.h
101866+++ b/include/scsi/scsi_driver.h
101867@@ -14,7 +14,7 @@ struct scsi_driver {
101868 void (*rescan)(struct device *);
101869 int (*init_command)(struct scsi_cmnd *);
101870 void (*uninit_command)(struct scsi_cmnd *);
101871- int (*done)(struct scsi_cmnd *);
101872+ unsigned int (*done)(struct scsi_cmnd *);
101873 int (*eh_action)(struct scsi_cmnd *, int);
101874 };
101875 #define to_scsi_driver(drv) \
101876diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
101877index 784bc2c..855a04c 100644
101878--- a/include/scsi/scsi_transport_fc.h
101879+++ b/include/scsi/scsi_transport_fc.h
101880@@ -757,7 +757,8 @@ struct fc_function_template {
101881 unsigned long show_host_system_hostname:1;
101882
101883 unsigned long disable_target_scan:1;
101884-};
101885+} __do_const;
101886+typedef struct fc_function_template __no_const fc_function_template_no_const;
101887
101888
101889 /**
101890diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
101891index fa1d055..3647940 100644
101892--- a/include/sound/compress_driver.h
101893+++ b/include/sound/compress_driver.h
101894@@ -130,7 +130,7 @@ struct snd_compr_ops {
101895 struct snd_compr_caps *caps);
101896 int (*get_codec_caps) (struct snd_compr_stream *stream,
101897 struct snd_compr_codec_caps *codec);
101898-};
101899+} __no_const;
101900
101901 /**
101902 * struct snd_compr: Compressed device
101903diff --git a/include/sound/soc.h b/include/sound/soc.h
101904index f6226914..e919a2e 100644
101905--- a/include/sound/soc.h
101906+++ b/include/sound/soc.h
101907@@ -870,7 +870,7 @@ struct snd_soc_codec_driver {
101908 enum snd_soc_dapm_type, int);
101909
101910 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
101911-};
101912+} __do_const;
101913
101914 /* SoC platform interface */
101915 struct snd_soc_platform_driver {
101916@@ -897,7 +897,7 @@ struct snd_soc_platform_driver {
101917 const struct snd_compr_ops *compr_ops;
101918
101919 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
101920-};
101921+} __do_const;
101922
101923 struct snd_soc_dai_link_component {
101924 const char *name;
101925diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
101926index 480e9f8..2d59c93 100644
101927--- a/include/target/target_core_base.h
101928+++ b/include/target/target_core_base.h
101929@@ -767,7 +767,7 @@ struct se_device {
101930 atomic_long_t write_bytes;
101931 /* Active commands on this virtual SE device */
101932 atomic_t simple_cmds;
101933- atomic_t dev_ordered_id;
101934+ atomic_unchecked_t dev_ordered_id;
101935 atomic_t dev_ordered_sync;
101936 atomic_t dev_qf_count;
101937 int export_count;
101938diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
101939new file mode 100644
101940index 0000000..fb634b7
101941--- /dev/null
101942+++ b/include/trace/events/fs.h
101943@@ -0,0 +1,53 @@
101944+#undef TRACE_SYSTEM
101945+#define TRACE_SYSTEM fs
101946+
101947+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
101948+#define _TRACE_FS_H
101949+
101950+#include <linux/fs.h>
101951+#include <linux/tracepoint.h>
101952+
101953+TRACE_EVENT(do_sys_open,
101954+
101955+ TP_PROTO(const char *filename, int flags, int mode),
101956+
101957+ TP_ARGS(filename, flags, mode),
101958+
101959+ TP_STRUCT__entry(
101960+ __string( filename, filename )
101961+ __field( int, flags )
101962+ __field( int, mode )
101963+ ),
101964+
101965+ TP_fast_assign(
101966+ __assign_str(filename, filename);
101967+ __entry->flags = flags;
101968+ __entry->mode = mode;
101969+ ),
101970+
101971+ TP_printk("\"%s\" %x %o",
101972+ __get_str(filename), __entry->flags, __entry->mode)
101973+);
101974+
101975+TRACE_EVENT(open_exec,
101976+
101977+ TP_PROTO(const char *filename),
101978+
101979+ TP_ARGS(filename),
101980+
101981+ TP_STRUCT__entry(
101982+ __string( filename, filename )
101983+ ),
101984+
101985+ TP_fast_assign(
101986+ __assign_str(filename, filename);
101987+ ),
101988+
101989+ TP_printk("\"%s\"",
101990+ __get_str(filename))
101991+);
101992+
101993+#endif /* _TRACE_FS_H */
101994+
101995+/* This part must be outside protection */
101996+#include <trace/define_trace.h>
101997diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
101998index ff8f6c0..6b6bae3 100644
101999--- a/include/trace/events/irq.h
102000+++ b/include/trace/events/irq.h
102001@@ -51,7 +51,7 @@ SOFTIRQ_NAME_LIST
102002 */
102003 TRACE_EVENT(irq_handler_entry,
102004
102005- TP_PROTO(int irq, struct irqaction *action),
102006+ TP_PROTO(int irq, const struct irqaction *action),
102007
102008 TP_ARGS(irq, action),
102009
102010@@ -81,7 +81,7 @@ TRACE_EVENT(irq_handler_entry,
102011 */
102012 TRACE_EVENT(irq_handler_exit,
102013
102014- TP_PROTO(int irq, struct irqaction *action, int ret),
102015+ TP_PROTO(int irq, const struct irqaction *action, int ret),
102016
102017 TP_ARGS(irq, action, ret),
102018
102019diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h
102020index a7e41fb..c115957 100644
102021--- a/include/uapi/drm/i915_drm.h
102022+++ b/include/uapi/drm/i915_drm.h
102023@@ -350,6 +350,7 @@ typedef struct drm_i915_irq_wait {
102024 #define I915_PARAM_REVISION 32
102025 #define I915_PARAM_SUBSLICE_TOTAL 33
102026 #define I915_PARAM_EU_TOTAL 34
102027+#define I915_PARAM_HAS_LEGACY_CONTEXT 35
102028
102029 typedef struct drm_i915_getparam {
102030 int param;
102031diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
102032index 7caf44c..23c6f27 100644
102033--- a/include/uapi/linux/a.out.h
102034+++ b/include/uapi/linux/a.out.h
102035@@ -39,6 +39,14 @@ enum machine_type {
102036 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
102037 };
102038
102039+/* Constants for the N_FLAGS field */
102040+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
102041+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
102042+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
102043+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
102044+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
102045+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
102046+
102047 #if !defined (N_MAGIC)
102048 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
102049 #endif
102050diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
102051index 22b6ad3..aeba37e 100644
102052--- a/include/uapi/linux/bcache.h
102053+++ b/include/uapi/linux/bcache.h
102054@@ -5,6 +5,7 @@
102055 * Bcache on disk data structures
102056 */
102057
102058+#include <linux/compiler.h>
102059 #include <asm/types.h>
102060
102061 #define BITMASK(name, type, field, offset, size) \
102062@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
102063 /* Btree keys - all units are in sectors */
102064
102065 struct bkey {
102066- __u64 high;
102067- __u64 low;
102068+ __u64 high __intentional_overflow(-1);
102069+ __u64 low __intentional_overflow(-1);
102070 __u64 ptr[];
102071 };
102072
102073diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
102074index d876736..ccce5c0 100644
102075--- a/include/uapi/linux/byteorder/little_endian.h
102076+++ b/include/uapi/linux/byteorder/little_endian.h
102077@@ -42,51 +42,51 @@
102078
102079 static inline __le64 __cpu_to_le64p(const __u64 *p)
102080 {
102081- return (__force __le64)*p;
102082+ return (__force const __le64)*p;
102083 }
102084-static inline __u64 __le64_to_cpup(const __le64 *p)
102085+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
102086 {
102087- return (__force __u64)*p;
102088+ return (__force const __u64)*p;
102089 }
102090 static inline __le32 __cpu_to_le32p(const __u32 *p)
102091 {
102092- return (__force __le32)*p;
102093+ return (__force const __le32)*p;
102094 }
102095 static inline __u32 __le32_to_cpup(const __le32 *p)
102096 {
102097- return (__force __u32)*p;
102098+ return (__force const __u32)*p;
102099 }
102100 static inline __le16 __cpu_to_le16p(const __u16 *p)
102101 {
102102- return (__force __le16)*p;
102103+ return (__force const __le16)*p;
102104 }
102105 static inline __u16 __le16_to_cpup(const __le16 *p)
102106 {
102107- return (__force __u16)*p;
102108+ return (__force const __u16)*p;
102109 }
102110 static inline __be64 __cpu_to_be64p(const __u64 *p)
102111 {
102112- return (__force __be64)__swab64p(p);
102113+ return (__force const __be64)__swab64p(p);
102114 }
102115 static inline __u64 __be64_to_cpup(const __be64 *p)
102116 {
102117- return __swab64p((__u64 *)p);
102118+ return __swab64p((const __u64 *)p);
102119 }
102120 static inline __be32 __cpu_to_be32p(const __u32 *p)
102121 {
102122- return (__force __be32)__swab32p(p);
102123+ return (__force const __be32)__swab32p(p);
102124 }
102125-static inline __u32 __be32_to_cpup(const __be32 *p)
102126+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
102127 {
102128- return __swab32p((__u32 *)p);
102129+ return __swab32p((const __u32 *)p);
102130 }
102131 static inline __be16 __cpu_to_be16p(const __u16 *p)
102132 {
102133- return (__force __be16)__swab16p(p);
102134+ return (__force const __be16)__swab16p(p);
102135 }
102136 static inline __u16 __be16_to_cpup(const __be16 *p)
102137 {
102138- return __swab16p((__u16 *)p);
102139+ return __swab16p((const __u16 *)p);
102140 }
102141 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
102142 #define __le64_to_cpus(x) do { (void)(x); } while (0)
102143diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
102144index 71e1d0e..6cc9caf 100644
102145--- a/include/uapi/linux/elf.h
102146+++ b/include/uapi/linux/elf.h
102147@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
102148 #define PT_GNU_EH_FRAME 0x6474e550
102149
102150 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
102151+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
102152+
102153+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
102154+
102155+/* Constants for the e_flags field */
102156+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
102157+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
102158+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
102159+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
102160+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
102161+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
102162
102163 /*
102164 * Extended Numbering
102165@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
102166 #define DT_DEBUG 21
102167 #define DT_TEXTREL 22
102168 #define DT_JMPREL 23
102169+#define DT_FLAGS 30
102170+ #define DF_TEXTREL 0x00000004
102171 #define DT_ENCODING 32
102172 #define OLD_DT_LOOS 0x60000000
102173 #define DT_LOOS 0x6000000d
102174@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
102175 #define PF_W 0x2
102176 #define PF_X 0x1
102177
102178+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
102179+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
102180+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
102181+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
102182+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
102183+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
102184+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
102185+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
102186+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
102187+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
102188+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
102189+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
102190+
102191 typedef struct elf32_phdr{
102192 Elf32_Word p_type;
102193 Elf32_Off p_offset;
102194@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
102195 #define EI_OSABI 7
102196 #define EI_PAD 8
102197
102198+#define EI_PAX 14
102199+
102200 #define ELFMAG0 0x7f /* EI_MAG */
102201 #define ELFMAG1 'E'
102202 #define ELFMAG2 'L'
102203diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
102204index aa169c4..6a2771d 100644
102205--- a/include/uapi/linux/personality.h
102206+++ b/include/uapi/linux/personality.h
102207@@ -30,6 +30,7 @@ enum {
102208 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
102209 ADDR_NO_RANDOMIZE | \
102210 ADDR_COMPAT_LAYOUT | \
102211+ ADDR_LIMIT_3GB | \
102212 MMAP_PAGE_ZERO)
102213
102214 /*
102215diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
102216index 7530e74..e714828 100644
102217--- a/include/uapi/linux/screen_info.h
102218+++ b/include/uapi/linux/screen_info.h
102219@@ -43,7 +43,8 @@ struct screen_info {
102220 __u16 pages; /* 0x32 */
102221 __u16 vesa_attributes; /* 0x34 */
102222 __u32 capabilities; /* 0x36 */
102223- __u8 _reserved[6]; /* 0x3a */
102224+ __u16 vesapm_size; /* 0x3a */
102225+ __u8 _reserved[4]; /* 0x3c */
102226 } __attribute__((packed));
102227
102228 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
102229diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
102230index 0e011eb..82681b1 100644
102231--- a/include/uapi/linux/swab.h
102232+++ b/include/uapi/linux/swab.h
102233@@ -43,7 +43,7 @@
102234 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
102235 */
102236
102237-static inline __attribute_const__ __u16 __fswab16(__u16 val)
102238+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
102239 {
102240 #ifdef __HAVE_BUILTIN_BSWAP16__
102241 return __builtin_bswap16(val);
102242@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
102243 #endif
102244 }
102245
102246-static inline __attribute_const__ __u32 __fswab32(__u32 val)
102247+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
102248 {
102249 #ifdef __HAVE_BUILTIN_BSWAP32__
102250 return __builtin_bswap32(val);
102251@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
102252 #endif
102253 }
102254
102255-static inline __attribute_const__ __u64 __fswab64(__u64 val)
102256+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
102257 {
102258 #ifdef __HAVE_BUILTIN_BSWAP64__
102259 return __builtin_bswap64(val);
102260diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
102261index 1590c49..5eab462 100644
102262--- a/include/uapi/linux/xattr.h
102263+++ b/include/uapi/linux/xattr.h
102264@@ -73,5 +73,9 @@
102265 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
102266 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
102267
102268+/* User namespace */
102269+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
102270+#define XATTR_PAX_FLAGS_SUFFIX "flags"
102271+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
102272
102273 #endif /* _UAPI_LINUX_XATTR_H */
102274diff --git a/include/video/udlfb.h b/include/video/udlfb.h
102275index f9466fa..f4e2b81 100644
102276--- a/include/video/udlfb.h
102277+++ b/include/video/udlfb.h
102278@@ -53,10 +53,10 @@ struct dlfb_data {
102279 u32 pseudo_palette[256];
102280 int blank_mode; /*one of FB_BLANK_ */
102281 /* blit-only rendering path metrics, exposed through sysfs */
102282- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
102283- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
102284- atomic_t bytes_sent; /* to usb, after compression including overhead */
102285- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
102286+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
102287+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
102288+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
102289+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
102290 };
102291
102292 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
102293diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
102294index 30f5362..8ed8ac9 100644
102295--- a/include/video/uvesafb.h
102296+++ b/include/video/uvesafb.h
102297@@ -122,6 +122,7 @@ struct uvesafb_par {
102298 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
102299 u8 pmi_setpal; /* PMI for palette changes */
102300 u16 *pmi_base; /* protected mode interface location */
102301+ u8 *pmi_code; /* protected mode code location */
102302 void *pmi_start;
102303 void *pmi_pal;
102304 u8 *vbe_state_orig; /*
102305diff --git a/init/Kconfig b/init/Kconfig
102306index dc24dec..b77638f 100644
102307--- a/init/Kconfig
102308+++ b/init/Kconfig
102309@@ -1145,6 +1145,7 @@ endif # CGROUPS
102310
102311 config CHECKPOINT_RESTORE
102312 bool "Checkpoint/restore support" if EXPERT
102313+ depends on !GRKERNSEC
102314 default n
102315 help
102316 Enables additional kernel features in a sake of checkpoint/restore.
102317@@ -1670,7 +1671,7 @@ config SLUB_DEBUG
102318
102319 config COMPAT_BRK
102320 bool "Disable heap randomization"
102321- default y
102322+ default n
102323 help
102324 Randomizing heap placement makes heap exploits harder, but it
102325 also breaks ancient binaries (including anything libc5 based).
102326@@ -2001,7 +2002,7 @@ config INIT_ALL_POSSIBLE
102327 config STOP_MACHINE
102328 bool
102329 default y
102330- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
102331+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
102332 help
102333 Need stop_machine() primitive.
102334
102335diff --git a/init/Makefile b/init/Makefile
102336index 7bc47ee..6da2dc7 100644
102337--- a/init/Makefile
102338+++ b/init/Makefile
102339@@ -2,6 +2,9 @@
102340 # Makefile for the linux kernel.
102341 #
102342
102343+ccflags-y := $(GCC_PLUGINS_CFLAGS)
102344+asflags-y := $(GCC_PLUGINS_AFLAGS)
102345+
102346 obj-y := main.o version.o mounts.o
102347 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
102348 obj-y += noinitramfs.o
102349diff --git a/init/do_mounts.c b/init/do_mounts.c
102350index a95bbdb..82c48fd 100644
102351--- a/init/do_mounts.c
102352+++ b/init/do_mounts.c
102353@@ -363,11 +363,11 @@ static void __init get_fs_names(char *page)
102354 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
102355 {
102356 struct super_block *s;
102357- int err = sys_mount(name, "/root", fs, flags, data);
102358+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
102359 if (err)
102360 return err;
102361
102362- sys_chdir("/root");
102363+ sys_chdir((const char __force_user *)"/root");
102364 s = current->fs->pwd.dentry->d_sb;
102365 ROOT_DEV = s->s_dev;
102366 printk(KERN_INFO
102367@@ -490,18 +490,18 @@ void __init change_floppy(char *fmt, ...)
102368 va_start(args, fmt);
102369 vsprintf(buf, fmt, args);
102370 va_end(args);
102371- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
102372+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
102373 if (fd >= 0) {
102374 sys_ioctl(fd, FDEJECT, 0);
102375 sys_close(fd);
102376 }
102377 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
102378- fd = sys_open("/dev/console", O_RDWR, 0);
102379+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
102380 if (fd >= 0) {
102381 sys_ioctl(fd, TCGETS, (long)&termios);
102382 termios.c_lflag &= ~ICANON;
102383 sys_ioctl(fd, TCSETSF, (long)&termios);
102384- sys_read(fd, &c, 1);
102385+ sys_read(fd, (char __user *)&c, 1);
102386 termios.c_lflag |= ICANON;
102387 sys_ioctl(fd, TCSETSF, (long)&termios);
102388 sys_close(fd);
102389@@ -595,8 +595,8 @@ void __init prepare_namespace(void)
102390 mount_root();
102391 out:
102392 devtmpfs_mount("dev");
102393- sys_mount(".", "/", NULL, MS_MOVE, NULL);
102394- sys_chroot(".");
102395+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
102396+ sys_chroot((const char __force_user *)".");
102397 }
102398
102399 static bool is_tmpfs;
102400diff --git a/init/do_mounts.h b/init/do_mounts.h
102401index f5b978a..69dbfe8 100644
102402--- a/init/do_mounts.h
102403+++ b/init/do_mounts.h
102404@@ -15,15 +15,15 @@ extern int root_mountflags;
102405
102406 static inline int create_dev(char *name, dev_t dev)
102407 {
102408- sys_unlink(name);
102409- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
102410+ sys_unlink((char __force_user *)name);
102411+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
102412 }
102413
102414 #if BITS_PER_LONG == 32
102415 static inline u32 bstat(char *name)
102416 {
102417 struct stat64 stat;
102418- if (sys_stat64(name, &stat) != 0)
102419+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
102420 return 0;
102421 if (!S_ISBLK(stat.st_mode))
102422 return 0;
102423@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
102424 static inline u32 bstat(char *name)
102425 {
102426 struct stat stat;
102427- if (sys_newstat(name, &stat) != 0)
102428+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
102429 return 0;
102430 if (!S_ISBLK(stat.st_mode))
102431 return 0;
102432diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
102433index 3e0878e..8a9d7a0 100644
102434--- a/init/do_mounts_initrd.c
102435+++ b/init/do_mounts_initrd.c
102436@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
102437 {
102438 sys_unshare(CLONE_FS | CLONE_FILES);
102439 /* stdin/stdout/stderr for /linuxrc */
102440- sys_open("/dev/console", O_RDWR, 0);
102441+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
102442 sys_dup(0);
102443 sys_dup(0);
102444 /* move initrd over / and chdir/chroot in initrd root */
102445- sys_chdir("/root");
102446- sys_mount(".", "/", NULL, MS_MOVE, NULL);
102447- sys_chroot(".");
102448+ sys_chdir((const char __force_user *)"/root");
102449+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
102450+ sys_chroot((const char __force_user *)".");
102451 sys_setsid();
102452 return 0;
102453 }
102454@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
102455 create_dev("/dev/root.old", Root_RAM0);
102456 /* mount initrd on rootfs' /root */
102457 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
102458- sys_mkdir("/old", 0700);
102459- sys_chdir("/old");
102460+ sys_mkdir((const char __force_user *)"/old", 0700);
102461+ sys_chdir((const char __force_user *)"/old");
102462
102463 /* try loading default modules from initrd */
102464 load_default_modules();
102465@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
102466 current->flags &= ~PF_FREEZER_SKIP;
102467
102468 /* move initrd to rootfs' /old */
102469- sys_mount("..", ".", NULL, MS_MOVE, NULL);
102470+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
102471 /* switch root and cwd back to / of rootfs */
102472- sys_chroot("..");
102473+ sys_chroot((const char __force_user *)"..");
102474
102475 if (new_decode_dev(real_root_dev) == Root_RAM0) {
102476- sys_chdir("/old");
102477+ sys_chdir((const char __force_user *)"/old");
102478 return;
102479 }
102480
102481- sys_chdir("/");
102482+ sys_chdir((const char __force_user *)"/");
102483 ROOT_DEV = new_decode_dev(real_root_dev);
102484 mount_root();
102485
102486 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
102487- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
102488+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
102489 if (!error)
102490 printk("okay\n");
102491 else {
102492- int fd = sys_open("/dev/root.old", O_RDWR, 0);
102493+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
102494 if (error == -ENOENT)
102495 printk("/initrd does not exist. Ignored.\n");
102496 else
102497 printk("failed\n");
102498 printk(KERN_NOTICE "Unmounting old root\n");
102499- sys_umount("/old", MNT_DETACH);
102500+ sys_umount((char __force_user *)"/old", MNT_DETACH);
102501 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
102502 if (fd < 0) {
102503 error = fd;
102504@@ -127,11 +127,11 @@ int __init initrd_load(void)
102505 * mounted in the normal path.
102506 */
102507 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
102508- sys_unlink("/initrd.image");
102509+ sys_unlink((const char __force_user *)"/initrd.image");
102510 handle_initrd();
102511 return 1;
102512 }
102513 }
102514- sys_unlink("/initrd.image");
102515+ sys_unlink((const char __force_user *)"/initrd.image");
102516 return 0;
102517 }
102518diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
102519index 8cb6db5..d729f50 100644
102520--- a/init/do_mounts_md.c
102521+++ b/init/do_mounts_md.c
102522@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
102523 partitioned ? "_d" : "", minor,
102524 md_setup_args[ent].device_names);
102525
102526- fd = sys_open(name, 0, 0);
102527+ fd = sys_open((char __force_user *)name, 0, 0);
102528 if (fd < 0) {
102529 printk(KERN_ERR "md: open failed - cannot start "
102530 "array %s\n", name);
102531@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
102532 * array without it
102533 */
102534 sys_close(fd);
102535- fd = sys_open(name, 0, 0);
102536+ fd = sys_open((char __force_user *)name, 0, 0);
102537 sys_ioctl(fd, BLKRRPART, 0);
102538 }
102539 sys_close(fd);
102540@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
102541
102542 wait_for_device_probe();
102543
102544- fd = sys_open("/dev/md0", 0, 0);
102545+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
102546 if (fd >= 0) {
102547 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
102548 sys_close(fd);
102549diff --git a/init/init_task.c b/init/init_task.c
102550index ba0a7f36..2bcf1d5 100644
102551--- a/init/init_task.c
102552+++ b/init/init_task.c
102553@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
102554 * Initial thread structure. Alignment of this is handled by a special
102555 * linker map entry.
102556 */
102557+#ifdef CONFIG_X86
102558+union thread_union init_thread_union __init_task_data;
102559+#else
102560 union thread_union init_thread_union __init_task_data =
102561 { INIT_THREAD_INFO(init_task) };
102562+#endif
102563diff --git a/init/initramfs.c b/init/initramfs.c
102564index ad1bd77..dca2c1b 100644
102565--- a/init/initramfs.c
102566+++ b/init/initramfs.c
102567@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
102568
102569 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
102570 while (count) {
102571- ssize_t rv = sys_write(fd, p, count);
102572+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
102573
102574 if (rv < 0) {
102575 if (rv == -EINTR || rv == -EAGAIN)
102576@@ -107,7 +107,7 @@ static void __init free_hash(void)
102577 }
102578 }
102579
102580-static long __init do_utime(char *filename, time_t mtime)
102581+static long __init do_utime(char __force_user *filename, time_t mtime)
102582 {
102583 struct timespec t[2];
102584
102585@@ -142,7 +142,7 @@ static void __init dir_utime(void)
102586 struct dir_entry *de, *tmp;
102587 list_for_each_entry_safe(de, tmp, &dir_list, list) {
102588 list_del(&de->list);
102589- do_utime(de->name, de->mtime);
102590+ do_utime((char __force_user *)de->name, de->mtime);
102591 kfree(de->name);
102592 kfree(de);
102593 }
102594@@ -304,7 +304,7 @@ static int __init maybe_link(void)
102595 if (nlink >= 2) {
102596 char *old = find_link(major, minor, ino, mode, collected);
102597 if (old)
102598- return (sys_link(old, collected) < 0) ? -1 : 1;
102599+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
102600 }
102601 return 0;
102602 }
102603@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
102604 {
102605 struct stat st;
102606
102607- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
102608+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
102609 if (S_ISDIR(st.st_mode))
102610- sys_rmdir(path);
102611+ sys_rmdir((char __force_user *)path);
102612 else
102613- sys_unlink(path);
102614+ sys_unlink((char __force_user *)path);
102615 }
102616 }
102617
102618@@ -338,7 +338,7 @@ static int __init do_name(void)
102619 int openflags = O_WRONLY|O_CREAT;
102620 if (ml != 1)
102621 openflags |= O_TRUNC;
102622- wfd = sys_open(collected, openflags, mode);
102623+ wfd = sys_open((char __force_user *)collected, openflags, mode);
102624
102625 if (wfd >= 0) {
102626 sys_fchown(wfd, uid, gid);
102627@@ -350,17 +350,17 @@ static int __init do_name(void)
102628 }
102629 }
102630 } else if (S_ISDIR(mode)) {
102631- sys_mkdir(collected, mode);
102632- sys_chown(collected, uid, gid);
102633- sys_chmod(collected, mode);
102634+ sys_mkdir((char __force_user *)collected, mode);
102635+ sys_chown((char __force_user *)collected, uid, gid);
102636+ sys_chmod((char __force_user *)collected, mode);
102637 dir_add(collected, mtime);
102638 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
102639 S_ISFIFO(mode) || S_ISSOCK(mode)) {
102640 if (maybe_link() == 0) {
102641- sys_mknod(collected, mode, rdev);
102642- sys_chown(collected, uid, gid);
102643- sys_chmod(collected, mode);
102644- do_utime(collected, mtime);
102645+ sys_mknod((char __force_user *)collected, mode, rdev);
102646+ sys_chown((char __force_user *)collected, uid, gid);
102647+ sys_chmod((char __force_user *)collected, mode);
102648+ do_utime((char __force_user *)collected, mtime);
102649 }
102650 }
102651 return 0;
102652@@ -372,7 +372,7 @@ static int __init do_copy(void)
102653 if (xwrite(wfd, victim, body_len) != body_len)
102654 error("write error");
102655 sys_close(wfd);
102656- do_utime(vcollected, mtime);
102657+ do_utime((char __force_user *)vcollected, mtime);
102658 kfree(vcollected);
102659 eat(body_len);
102660 state = SkipIt;
102661@@ -390,9 +390,9 @@ static int __init do_symlink(void)
102662 {
102663 collected[N_ALIGN(name_len) + body_len] = '\0';
102664 clean_path(collected, 0);
102665- sys_symlink(collected + N_ALIGN(name_len), collected);
102666- sys_lchown(collected, uid, gid);
102667- do_utime(collected, mtime);
102668+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
102669+ sys_lchown((char __force_user *)collected, uid, gid);
102670+ do_utime((char __force_user *)collected, mtime);
102671 state = SkipIt;
102672 next_state = Reset;
102673 return 0;
102674diff --git a/init/main.c b/init/main.c
102675index 2a89545..58711ee 100644
102676--- a/init/main.c
102677+++ b/init/main.c
102678@@ -97,6 +97,8 @@ extern void radix_tree_init(void);
102679 static inline void mark_rodata_ro(void) { }
102680 #endif
102681
102682+extern void grsecurity_init(void);
102683+
102684 /*
102685 * Debug helper: via this flag we know that we are in 'early bootup code'
102686 * where only the boot processor is running with IRQ disabled. This means
102687@@ -158,6 +160,37 @@ static int __init set_reset_devices(char *str)
102688
102689 __setup("reset_devices", set_reset_devices);
102690
102691+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
102692+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
102693+static int __init setup_grsec_proc_gid(char *str)
102694+{
102695+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
102696+ return 1;
102697+}
102698+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
102699+#endif
102700+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
102701+int grsec_enable_sysfs_restrict = 1;
102702+static int __init setup_grsec_sysfs_restrict(char *str)
102703+{
102704+ if (!simple_strtol(str, NULL, 0))
102705+ grsec_enable_sysfs_restrict = 0;
102706+ return 1;
102707+}
102708+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
102709+#endif
102710+
102711+#ifdef CONFIG_PAX_SOFTMODE
102712+int pax_softmode;
102713+
102714+static int __init setup_pax_softmode(char *str)
102715+{
102716+ get_option(&str, &pax_softmode);
102717+ return 1;
102718+}
102719+__setup("pax_softmode=", setup_pax_softmode);
102720+#endif
102721+
102722 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
102723 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
102724 static const char *panic_later, *panic_param;
102725@@ -726,7 +759,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
102726 struct blacklist_entry *entry;
102727 char *fn_name;
102728
102729- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
102730+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
102731 if (!fn_name)
102732 return false;
102733
102734@@ -778,7 +811,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
102735 {
102736 int count = preempt_count();
102737 int ret;
102738- char msgbuf[64];
102739+ const char *msg1 = "", *msg2 = "";
102740
102741 if (initcall_blacklisted(fn))
102742 return -EPERM;
102743@@ -788,18 +821,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
102744 else
102745 ret = fn();
102746
102747- msgbuf[0] = 0;
102748-
102749 if (preempt_count() != count) {
102750- sprintf(msgbuf, "preemption imbalance ");
102751+ msg1 = " preemption imbalance";
102752 preempt_count_set(count);
102753 }
102754 if (irqs_disabled()) {
102755- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
102756+ msg2 = " disabled interrupts";
102757 local_irq_enable();
102758 }
102759- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
102760+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
102761
102762+ add_latent_entropy();
102763 return ret;
102764 }
102765
102766@@ -905,8 +937,8 @@ static int run_init_process(const char *init_filename)
102767 {
102768 argv_init[0] = init_filename;
102769 return do_execve(getname_kernel(init_filename),
102770- (const char __user *const __user *)argv_init,
102771- (const char __user *const __user *)envp_init);
102772+ (const char __user *const __force_user *)argv_init,
102773+ (const char __user *const __force_user *)envp_init);
102774 }
102775
102776 static int try_to_run_init_process(const char *init_filename)
102777@@ -923,6 +955,10 @@ static int try_to_run_init_process(const char *init_filename)
102778 return ret;
102779 }
102780
102781+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
102782+extern int gr_init_ran;
102783+#endif
102784+
102785 static noinline void __init kernel_init_freeable(void);
102786
102787 static int __ref kernel_init(void *unused)
102788@@ -947,6 +983,11 @@ static int __ref kernel_init(void *unused)
102789 ramdisk_execute_command, ret);
102790 }
102791
102792+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
102793+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
102794+ gr_init_ran = 1;
102795+#endif
102796+
102797 /*
102798 * We try each of these until one succeeds.
102799 *
102800@@ -1002,7 +1043,7 @@ static noinline void __init kernel_init_freeable(void)
102801 do_basic_setup();
102802
102803 /* Open the /dev/console on the rootfs, this should never fail */
102804- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
102805+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
102806 pr_err("Warning: unable to open an initial console.\n");
102807
102808 (void) sys_dup(0);
102809@@ -1015,11 +1056,13 @@ static noinline void __init kernel_init_freeable(void)
102810 if (!ramdisk_execute_command)
102811 ramdisk_execute_command = "/init";
102812
102813- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
102814+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
102815 ramdisk_execute_command = NULL;
102816 prepare_namespace();
102817 }
102818
102819+ grsecurity_init();
102820+
102821 /*
102822 * Ok, we have completed the initial bootup, and
102823 * we're essentially up and running. Get rid of the
102824diff --git a/ipc/compat.c b/ipc/compat.c
102825index 9b3c85f..5266b0f 100644
102826--- a/ipc/compat.c
102827+++ b/ipc/compat.c
102828@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
102829 COMPAT_SHMLBA);
102830 if (err < 0)
102831 return err;
102832- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
102833+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
102834 }
102835 case SHMDT:
102836 return sys_shmdt(compat_ptr(ptr));
102837@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
102838 }
102839
102840 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
102841- unsigned, nsops,
102842+ compat_long_t, nsops,
102843 const struct compat_timespec __user *, timeout)
102844 {
102845 struct timespec __user *ts64;
102846diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
102847index 8ad93c2..efd80f8 100644
102848--- a/ipc/ipc_sysctl.c
102849+++ b/ipc/ipc_sysctl.c
102850@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
102851 static int proc_ipc_dointvec(struct ctl_table *table, int write,
102852 void __user *buffer, size_t *lenp, loff_t *ppos)
102853 {
102854- struct ctl_table ipc_table;
102855+ ctl_table_no_const ipc_table;
102856
102857 memcpy(&ipc_table, table, sizeof(ipc_table));
102858 ipc_table.data = get_ipc(table);
102859@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
102860 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
102861 void __user *buffer, size_t *lenp, loff_t *ppos)
102862 {
102863- struct ctl_table ipc_table;
102864+ ctl_table_no_const ipc_table;
102865
102866 memcpy(&ipc_table, table, sizeof(ipc_table));
102867 ipc_table.data = get_ipc(table);
102868@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
102869 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
102870 void __user *buffer, size_t *lenp, loff_t *ppos)
102871 {
102872- struct ctl_table ipc_table;
102873+ ctl_table_no_const ipc_table;
102874 memcpy(&ipc_table, table, sizeof(ipc_table));
102875 ipc_table.data = get_ipc(table);
102876
102877@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
102878 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
102879 void __user *buffer, size_t *lenp, loff_t *ppos)
102880 {
102881- struct ctl_table ipc_table;
102882+ ctl_table_no_const ipc_table;
102883 int dummy = 0;
102884
102885 memcpy(&ipc_table, table, sizeof(ipc_table));
102886diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
102887index 68d4e95..1477ded 100644
102888--- a/ipc/mq_sysctl.c
102889+++ b/ipc/mq_sysctl.c
102890@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
102891 static int proc_mq_dointvec(struct ctl_table *table, int write,
102892 void __user *buffer, size_t *lenp, loff_t *ppos)
102893 {
102894- struct ctl_table mq_table;
102895+ ctl_table_no_const mq_table;
102896 memcpy(&mq_table, table, sizeof(mq_table));
102897 mq_table.data = get_mq(table);
102898
102899@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
102900 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
102901 void __user *buffer, size_t *lenp, loff_t *ppos)
102902 {
102903- struct ctl_table mq_table;
102904+ ctl_table_no_const mq_table;
102905 memcpy(&mq_table, table, sizeof(mq_table));
102906 mq_table.data = get_mq(table);
102907
102908diff --git a/ipc/mqueue.c b/ipc/mqueue.c
102909index c3fc5c2..1f32fe2 100644
102910--- a/ipc/mqueue.c
102911+++ b/ipc/mqueue.c
102912@@ -275,6 +275,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
102913 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
102914 info->attr.mq_msgsize);
102915
102916+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
102917 spin_lock(&mq_lock);
102918 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
102919 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
102920diff --git a/ipc/sem.c b/ipc/sem.c
102921index d1a6edd..1a59db4 100644
102922--- a/ipc/sem.c
102923+++ b/ipc/sem.c
102924@@ -253,6 +253,16 @@ static void sem_rcu_free(struct rcu_head *head)
102925 }
102926
102927 /*
102928+ * spin_unlock_wait() and !spin_is_locked() are not memory barriers, they
102929+ * are only control barriers.
102930+ * The code must pair with spin_unlock(&sem->lock) or
102931+ * spin_unlock(&sem_perm.lock), thus just the control barrier is insufficient.
102932+ *
102933+ * smp_rmb() is sufficient, as writes cannot pass the control barrier.
102934+ */
102935+#define ipc_smp_acquire__after_spin_is_unlocked() smp_rmb()
102936+
102937+/*
102938 * Wait until all currently ongoing simple ops have completed.
102939 * Caller must own sem_perm.lock.
102940 * New simple ops cannot start, because simple ops first check
102941@@ -275,6 +285,7 @@ static void sem_wait_array(struct sem_array *sma)
102942 sem = sma->sem_base + i;
102943 spin_unlock_wait(&sem->lock);
102944 }
102945+ ipc_smp_acquire__after_spin_is_unlocked();
102946 }
102947
102948 /*
102949@@ -327,13 +338,12 @@ static inline int sem_lock(struct sem_array *sma, struct sembuf *sops,
102950 /* Then check that the global lock is free */
102951 if (!spin_is_locked(&sma->sem_perm.lock)) {
102952 /*
102953- * The ipc object lock check must be visible on all
102954- * cores before rechecking the complex count. Otherwise
102955- * we can race with another thread that does:
102956+ * We need a memory barrier with acquire semantics,
102957+ * otherwise we can race with another thread that does:
102958 * complex_count++;
102959 * spin_unlock(sem_perm.lock);
102960 */
102961- smp_rmb();
102962+ ipc_smp_acquire__after_spin_is_unlocked();
102963
102964 /*
102965 * Now repeat the test of complex_count:
102966@@ -1780,7 +1790,7 @@ static int get_queue_result(struct sem_queue *q)
102967 }
102968
102969 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
102970- unsigned, nsops, const struct timespec __user *, timeout)
102971+ long, nsops, const struct timespec __user *, timeout)
102972 {
102973 int error = -EINVAL;
102974 struct sem_array *sma;
102975@@ -2015,7 +2025,7 @@ out_free:
102976 }
102977
102978 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
102979- unsigned, nsops)
102980+ long, nsops)
102981 {
102982 return sys_semtimedop(semid, tsops, nsops, NULL);
102983 }
102984diff --git a/ipc/shm.c b/ipc/shm.c
102985index 6d76707..b646bbe 100644
102986--- a/ipc/shm.c
102987+++ b/ipc/shm.c
102988@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
102989 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
102990 #endif
102991
102992+#ifdef CONFIG_GRKERNSEC
102993+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
102994+ const u64 shm_createtime, const kuid_t cuid,
102995+ const int shmid);
102996+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
102997+ const u64 shm_createtime);
102998+#endif
102999+
103000 void shm_init_ns(struct ipc_namespace *ns)
103001 {
103002 ns->shm_ctlmax = SHMMAX;
103003@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
103004 shp->shm_lprid = 0;
103005 shp->shm_atim = shp->shm_dtim = 0;
103006 shp->shm_ctim = get_seconds();
103007+#ifdef CONFIG_GRKERNSEC
103008+ shp->shm_createtime = ktime_get_ns();
103009+#endif
103010 shp->shm_segsz = size;
103011 shp->shm_nattch = 0;
103012 shp->shm_file = file;
103013@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
103014 f_mode = FMODE_READ | FMODE_WRITE;
103015 }
103016 if (shmflg & SHM_EXEC) {
103017+
103018+#ifdef CONFIG_PAX_MPROTECT
103019+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
103020+ goto out;
103021+#endif
103022+
103023 prot |= PROT_EXEC;
103024 acc_mode |= S_IXUGO;
103025 }
103026@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
103027 if (err)
103028 goto out_unlock;
103029
103030+#ifdef CONFIG_GRKERNSEC
103031+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
103032+ shp->shm_perm.cuid, shmid) ||
103033+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
103034+ err = -EACCES;
103035+ goto out_unlock;
103036+ }
103037+#endif
103038+
103039 ipc_lock_object(&shp->shm_perm);
103040
103041 /* check if shm_destroy() is tearing down shp */
103042@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
103043 path = shp->shm_file->f_path;
103044 path_get(&path);
103045 shp->shm_nattch++;
103046+#ifdef CONFIG_GRKERNSEC
103047+ shp->shm_lapid = current->pid;
103048+#endif
103049 size = i_size_read(d_inode(path.dentry));
103050 ipc_unlock_object(&shp->shm_perm);
103051 rcu_read_unlock();
103052diff --git a/ipc/util.c b/ipc/util.c
103053index ff3323e..d6d63d1 100644
103054--- a/ipc/util.c
103055+++ b/ipc/util.c
103056@@ -71,6 +71,8 @@ struct ipc_proc_iface {
103057 int (*show)(struct seq_file *, void *);
103058 };
103059
103060+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
103061+
103062 /**
103063 * ipc_init - initialise ipc subsystem
103064 *
103065@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
103066 granted_mode >>= 6;
103067 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
103068 granted_mode >>= 3;
103069+
103070+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
103071+ return -1;
103072+
103073 /* is there some bit set in requested_mode but not in granted_mode? */
103074 if ((requested_mode & ~granted_mode & 0007) &&
103075 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
103076diff --git a/kernel/audit.c b/kernel/audit.c
103077index 1c13e42..6c171ab 100644
103078--- a/kernel/audit.c
103079+++ b/kernel/audit.c
103080@@ -124,7 +124,7 @@ u32 audit_sig_sid = 0;
103081 3) suppressed due to audit_rate_limit
103082 4) suppressed due to audit_backlog_limit
103083 */
103084-static atomic_t audit_lost = ATOMIC_INIT(0);
103085+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
103086
103087 /* The netlink socket. */
103088 static struct sock *audit_sock;
103089@@ -258,7 +258,7 @@ void audit_log_lost(const char *message)
103090 unsigned long now;
103091 int print;
103092
103093- atomic_inc(&audit_lost);
103094+ atomic_inc_unchecked(&audit_lost);
103095
103096 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
103097
103098@@ -275,7 +275,7 @@ void audit_log_lost(const char *message)
103099 if (print) {
103100 if (printk_ratelimit())
103101 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
103102- atomic_read(&audit_lost),
103103+ atomic_read_unchecked(&audit_lost),
103104 audit_rate_limit,
103105 audit_backlog_limit);
103106 audit_panic(message);
103107@@ -833,7 +833,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
103108 s.pid = audit_pid;
103109 s.rate_limit = audit_rate_limit;
103110 s.backlog_limit = audit_backlog_limit;
103111- s.lost = atomic_read(&audit_lost);
103112+ s.lost = atomic_read_unchecked(&audit_lost);
103113 s.backlog = skb_queue_len(&audit_skb_queue);
103114 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
103115 s.backlog_wait_time = audit_backlog_wait_time_master;
103116diff --git a/kernel/auditsc.c b/kernel/auditsc.c
103117index 9fb9d1c..afb1610 100644
103118--- a/kernel/auditsc.c
103119+++ b/kernel/auditsc.c
103120@@ -1023,7 +1023,7 @@ static int audit_log_single_execve_arg(struct audit_context *context,
103121 * for strings that are too long, we should not have created
103122 * any.
103123 */
103124- if (unlikely((len == -1) || len > MAX_ARG_STRLEN - 1)) {
103125+ if (unlikely(len > MAX_ARG_STRLEN - 1)) {
103126 WARN_ON(1);
103127 send_sig(SIGKILL, current, 0);
103128 return -1;
103129@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
103130 }
103131
103132 /* global counter which is incremented every time something logs in */
103133-static atomic_t session_id = ATOMIC_INIT(0);
103134+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
103135
103136 static int audit_set_loginuid_perm(kuid_t loginuid)
103137 {
103138@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
103139
103140 /* are we setting or clearing? */
103141 if (uid_valid(loginuid))
103142- sessionid = (unsigned int)atomic_inc_return(&session_id);
103143+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
103144
103145 task->sessionid = sessionid;
103146 task->loginuid = loginuid;
103147diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
103148index 54f0e7f..fed997b 100644
103149--- a/kernel/bpf/core.c
103150+++ b/kernel/bpf/core.c
103151@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
103152 * random section of illegal instructions.
103153 */
103154 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
103155- hdr = module_alloc(size);
103156+ hdr = module_alloc_exec(size);
103157 if (hdr == NULL)
103158 return NULL;
103159
103160 /* Fill space with illegal/arch-dep instructions. */
103161 bpf_fill_ill_insns(hdr, size);
103162
103163+ pax_open_kernel();
103164 hdr->pages = size / PAGE_SIZE;
103165+ pax_close_kernel();
103166+
103167 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
103168 PAGE_SIZE - sizeof(*hdr));
103169 start = (prandom_u32() % hole) & ~(alignment - 1);
103170@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
103171
103172 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
103173 {
103174- module_memfree(hdr);
103175+ module_memfree_exec(hdr);
103176 }
103177 #endif /* CONFIG_BPF_JIT */
103178
103179diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
103180index 3bae6c5..59ea175 100644
103181--- a/kernel/bpf/syscall.c
103182+++ b/kernel/bpf/syscall.c
103183@@ -554,11 +554,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
103184 int err;
103185
103186 /* the syscall is limited to root temporarily. This restriction will be
103187- * lifted when security audit is clean. Note that eBPF+tracing must have
103188- * this restriction, since it may pass kernel data to user space
103189+ * lifted by upstream when a half-assed security audit is clean. Note
103190+ * that eBPF+tracing must have this restriction, since it may pass
103191+ * kernel data to user space
103192 */
103193 if (!capable(CAP_SYS_ADMIN))
103194 return -EPERM;
103195+#ifdef CONFIG_GRKERNSEC
103196+ return -EPERM;
103197+#endif
103198
103199 if (!access_ok(VERIFY_READ, uattr, 1))
103200 return -EFAULT;
103201diff --git a/kernel/capability.c b/kernel/capability.c
103202index 45432b5..988f1e4 100644
103203--- a/kernel/capability.c
103204+++ b/kernel/capability.c
103205@@ -193,6 +193,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
103206 * before modification is attempted and the application
103207 * fails.
103208 */
103209+ if (tocopy > ARRAY_SIZE(kdata))
103210+ return -EFAULT;
103211+
103212 if (copy_to_user(dataptr, kdata, tocopy
103213 * sizeof(struct __user_cap_data_struct))) {
103214 return -EFAULT;
103215@@ -298,10 +301,11 @@ bool has_ns_capability(struct task_struct *t,
103216 int ret;
103217
103218 rcu_read_lock();
103219- ret = security_capable(__task_cred(t), ns, cap);
103220+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
103221+ gr_task_is_capable(t, __task_cred(t), cap);
103222 rcu_read_unlock();
103223
103224- return (ret == 0);
103225+ return ret;
103226 }
103227
103228 /**
103229@@ -338,10 +342,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
103230 int ret;
103231
103232 rcu_read_lock();
103233- ret = security_capable_noaudit(__task_cred(t), ns, cap);
103234+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
103235 rcu_read_unlock();
103236
103237- return (ret == 0);
103238+ return ret;
103239 }
103240
103241 /**
103242@@ -379,7 +383,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
103243 BUG();
103244 }
103245
103246- if (security_capable(current_cred(), ns, cap) == 0) {
103247+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
103248 current->flags |= PF_SUPERPRIV;
103249 return true;
103250 }
103251@@ -387,6 +391,20 @@ bool ns_capable(struct user_namespace *ns, int cap)
103252 }
103253 EXPORT_SYMBOL(ns_capable);
103254
103255+bool ns_capable_nolog(struct user_namespace *ns, int cap)
103256+{
103257+ if (unlikely(!cap_valid(cap))) {
103258+ pr_crit("capable_nolog() called with invalid cap=%u\n", cap);
103259+ BUG();
103260+ }
103261+
103262+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
103263+ current->flags |= PF_SUPERPRIV;
103264+ return true;
103265+ }
103266+ return false;
103267+}
103268+EXPORT_SYMBOL(ns_capable_nolog);
103269
103270 /**
103271 * capable - Determine if the current task has a superior capability in effect
103272@@ -403,6 +421,13 @@ bool capable(int cap)
103273 return ns_capable(&init_user_ns, cap);
103274 }
103275 EXPORT_SYMBOL(capable);
103276+
103277+bool capable_nolog(int cap)
103278+{
103279+ return ns_capable_nolog(&init_user_ns, cap);
103280+}
103281+EXPORT_SYMBOL(capable_nolog);
103282+
103283 #endif /* CONFIG_MULTIUSER */
103284
103285 /**
103286@@ -447,3 +472,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
103287 kgid_has_mapping(ns, inode->i_gid);
103288 }
103289 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
103290+
103291+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
103292+{
103293+ struct user_namespace *ns = current_user_ns();
103294+
103295+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
103296+ kgid_has_mapping(ns, inode->i_gid);
103297+}
103298+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
103299diff --git a/kernel/cgroup.c b/kernel/cgroup.c
103300index e8a5491..ab4bfa3 100644
103301--- a/kernel/cgroup.c
103302+++ b/kernel/cgroup.c
103303@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
103304 if (!pathbuf || !agentbuf)
103305 goto out;
103306
103307+ if (agentbuf[0] == '\0')
103308+ goto out;
103309+
103310 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
103311 if (!path)
103312 goto out;
103313@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
103314 struct task_struct *task;
103315 int count = 0;
103316
103317- seq_printf(seq, "css_set %p\n", cset);
103318+ seq_printf(seq, "css_set %pK\n", cset);
103319
103320 list_for_each_entry(task, &cset->tasks, cg_list) {
103321 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
103322diff --git a/kernel/compat.c b/kernel/compat.c
103323index 333d364..762ec00 100644
103324--- a/kernel/compat.c
103325+++ b/kernel/compat.c
103326@@ -13,6 +13,7 @@
103327
103328 #include <linux/linkage.h>
103329 #include <linux/compat.h>
103330+#include <linux/module.h>
103331 #include <linux/errno.h>
103332 #include <linux/time.h>
103333 #include <linux/signal.h>
103334@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
103335 mm_segment_t oldfs;
103336 long ret;
103337
103338- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
103339+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
103340 oldfs = get_fs();
103341 set_fs(KERNEL_DS);
103342 ret = hrtimer_nanosleep_restart(restart);
103343@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
103344 oldfs = get_fs();
103345 set_fs(KERNEL_DS);
103346 ret = hrtimer_nanosleep(&tu,
103347- rmtp ? (struct timespec __user *)&rmt : NULL,
103348+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
103349 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
103350 set_fs(oldfs);
103351
103352@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
103353 mm_segment_t old_fs = get_fs();
103354
103355 set_fs(KERNEL_DS);
103356- ret = sys_sigpending((old_sigset_t __user *) &s);
103357+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
103358 set_fs(old_fs);
103359 if (ret == 0)
103360 ret = put_user(s, set);
103361@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
103362 mm_segment_t old_fs = get_fs();
103363
103364 set_fs(KERNEL_DS);
103365- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
103366+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
103367 set_fs(old_fs);
103368
103369 if (!ret) {
103370@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
103371 set_fs (KERNEL_DS);
103372 ret = sys_wait4(pid,
103373 (stat_addr ?
103374- (unsigned int __user *) &status : NULL),
103375- options, (struct rusage __user *) &r);
103376+ (unsigned int __force_user *) &status : NULL),
103377+ options, (struct rusage __force_user *) &r);
103378 set_fs (old_fs);
103379
103380 if (ret > 0) {
103381@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
103382 memset(&info, 0, sizeof(info));
103383
103384 set_fs(KERNEL_DS);
103385- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
103386- uru ? (struct rusage __user *)&ru : NULL);
103387+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
103388+ uru ? (struct rusage __force_user *)&ru : NULL);
103389 set_fs(old_fs);
103390
103391 if ((ret < 0) || (info.si_signo == 0))
103392@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
103393 oldfs = get_fs();
103394 set_fs(KERNEL_DS);
103395 err = sys_timer_settime(timer_id, flags,
103396- (struct itimerspec __user *) &newts,
103397- (struct itimerspec __user *) &oldts);
103398+ (struct itimerspec __force_user *) &newts,
103399+ (struct itimerspec __force_user *) &oldts);
103400 set_fs(oldfs);
103401 if (!err && old && put_compat_itimerspec(old, &oldts))
103402 return -EFAULT;
103403@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
103404 oldfs = get_fs();
103405 set_fs(KERNEL_DS);
103406 err = sys_timer_gettime(timer_id,
103407- (struct itimerspec __user *) &ts);
103408+ (struct itimerspec __force_user *) &ts);
103409 set_fs(oldfs);
103410 if (!err && put_compat_itimerspec(setting, &ts))
103411 return -EFAULT;
103412@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
103413 oldfs = get_fs();
103414 set_fs(KERNEL_DS);
103415 err = sys_clock_settime(which_clock,
103416- (struct timespec __user *) &ts);
103417+ (struct timespec __force_user *) &ts);
103418 set_fs(oldfs);
103419 return err;
103420 }
103421@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
103422 oldfs = get_fs();
103423 set_fs(KERNEL_DS);
103424 err = sys_clock_gettime(which_clock,
103425- (struct timespec __user *) &ts);
103426+ (struct timespec __force_user *) &ts);
103427 set_fs(oldfs);
103428 if (!err && compat_put_timespec(&ts, tp))
103429 return -EFAULT;
103430@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
103431
103432 oldfs = get_fs();
103433 set_fs(KERNEL_DS);
103434- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
103435+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
103436 set_fs(oldfs);
103437
103438 err = compat_put_timex(utp, &txc);
103439@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
103440 oldfs = get_fs();
103441 set_fs(KERNEL_DS);
103442 err = sys_clock_getres(which_clock,
103443- (struct timespec __user *) &ts);
103444+ (struct timespec __force_user *) &ts);
103445 set_fs(oldfs);
103446 if (!err && tp && compat_put_timespec(&ts, tp))
103447 return -EFAULT;
103448@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
103449 struct timespec tu;
103450 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
103451
103452- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
103453+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
103454 oldfs = get_fs();
103455 set_fs(KERNEL_DS);
103456 err = clock_nanosleep_restart(restart);
103457@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
103458 oldfs = get_fs();
103459 set_fs(KERNEL_DS);
103460 err = sys_clock_nanosleep(which_clock, flags,
103461- (struct timespec __user *) &in,
103462- (struct timespec __user *) &out);
103463+ (struct timespec __force_user *) &in,
103464+ (struct timespec __force_user *) &out);
103465 set_fs(oldfs);
103466
103467 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
103468@@ -1147,7 +1148,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
103469 mm_segment_t old_fs = get_fs();
103470
103471 set_fs(KERNEL_DS);
103472- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
103473+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
103474 set_fs(old_fs);
103475 if (compat_put_timespec(&t, interval))
103476 return -EFAULT;
103477diff --git a/kernel/configs.c b/kernel/configs.c
103478index c18b1f1..b9a0132 100644
103479--- a/kernel/configs.c
103480+++ b/kernel/configs.c
103481@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
103482 struct proc_dir_entry *entry;
103483
103484 /* create the current config file */
103485+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
103486+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
103487+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
103488+ &ikconfig_file_ops);
103489+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
103490+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
103491+ &ikconfig_file_ops);
103492+#endif
103493+#else
103494 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
103495 &ikconfig_file_ops);
103496+#endif
103497+
103498 if (!entry)
103499 return -ENOMEM;
103500
103501diff --git a/kernel/cred.c b/kernel/cred.c
103502index ec1c076..7da8a0e 100644
103503--- a/kernel/cred.c
103504+++ b/kernel/cred.c
103505@@ -167,6 +167,15 @@ void exit_creds(struct task_struct *tsk)
103506 validate_creds(cred);
103507 alter_cred_subscribers(cred, -1);
103508 put_cred(cred);
103509+
103510+#ifdef CONFIG_GRKERNSEC_SETXID
103511+ cred = (struct cred *) tsk->delayed_cred;
103512+ if (cred != NULL) {
103513+ tsk->delayed_cred = NULL;
103514+ validate_creds(cred);
103515+ put_cred(cred);
103516+ }
103517+#endif
103518 }
103519
103520 /**
103521@@ -414,7 +423,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
103522 * Always returns 0 thus allowing this function to be tail-called at the end
103523 * of, say, sys_setgid().
103524 */
103525-int commit_creds(struct cred *new)
103526+static int __commit_creds(struct cred *new)
103527 {
103528 struct task_struct *task = current;
103529 const struct cred *old = task->real_cred;
103530@@ -433,6 +442,8 @@ int commit_creds(struct cred *new)
103531
103532 get_cred(new); /* we will require a ref for the subj creds too */
103533
103534+ gr_set_role_label(task, new->uid, new->gid);
103535+
103536 /* dumpability changes */
103537 if (!uid_eq(old->euid, new->euid) ||
103538 !gid_eq(old->egid, new->egid) ||
103539@@ -482,6 +493,105 @@ int commit_creds(struct cred *new)
103540 put_cred(old);
103541 return 0;
103542 }
103543+#ifdef CONFIG_GRKERNSEC_SETXID
103544+extern int set_user(struct cred *new);
103545+
103546+void gr_delayed_cred_worker(void)
103547+{
103548+ const struct cred *new = current->delayed_cred;
103549+ struct cred *ncred;
103550+
103551+ current->delayed_cred = NULL;
103552+
103553+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
103554+ // from doing get_cred on it when queueing this
103555+ put_cred(new);
103556+ return;
103557+ } else if (new == NULL)
103558+ return;
103559+
103560+ ncred = prepare_creds();
103561+ if (!ncred)
103562+ goto die;
103563+ // uids
103564+ ncred->uid = new->uid;
103565+ ncred->euid = new->euid;
103566+ ncred->suid = new->suid;
103567+ ncred->fsuid = new->fsuid;
103568+ // gids
103569+ ncred->gid = new->gid;
103570+ ncred->egid = new->egid;
103571+ ncred->sgid = new->sgid;
103572+ ncred->fsgid = new->fsgid;
103573+ // groups
103574+ set_groups(ncred, new->group_info);
103575+ // caps
103576+ ncred->securebits = new->securebits;
103577+ ncred->cap_inheritable = new->cap_inheritable;
103578+ ncred->cap_permitted = new->cap_permitted;
103579+ ncred->cap_effective = new->cap_effective;
103580+ ncred->cap_bset = new->cap_bset;
103581+
103582+ if (set_user(ncred)) {
103583+ abort_creds(ncred);
103584+ goto die;
103585+ }
103586+
103587+ // from doing get_cred on it when queueing this
103588+ put_cred(new);
103589+
103590+ __commit_creds(ncred);
103591+ return;
103592+die:
103593+ // from doing get_cred on it when queueing this
103594+ put_cred(new);
103595+ do_group_exit(SIGKILL);
103596+}
103597+#endif
103598+
103599+int commit_creds(struct cred *new)
103600+{
103601+#ifdef CONFIG_GRKERNSEC_SETXID
103602+ int ret;
103603+ int schedule_it = 0;
103604+ struct task_struct *t;
103605+ unsigned oldsecurebits = current_cred()->securebits;
103606+
103607+ /* we won't get called with tasklist_lock held for writing
103608+ and interrupts disabled as the cred struct in that case is
103609+ init_cred
103610+ */
103611+ if (grsec_enable_setxid && !current_is_single_threaded() &&
103612+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
103613+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
103614+ schedule_it = 1;
103615+ }
103616+ ret = __commit_creds(new);
103617+ if (schedule_it) {
103618+ rcu_read_lock();
103619+ read_lock(&tasklist_lock);
103620+ for (t = next_thread(current); t != current;
103621+ t = next_thread(t)) {
103622+ /* we'll check if the thread has uid 0 in
103623+ * the delayed worker routine
103624+ */
103625+ if (task_securebits(t) == oldsecurebits &&
103626+ t->delayed_cred == NULL) {
103627+ t->delayed_cred = get_cred(new);
103628+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
103629+ set_tsk_need_resched(t);
103630+ }
103631+ }
103632+ read_unlock(&tasklist_lock);
103633+ rcu_read_unlock();
103634+ }
103635+
103636+ return ret;
103637+#else
103638+ return __commit_creds(new);
103639+#endif
103640+}
103641+
103642 EXPORT_SYMBOL(commit_creds);
103643
103644 /**
103645diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
103646index 0874e2e..5b32cc9 100644
103647--- a/kernel/debug/debug_core.c
103648+++ b/kernel/debug/debug_core.c
103649@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
103650 */
103651 static atomic_t masters_in_kgdb;
103652 static atomic_t slaves_in_kgdb;
103653-static atomic_t kgdb_break_tasklet_var;
103654+static atomic_unchecked_t kgdb_break_tasklet_var;
103655 atomic_t kgdb_setting_breakpoint;
103656
103657 struct task_struct *kgdb_usethread;
103658@@ -137,7 +137,7 @@ int kgdb_single_step;
103659 static pid_t kgdb_sstep_pid;
103660
103661 /* to keep track of the CPU which is doing the single stepping*/
103662-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
103663+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
103664
103665 /*
103666 * If you are debugging a problem where roundup (the collection of
103667@@ -552,7 +552,7 @@ return_normal:
103668 * kernel will only try for the value of sstep_tries before
103669 * giving up and continuing on.
103670 */
103671- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
103672+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
103673 (kgdb_info[cpu].task &&
103674 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
103675 atomic_set(&kgdb_active, -1);
103676@@ -654,8 +654,8 @@ cpu_master_loop:
103677 }
103678
103679 kgdb_restore:
103680- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
103681- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
103682+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
103683+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
103684 if (kgdb_info[sstep_cpu].task)
103685 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
103686 else
103687@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
103688 static void kgdb_tasklet_bpt(unsigned long ing)
103689 {
103690 kgdb_breakpoint();
103691- atomic_set(&kgdb_break_tasklet_var, 0);
103692+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
103693 }
103694
103695 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
103696
103697 void kgdb_schedule_breakpoint(void)
103698 {
103699- if (atomic_read(&kgdb_break_tasklet_var) ||
103700+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
103701 atomic_read(&kgdb_active) != -1 ||
103702 atomic_read(&kgdb_setting_breakpoint))
103703 return;
103704- atomic_inc(&kgdb_break_tasklet_var);
103705+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
103706 tasklet_schedule(&kgdb_tasklet_breakpoint);
103707 }
103708 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
103709diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
103710index 41213454..861e178 100644
103711--- a/kernel/debug/kdb/kdb_main.c
103712+++ b/kernel/debug/kdb/kdb_main.c
103713@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
103714 continue;
103715
103716 kdb_printf("%-20s%8u 0x%p ", mod->name,
103717- mod->core_size, (void *)mod);
103718+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
103719 #ifdef CONFIG_MODULE_UNLOAD
103720 kdb_printf("%4d ", module_refcount(mod));
103721 #endif
103722@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
103723 kdb_printf(" (Loading)");
103724 else
103725 kdb_printf(" (Live)");
103726- kdb_printf(" 0x%p", mod->module_core);
103727+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
103728
103729 #ifdef CONFIG_MODULE_UNLOAD
103730 {
103731diff --git a/kernel/events/core.c b/kernel/events/core.c
103732index 0ceb386..ddaf008 100644
103733--- a/kernel/events/core.c
103734+++ b/kernel/events/core.c
103735@@ -172,8 +172,15 @@ static struct srcu_struct pmus_srcu;
103736 * 0 - disallow raw tracepoint access for unpriv
103737 * 1 - disallow cpu events for unpriv
103738 * 2 - disallow kernel profiling for unpriv
103739+ * 3 - disallow all unpriv perf event use
103740 */
103741-int sysctl_perf_event_paranoid __read_mostly = 1;
103742+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
103743+int sysctl_perf_event_legitimately_concerned __read_only = 3;
103744+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
103745+int sysctl_perf_event_legitimately_concerned __read_only = 2;
103746+#else
103747+int sysctl_perf_event_legitimately_concerned __read_only = 1;
103748+#endif
103749
103750 /* Minimum for 512 kiB + 1 user control page */
103751 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
103752@@ -199,7 +206,7 @@ void update_perf_cpu_limits(void)
103753
103754 tmp *= sysctl_perf_cpu_time_max_percent;
103755 do_div(tmp, 100);
103756- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
103757+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
103758 }
103759
103760 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
103761@@ -305,7 +312,7 @@ void perf_sample_event_took(u64 sample_len_ns)
103762 }
103763 }
103764
103765-static atomic64_t perf_event_id;
103766+static atomic64_unchecked_t perf_event_id;
103767
103768 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
103769 enum event_type_t event_type);
103770@@ -3771,9 +3778,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
103771 mutex_lock(&event->child_mutex);
103772 total += perf_event_read(event);
103773 *enabled += event->total_time_enabled +
103774- atomic64_read(&event->child_total_time_enabled);
103775+ atomic64_read_unchecked(&event->child_total_time_enabled);
103776 *running += event->total_time_running +
103777- atomic64_read(&event->child_total_time_running);
103778+ atomic64_read_unchecked(&event->child_total_time_running);
103779
103780 list_for_each_entry(child, &event->child_list, child_list) {
103781 total += perf_event_read(child);
103782@@ -4268,10 +4275,10 @@ void perf_event_update_userpage(struct perf_event *event)
103783 userpg->offset -= local64_read(&event->hw.prev_count);
103784
103785 userpg->time_enabled = enabled +
103786- atomic64_read(&event->child_total_time_enabled);
103787+ atomic64_read_unchecked(&event->child_total_time_enabled);
103788
103789 userpg->time_running = running +
103790- atomic64_read(&event->child_total_time_running);
103791+ atomic64_read_unchecked(&event->child_total_time_running);
103792
103793 arch_perf_update_userpage(event, userpg, now);
103794
103795@@ -4946,7 +4953,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
103796
103797 /* Data. */
103798 sp = perf_user_stack_pointer(regs);
103799- rem = __output_copy_user(handle, (void *) sp, dump_size);
103800+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
103801 dyn_size = dump_size - rem;
103802
103803 perf_output_skip(handle, rem);
103804@@ -5037,11 +5044,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
103805 values[n++] = perf_event_count(event);
103806 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
103807 values[n++] = enabled +
103808- atomic64_read(&event->child_total_time_enabled);
103809+ atomic64_read_unchecked(&event->child_total_time_enabled);
103810 }
103811 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
103812 values[n++] = running +
103813- atomic64_read(&event->child_total_time_running);
103814+ atomic64_read_unchecked(&event->child_total_time_running);
103815 }
103816 if (read_format & PERF_FORMAT_ID)
103817 values[n++] = primary_event_id(event);
103818@@ -7533,7 +7540,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
103819 event->parent = parent_event;
103820
103821 event->ns = get_pid_ns(task_active_pid_ns(current));
103822- event->id = atomic64_inc_return(&perf_event_id);
103823+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
103824
103825 event->state = PERF_EVENT_STATE_INACTIVE;
103826
103827@@ -7892,6 +7899,11 @@ SYSCALL_DEFINE5(perf_event_open,
103828 if (flags & ~PERF_FLAG_ALL)
103829 return -EINVAL;
103830
103831+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
103832+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
103833+ return -EACCES;
103834+#endif
103835+
103836 err = perf_copy_attr(attr_uptr, &attr);
103837 if (err)
103838 return err;
103839@@ -8340,10 +8352,10 @@ static void sync_child_event(struct perf_event *child_event,
103840 /*
103841 * Add back the child's count to the parent's count:
103842 */
103843- atomic64_add(child_val, &parent_event->child_count);
103844- atomic64_add(child_event->total_time_enabled,
103845+ atomic64_add_unchecked(child_val, &parent_event->child_count);
103846+ atomic64_add_unchecked(child_event->total_time_enabled,
103847 &parent_event->child_total_time_enabled);
103848- atomic64_add(child_event->total_time_running,
103849+ atomic64_add_unchecked(child_event->total_time_running,
103850 &parent_event->child_total_time_running);
103851
103852 /*
103853diff --git a/kernel/events/internal.h b/kernel/events/internal.h
103854index 9f6ce9b..e4f2cbb 100644
103855--- a/kernel/events/internal.h
103856+++ b/kernel/events/internal.h
103857@@ -114,10 +114,10 @@ static inline unsigned long perf_aux_size(struct ring_buffer *rb)
103858 return rb->aux_nr_pages << PAGE_SHIFT;
103859 }
103860
103861-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
103862+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
103863 static inline unsigned long \
103864 func_name(struct perf_output_handle *handle, \
103865- const void *buf, unsigned long len) \
103866+ const void user *buf, unsigned long len) \
103867 { \
103868 unsigned long size, written; \
103869 \
103870@@ -150,7 +150,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
103871 return 0;
103872 }
103873
103874-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
103875+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
103876
103877 static inline unsigned long
103878 memcpy_skip(void *dst, const void *src, unsigned long n)
103879@@ -158,7 +158,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
103880 return 0;
103881 }
103882
103883-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
103884+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
103885
103886 #ifndef arch_perf_out_copy_user
103887 #define arch_perf_out_copy_user arch_perf_out_copy_user
103888@@ -176,7 +176,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
103889 }
103890 #endif
103891
103892-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
103893+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
103894
103895 /* Callchain handling */
103896 extern struct perf_callchain_entry *
103897diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
103898index cb346f2..e4dc317 100644
103899--- a/kernel/events/uprobes.c
103900+++ b/kernel/events/uprobes.c
103901@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
103902 {
103903 struct page *page;
103904 uprobe_opcode_t opcode;
103905- int result;
103906+ long result;
103907
103908 pagefault_disable();
103909 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
103910diff --git a/kernel/exit.c b/kernel/exit.c
103911index 22fcc05..5f07dbc 100644
103912--- a/kernel/exit.c
103913+++ b/kernel/exit.c
103914@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
103915 struct task_struct *leader;
103916 int zap_leader;
103917 repeat:
103918+#ifdef CONFIG_NET
103919+ gr_del_task_from_ip_table(p);
103920+#endif
103921+
103922 /* don't need to get the RCU readlock here - the process is dead and
103923 * can't be modifying its own credentials. But shut RCU-lockdep up */
103924 rcu_read_lock();
103925@@ -656,6 +660,8 @@ void do_exit(long code)
103926 int group_dead;
103927 TASKS_RCU(int tasks_rcu_i);
103928
103929+ set_fs(USER_DS);
103930+
103931 profile_task_exit(tsk);
103932
103933 WARN_ON(blk_needs_flush_plug(tsk));
103934@@ -672,7 +678,6 @@ void do_exit(long code)
103935 * mm_release()->clear_child_tid() from writing to a user-controlled
103936 * kernel address.
103937 */
103938- set_fs(USER_DS);
103939
103940 ptrace_event(PTRACE_EVENT_EXIT, code);
103941
103942@@ -730,6 +735,9 @@ void do_exit(long code)
103943 tsk->exit_code = code;
103944 taskstats_exit(tsk, group_dead);
103945
103946+ gr_acl_handle_psacct(tsk, code);
103947+ gr_acl_handle_exit();
103948+
103949 exit_mm(tsk);
103950
103951 if (group_dead)
103952@@ -847,7 +855,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
103953 * Take down every thread in the group. This is called by fatal signals
103954 * as well as by sys_exit_group (below).
103955 */
103956-void
103957+__noreturn void
103958 do_group_exit(int exit_code)
103959 {
103960 struct signal_struct *sig = current->signal;
103961diff --git a/kernel/fork.c b/kernel/fork.c
103962index 03c1eaa..461be4c 100644
103963--- a/kernel/fork.c
103964+++ b/kernel/fork.c
103965@@ -188,12 +188,54 @@ static void free_thread_info(struct thread_info *ti)
103966 void thread_info_cache_init(void)
103967 {
103968 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
103969- THREAD_SIZE, 0, NULL);
103970+ THREAD_SIZE, SLAB_USERCOPY, NULL);
103971 BUG_ON(thread_info_cache == NULL);
103972 }
103973 # endif
103974 #endif
103975
103976+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
103977+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
103978+ int node, void **lowmem_stack)
103979+{
103980+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
103981+ void *ret = NULL;
103982+ unsigned int i;
103983+
103984+ *lowmem_stack = alloc_thread_info_node(tsk, node);
103985+ if (*lowmem_stack == NULL)
103986+ goto out;
103987+
103988+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
103989+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
103990+
103991+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
103992+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
103993+ if (ret == NULL) {
103994+ free_thread_info(*lowmem_stack);
103995+ *lowmem_stack = NULL;
103996+ }
103997+
103998+out:
103999+ return ret;
104000+}
104001+
104002+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
104003+{
104004+ unmap_process_stacks(tsk);
104005+}
104006+#else
104007+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
104008+ int node, void **lowmem_stack)
104009+{
104010+ return alloc_thread_info_node(tsk, node);
104011+}
104012+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
104013+{
104014+ free_thread_info(ti);
104015+}
104016+#endif
104017+
104018 /* SLAB cache for signal_struct structures (tsk->signal) */
104019 static struct kmem_cache *signal_cachep;
104020
104021@@ -212,18 +254,22 @@ struct kmem_cache *vm_area_cachep;
104022 /* SLAB cache for mm_struct structures (tsk->mm) */
104023 static struct kmem_cache *mm_cachep;
104024
104025-static void account_kernel_stack(struct thread_info *ti, int account)
104026+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
104027 {
104028+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
104029+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
104030+#else
104031 struct zone *zone = page_zone(virt_to_page(ti));
104032+#endif
104033
104034 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
104035 }
104036
104037 void free_task(struct task_struct *tsk)
104038 {
104039- account_kernel_stack(tsk->stack, -1);
104040+ account_kernel_stack(tsk, tsk->stack, -1);
104041 arch_release_thread_info(tsk->stack);
104042- free_thread_info(tsk->stack);
104043+ gr_free_thread_info(tsk, tsk->stack);
104044 rt_mutex_debug_task_free(tsk);
104045 ftrace_graph_exit_task(tsk);
104046 put_seccomp_filter(tsk);
104047@@ -329,6 +375,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104048 {
104049 struct task_struct *tsk;
104050 struct thread_info *ti;
104051+ void *lowmem_stack;
104052 int node = tsk_fork_get_node(orig);
104053 int err;
104054
104055@@ -336,7 +383,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104056 if (!tsk)
104057 return NULL;
104058
104059- ti = alloc_thread_info_node(tsk, node);
104060+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
104061 if (!ti)
104062 goto free_tsk;
104063
104064@@ -345,6 +392,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104065 goto free_ti;
104066
104067 tsk->stack = ti;
104068+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
104069+ tsk->lowmem_stack = lowmem_stack;
104070+#endif
104071 #ifdef CONFIG_SECCOMP
104072 /*
104073 * We must handle setting up seccomp filters once we're under
104074@@ -361,7 +411,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104075 set_task_stack_end_magic(tsk);
104076
104077 #ifdef CONFIG_CC_STACKPROTECTOR
104078- tsk->stack_canary = get_random_int();
104079+ tsk->stack_canary = pax_get_random_long();
104080 #endif
104081
104082 /*
104083@@ -375,24 +425,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
104084 tsk->splice_pipe = NULL;
104085 tsk->task_frag.page = NULL;
104086
104087- account_kernel_stack(ti, 1);
104088+ account_kernel_stack(tsk, ti, 1);
104089
104090 return tsk;
104091
104092 free_ti:
104093- free_thread_info(ti);
104094+ gr_free_thread_info(tsk, ti);
104095 free_tsk:
104096 free_task_struct(tsk);
104097 return NULL;
104098 }
104099
104100 #ifdef CONFIG_MMU
104101-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104102+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
104103+{
104104+ struct vm_area_struct *tmp;
104105+ unsigned long charge;
104106+ struct file *file;
104107+ int retval;
104108+
104109+ charge = 0;
104110+ if (mpnt->vm_flags & VM_ACCOUNT) {
104111+ unsigned long len = vma_pages(mpnt);
104112+
104113+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
104114+ goto fail_nomem;
104115+ charge = len;
104116+ }
104117+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
104118+ if (!tmp)
104119+ goto fail_nomem;
104120+ *tmp = *mpnt;
104121+ tmp->vm_mm = mm;
104122+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
104123+ retval = vma_dup_policy(mpnt, tmp);
104124+ if (retval)
104125+ goto fail_nomem_policy;
104126+ if (anon_vma_fork(tmp, mpnt))
104127+ goto fail_nomem_anon_vma_fork;
104128+ tmp->vm_flags &= ~VM_LOCKED;
104129+ tmp->vm_next = tmp->vm_prev = NULL;
104130+ tmp->vm_mirror = NULL;
104131+ file = tmp->vm_file;
104132+ if (file) {
104133+ struct inode *inode = file_inode(file);
104134+ struct address_space *mapping = file->f_mapping;
104135+
104136+ get_file(file);
104137+ if (tmp->vm_flags & VM_DENYWRITE)
104138+ atomic_dec(&inode->i_writecount);
104139+ i_mmap_lock_write(mapping);
104140+ if (tmp->vm_flags & VM_SHARED)
104141+ atomic_inc(&mapping->i_mmap_writable);
104142+ flush_dcache_mmap_lock(mapping);
104143+ /* insert tmp into the share list, just after mpnt */
104144+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
104145+ flush_dcache_mmap_unlock(mapping);
104146+ i_mmap_unlock_write(mapping);
104147+ }
104148+
104149+ /*
104150+ * Clear hugetlb-related page reserves for children. This only
104151+ * affects MAP_PRIVATE mappings. Faults generated by the child
104152+ * are not guaranteed to succeed, even if read-only
104153+ */
104154+ if (is_vm_hugetlb_page(tmp))
104155+ reset_vma_resv_huge_pages(tmp);
104156+
104157+ return tmp;
104158+
104159+fail_nomem_anon_vma_fork:
104160+ mpol_put(vma_policy(tmp));
104161+fail_nomem_policy:
104162+ kmem_cache_free(vm_area_cachep, tmp);
104163+fail_nomem:
104164+ vm_unacct_memory(charge);
104165+ return NULL;
104166+}
104167+
104168+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104169 {
104170 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
104171 struct rb_node **rb_link, *rb_parent;
104172 int retval;
104173- unsigned long charge;
104174
104175 uprobe_start_dup_mmap();
104176 down_write(&oldmm->mmap_sem);
104177@@ -423,51 +538,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104178
104179 prev = NULL;
104180 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
104181- struct file *file;
104182-
104183 if (mpnt->vm_flags & VM_DONTCOPY) {
104184 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
104185 -vma_pages(mpnt));
104186 continue;
104187 }
104188- charge = 0;
104189- if (mpnt->vm_flags & VM_ACCOUNT) {
104190- unsigned long len = vma_pages(mpnt);
104191-
104192- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
104193- goto fail_nomem;
104194- charge = len;
104195- }
104196- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
104197- if (!tmp)
104198- goto fail_nomem;
104199- *tmp = *mpnt;
104200- INIT_LIST_HEAD(&tmp->anon_vma_chain);
104201- retval = vma_dup_policy(mpnt, tmp);
104202- if (retval)
104203- goto fail_nomem_policy;
104204- tmp->vm_mm = mm;
104205- if (anon_vma_fork(tmp, mpnt))
104206- goto fail_nomem_anon_vma_fork;
104207- tmp->vm_flags &= ~VM_LOCKED;
104208- tmp->vm_next = tmp->vm_prev = NULL;
104209- file = tmp->vm_file;
104210- if (file) {
104211- struct inode *inode = file_inode(file);
104212- struct address_space *mapping = file->f_mapping;
104213-
104214- get_file(file);
104215- if (tmp->vm_flags & VM_DENYWRITE)
104216- atomic_dec(&inode->i_writecount);
104217- i_mmap_lock_write(mapping);
104218- if (tmp->vm_flags & VM_SHARED)
104219- atomic_inc(&mapping->i_mmap_writable);
104220- flush_dcache_mmap_lock(mapping);
104221- /* insert tmp into the share list, just after mpnt */
104222- vma_interval_tree_insert_after(tmp, mpnt,
104223- &mapping->i_mmap);
104224- flush_dcache_mmap_unlock(mapping);
104225- i_mmap_unlock_write(mapping);
104226+ tmp = dup_vma(mm, oldmm, mpnt);
104227+ if (!tmp) {
104228+ retval = -ENOMEM;
104229+ goto out;
104230 }
104231
104232 /*
104233@@ -499,6 +578,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
104234 if (retval)
104235 goto out;
104236 }
104237+
104238+#ifdef CONFIG_PAX_SEGMEXEC
104239+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
104240+ struct vm_area_struct *mpnt_m;
104241+
104242+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
104243+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
104244+
104245+ if (!mpnt->vm_mirror)
104246+ continue;
104247+
104248+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
104249+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
104250+ mpnt->vm_mirror = mpnt_m;
104251+ } else {
104252+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
104253+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
104254+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
104255+ mpnt->vm_mirror->vm_mirror = mpnt;
104256+ }
104257+ }
104258+ BUG_ON(mpnt_m);
104259+ }
104260+#endif
104261+
104262 /* a new mm has just been created */
104263 arch_dup_mmap(oldmm, mm);
104264 retval = 0;
104265@@ -508,14 +612,6 @@ out:
104266 up_write(&oldmm->mmap_sem);
104267 uprobe_end_dup_mmap();
104268 return retval;
104269-fail_nomem_anon_vma_fork:
104270- mpol_put(vma_policy(tmp));
104271-fail_nomem_policy:
104272- kmem_cache_free(vm_area_cachep, tmp);
104273-fail_nomem:
104274- retval = -ENOMEM;
104275- vm_unacct_memory(charge);
104276- goto out;
104277 }
104278
104279 static inline int mm_alloc_pgd(struct mm_struct *mm)
104280@@ -790,8 +886,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
104281 return ERR_PTR(err);
104282
104283 mm = get_task_mm(task);
104284- if (mm && mm != current->mm &&
104285- !ptrace_may_access(task, mode)) {
104286+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
104287+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
104288 mmput(mm);
104289 mm = ERR_PTR(-EACCES);
104290 }
104291@@ -992,13 +1088,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
104292 spin_unlock(&fs->lock);
104293 return -EAGAIN;
104294 }
104295- fs->users++;
104296+ atomic_inc(&fs->users);
104297 spin_unlock(&fs->lock);
104298 return 0;
104299 }
104300 tsk->fs = copy_fs_struct(fs);
104301 if (!tsk->fs)
104302 return -ENOMEM;
104303+ /* Carry through gr_chroot_dentry and is_chrooted instead
104304+ of recomputing it here. Already copied when the task struct
104305+ is duplicated. This allows pivot_root to not be treated as
104306+ a chroot
104307+ */
104308+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
104309+
104310 return 0;
104311 }
104312
104313@@ -1236,7 +1339,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
104314 * parts of the process environment (as per the clone
104315 * flags). The actual kick-off is left to the caller.
104316 */
104317-static struct task_struct *copy_process(unsigned long clone_flags,
104318+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
104319 unsigned long stack_start,
104320 unsigned long stack_size,
104321 int __user *child_tidptr,
104322@@ -1307,6 +1410,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
104323 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
104324 #endif
104325 retval = -EAGAIN;
104326+
104327+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
104328+
104329 if (atomic_read(&p->real_cred->user->processes) >=
104330 task_rlimit(p, RLIMIT_NPROC)) {
104331 if (p->real_cred->user != INIT_USER &&
104332@@ -1554,6 +1660,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
104333 goto bad_fork_free_pid;
104334 }
104335
104336+ /* synchronizes with gr_set_acls()
104337+ we need to call this past the point of no return for fork()
104338+ */
104339+ gr_copy_label(p);
104340+
104341 if (likely(p->pid)) {
104342 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
104343
104344@@ -1643,6 +1754,8 @@ bad_fork_cleanup_count:
104345 bad_fork_free:
104346 free_task(p);
104347 fork_out:
104348+ gr_log_forkfail(retval);
104349+
104350 return ERR_PTR(retval);
104351 }
104352
104353@@ -1704,6 +1817,7 @@ long do_fork(unsigned long clone_flags,
104354
104355 p = copy_process(clone_flags, stack_start, stack_size,
104356 child_tidptr, NULL, trace);
104357+ add_latent_entropy();
104358 /*
104359 * Do this prior waking up the new thread - the thread pointer
104360 * might get invalid after that point, if the thread exits quickly.
104361@@ -1720,6 +1834,8 @@ long do_fork(unsigned long clone_flags,
104362 if (clone_flags & CLONE_PARENT_SETTID)
104363 put_user(nr, parent_tidptr);
104364
104365+ gr_handle_brute_check();
104366+
104367 if (clone_flags & CLONE_VFORK) {
104368 p->vfork_done = &vfork;
104369 init_completion(&vfork);
104370@@ -1838,7 +1954,7 @@ void __init proc_caches_init(void)
104371 mm_cachep = kmem_cache_create("mm_struct",
104372 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
104373 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
104374- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
104375+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
104376 mmap_init();
104377 nsproxy_cache_init();
104378 }
104379@@ -1878,7 +1994,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
104380 return 0;
104381
104382 /* don't need lock here; in the worst case we'll do useless copy */
104383- if (fs->users == 1)
104384+ if (atomic_read(&fs->users) == 1)
104385 return 0;
104386
104387 *new_fsp = copy_fs_struct(fs);
104388@@ -1990,7 +2106,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
104389 fs = current->fs;
104390 spin_lock(&fs->lock);
104391 current->fs = new_fs;
104392- if (--fs->users)
104393+ gr_set_chroot_entries(current, &current->fs->root);
104394+ if (atomic_dec_return(&fs->users))
104395 new_fs = NULL;
104396 else
104397 new_fs = fs;
104398@@ -2054,7 +2171,7 @@ int unshare_files(struct files_struct **displaced)
104399 int sysctl_max_threads(struct ctl_table *table, int write,
104400 void __user *buffer, size_t *lenp, loff_t *ppos)
104401 {
104402- struct ctl_table t;
104403+ ctl_table_no_const t;
104404 int ret;
104405 int threads = max_threads;
104406 int min = MIN_THREADS;
104407diff --git a/kernel/futex.c b/kernel/futex.c
104408index 2579e40..c33f33e 100644
104409--- a/kernel/futex.c
104410+++ b/kernel/futex.c
104411@@ -201,7 +201,7 @@ struct futex_pi_state {
104412 atomic_t refcount;
104413
104414 union futex_key key;
104415-};
104416+} __randomize_layout;
104417
104418 /**
104419 * struct futex_q - The hashed futex queue entry, one per waiting task
104420@@ -235,7 +235,7 @@ struct futex_q {
104421 struct rt_mutex_waiter *rt_waiter;
104422 union futex_key *requeue_pi_key;
104423 u32 bitset;
104424-};
104425+} __randomize_layout;
104426
104427 static const struct futex_q futex_q_init = {
104428 /* list gets initialized in queue_me()*/
104429@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
104430 struct page *page, *page_head;
104431 int err, ro = 0;
104432
104433+#ifdef CONFIG_PAX_SEGMEXEC
104434+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
104435+ return -EFAULT;
104436+#endif
104437+
104438 /*
104439 * The futex address must be "naturally" aligned.
104440 */
104441@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
104442
104443 static int get_futex_value_locked(u32 *dest, u32 __user *from)
104444 {
104445- int ret;
104446+ unsigned long ret;
104447
104448 pagefault_disable();
104449 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
104450@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
104451 {
104452 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
104453 u32 curval;
104454+ mm_segment_t oldfs;
104455
104456 /*
104457 * This will fail and we want it. Some arch implementations do
104458@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
104459 * implementation, the non-functional ones will return
104460 * -ENOSYS.
104461 */
104462+ oldfs = get_fs();
104463+ set_fs(USER_DS);
104464 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
104465 futex_cmpxchg_enabled = 1;
104466+ set_fs(oldfs);
104467 #endif
104468 }
104469
104470diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
104471index 55c8c93..9ba7ad6 100644
104472--- a/kernel/futex_compat.c
104473+++ b/kernel/futex_compat.c
104474@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
104475 return 0;
104476 }
104477
104478-static void __user *futex_uaddr(struct robust_list __user *entry,
104479+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
104480 compat_long_t futex_offset)
104481 {
104482 compat_uptr_t base = ptr_to_compat(entry);
104483diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
104484index a744098..539f7b6 100644
104485--- a/kernel/gcov/base.c
104486+++ b/kernel/gcov/base.c
104487@@ -117,11 +117,6 @@ void gcov_enable_events(void)
104488 }
104489
104490 #ifdef CONFIG_MODULES
104491-static inline int within(void *addr, void *start, unsigned long size)
104492-{
104493- return ((addr >= start) && (addr < start + size));
104494-}
104495-
104496 /* Update list and generate events when modules are unloaded. */
104497 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
104498 void *data)
104499@@ -136,7 +131,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
104500
104501 /* Remove entries located in module from linked list. */
104502 while ((info = gcov_info_next(info))) {
104503- if (within(info, mod->module_core, mod->core_size)) {
104504+ if (within_module_core_rw((unsigned long)info, mod)) {
104505 gcov_info_unlink(prev, info);
104506 if (gcov_events_enabled)
104507 gcov_event(GCOV_REMOVE, info);
104508diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
104509index e68932b..2247e06 100644
104510--- a/kernel/irq/manage.c
104511+++ b/kernel/irq/manage.c
104512@@ -906,7 +906,7 @@ static int irq_thread(void *data)
104513
104514 action_ret = handler_fn(desc, action);
104515 if (action_ret == IRQ_HANDLED)
104516- atomic_inc(&desc->threads_handled);
104517+ atomic_inc_unchecked(&desc->threads_handled);
104518
104519 wake_threads_waitq(desc);
104520 }
104521diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
104522index e2514b0..de3dfe0 100644
104523--- a/kernel/irq/spurious.c
104524+++ b/kernel/irq/spurious.c
104525@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
104526 * count. We just care about the count being
104527 * different than the one we saw before.
104528 */
104529- handled = atomic_read(&desc->threads_handled);
104530+ handled = atomic_read_unchecked(&desc->threads_handled);
104531 handled |= SPURIOUS_DEFERRED;
104532 if (handled != desc->threads_handled_last) {
104533 action_ret = IRQ_HANDLED;
104534diff --git a/kernel/jump_label.c b/kernel/jump_label.c
104535index 9019f15..9a3c42e 100644
104536--- a/kernel/jump_label.c
104537+++ b/kernel/jump_label.c
104538@@ -14,6 +14,7 @@
104539 #include <linux/err.h>
104540 #include <linux/static_key.h>
104541 #include <linux/jump_label_ratelimit.h>
104542+#include <linux/mm.h>
104543
104544 #ifdef HAVE_JUMP_LABEL
104545
104546@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
104547
104548 size = (((unsigned long)stop - (unsigned long)start)
104549 / sizeof(struct jump_entry));
104550+ pax_open_kernel();
104551 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
104552+ pax_close_kernel();
104553 }
104554
104555 static void jump_label_update(struct static_key *key, int enable);
104556@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
104557 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
104558 struct jump_entry *iter;
104559
104560+ pax_open_kernel();
104561 for (iter = iter_start; iter < iter_stop; iter++) {
104562 if (within_module_init(iter->code, mod))
104563 iter->code = 0;
104564 }
104565+ pax_close_kernel();
104566 }
104567
104568 static int
104569diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
104570index 5c5987f..bc502b0 100644
104571--- a/kernel/kallsyms.c
104572+++ b/kernel/kallsyms.c
104573@@ -11,6 +11,9 @@
104574 * Changed the compression method from stem compression to "table lookup"
104575 * compression (see scripts/kallsyms.c for a more complete description)
104576 */
104577+#ifdef CONFIG_GRKERNSEC_HIDESYM
104578+#define __INCLUDED_BY_HIDESYM 1
104579+#endif
104580 #include <linux/kallsyms.h>
104581 #include <linux/module.h>
104582 #include <linux/init.h>
104583@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
104584
104585 static inline int is_kernel_inittext(unsigned long addr)
104586 {
104587+ if (system_state != SYSTEM_BOOTING)
104588+ return 0;
104589+
104590 if (addr >= (unsigned long)_sinittext
104591 && addr <= (unsigned long)_einittext)
104592 return 1;
104593 return 0;
104594 }
104595
104596+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104597+#ifdef CONFIG_MODULES
104598+static inline int is_module_text(unsigned long addr)
104599+{
104600+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
104601+ return 1;
104602+
104603+ addr = ktla_ktva(addr);
104604+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
104605+}
104606+#else
104607+static inline int is_module_text(unsigned long addr)
104608+{
104609+ return 0;
104610+}
104611+#endif
104612+#endif
104613+
104614 static inline int is_kernel_text(unsigned long addr)
104615 {
104616 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
104617@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
104618
104619 static inline int is_kernel(unsigned long addr)
104620 {
104621+
104622+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104623+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
104624+ return 1;
104625+
104626+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
104627+#else
104628 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
104629+#endif
104630+
104631 return 1;
104632 return in_gate_area_no_mm(addr);
104633 }
104634
104635 static int is_ksym_addr(unsigned long addr)
104636 {
104637+
104638+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
104639+ if (is_module_text(addr))
104640+ return 0;
104641+#endif
104642+
104643 if (all_var)
104644 return is_kernel(addr);
104645
104646@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
104647
104648 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
104649 {
104650- iter->name[0] = '\0';
104651 iter->nameoff = get_symbol_offset(new_pos);
104652 iter->pos = new_pos;
104653 }
104654@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
104655 {
104656 struct kallsym_iter *iter = m->private;
104657
104658+#ifdef CONFIG_GRKERNSEC_HIDESYM
104659+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
104660+ return 0;
104661+#endif
104662+
104663 /* Some debugging symbols have no name. Ignore them. */
104664 if (!iter->name[0])
104665 return 0;
104666@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
104667 */
104668 type = iter->exported ? toupper(iter->type) :
104669 tolower(iter->type);
104670+
104671 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
104672 type, iter->name, iter->module_name);
104673 } else
104674diff --git a/kernel/kcmp.c b/kernel/kcmp.c
104675index 0aa69ea..a7fcafb 100644
104676--- a/kernel/kcmp.c
104677+++ b/kernel/kcmp.c
104678@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
104679 struct task_struct *task1, *task2;
104680 int ret;
104681
104682+#ifdef CONFIG_GRKERNSEC
104683+ return -ENOSYS;
104684+#endif
104685+
104686 rcu_read_lock();
104687
104688 /*
104689diff --git a/kernel/kexec.c b/kernel/kexec.c
104690index 7a36fdc..de8c4ed 100644
104691--- a/kernel/kexec.c
104692+++ b/kernel/kexec.c
104693@@ -1232,7 +1232,7 @@ static int kimage_load_segment(struct kimage *image,
104694 */
104695 struct kimage *kexec_image;
104696 struct kimage *kexec_crash_image;
104697-int kexec_load_disabled;
104698+int kexec_load_disabled __read_only;
104699
104700 static DEFINE_MUTEX(kexec_mutex);
104701
104702@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
104703 compat_ulong_t, flags)
104704 {
104705 struct compat_kexec_segment in;
104706- struct kexec_segment out, __user *ksegments;
104707+ struct kexec_segment out;
104708+ struct kexec_segment __user *ksegments;
104709 unsigned long i, result;
104710
104711 /* Don't allow clients that don't understand the native
104712diff --git a/kernel/kmod.c b/kernel/kmod.c
104713index 2777f40..a689506 100644
104714--- a/kernel/kmod.c
104715+++ b/kernel/kmod.c
104716@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
104717 kfree(info->argv);
104718 }
104719
104720-static int call_modprobe(char *module_name, int wait)
104721+static int call_modprobe(char *module_name, char *module_param, int wait)
104722 {
104723 struct subprocess_info *info;
104724 static char *envp[] = {
104725@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
104726 NULL
104727 };
104728
104729- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
104730+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
104731 if (!argv)
104732 goto out;
104733
104734@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
104735 argv[1] = "-q";
104736 argv[2] = "--";
104737 argv[3] = module_name; /* check free_modprobe_argv() */
104738- argv[4] = NULL;
104739+ argv[4] = module_param;
104740+ argv[5] = NULL;
104741
104742 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
104743 NULL, free_modprobe_argv, NULL);
104744@@ -122,9 +123,8 @@ out:
104745 * If module auto-loading support is disabled then this function
104746 * becomes a no-operation.
104747 */
104748-int __request_module(bool wait, const char *fmt, ...)
104749+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
104750 {
104751- va_list args;
104752 char module_name[MODULE_NAME_LEN];
104753 unsigned int max_modprobes;
104754 int ret;
104755@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
104756 if (!modprobe_path[0])
104757 return 0;
104758
104759- va_start(args, fmt);
104760- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
104761- va_end(args);
104762+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
104763 if (ret >= MODULE_NAME_LEN)
104764 return -ENAMETOOLONG;
104765
104766@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
104767 if (ret)
104768 return ret;
104769
104770+#ifdef CONFIG_GRKERNSEC_MODHARDEN
104771+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
104772+ /* hack to workaround consolekit/udisks stupidity */
104773+ read_lock(&tasklist_lock);
104774+ if (!strcmp(current->comm, "mount") &&
104775+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
104776+ read_unlock(&tasklist_lock);
104777+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
104778+ return -EPERM;
104779+ }
104780+ read_unlock(&tasklist_lock);
104781+ }
104782+#endif
104783+
104784 /* If modprobe needs a service that is in a module, we get a recursive
104785 * loop. Limit the number of running kmod threads to max_threads/2 or
104786 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
104787@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
104788
104789 trace_module_request(module_name, wait, _RET_IP_);
104790
104791- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
104792+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
104793
104794 atomic_dec(&kmod_concurrent);
104795 return ret;
104796 }
104797+
104798+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
104799+{
104800+ va_list args;
104801+ int ret;
104802+
104803+ va_start(args, fmt);
104804+ ret = ____request_module(wait, module_param, fmt, args);
104805+ va_end(args);
104806+
104807+ return ret;
104808+}
104809+
104810+int __request_module(bool wait, const char *fmt, ...)
104811+{
104812+ va_list args;
104813+ int ret;
104814+
104815+#ifdef CONFIG_GRKERNSEC_MODHARDEN
104816+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
104817+ char module_param[MODULE_NAME_LEN];
104818+
104819+ memset(module_param, 0, sizeof(module_param));
104820+
104821+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
104822+
104823+ va_start(args, fmt);
104824+ ret = ____request_module(wait, module_param, fmt, args);
104825+ va_end(args);
104826+
104827+ return ret;
104828+ }
104829+#endif
104830+
104831+ va_start(args, fmt);
104832+ ret = ____request_module(wait, NULL, fmt, args);
104833+ va_end(args);
104834+
104835+ return ret;
104836+}
104837+
104838 EXPORT_SYMBOL(__request_module);
104839 #endif /* CONFIG_MODULES */
104840
104841 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
104842 {
104843+#ifdef CONFIG_GRKERNSEC
104844+ kfree(info->path);
104845+ info->path = info->origpath;
104846+#endif
104847 if (info->cleanup)
104848 (*info->cleanup)(info);
104849 kfree(info);
104850@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
104851 */
104852 set_user_nice(current, 0);
104853
104854+#ifdef CONFIG_GRKERNSEC
104855+ /* this is race-free as far as userland is concerned as we copied
104856+ out the path to be used prior to this point and are now operating
104857+ on that copy
104858+ */
104859+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
104860+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
104861+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
104862+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
104863+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
104864+ retval = -EPERM;
104865+ goto out;
104866+ }
104867+#endif
104868+
104869 retval = -ENOMEM;
104870 new = prepare_kernel_cred(current);
104871 if (!new)
104872@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
104873 commit_creds(new);
104874
104875 retval = do_execve(getname_kernel(sub_info->path),
104876- (const char __user *const __user *)sub_info->argv,
104877- (const char __user *const __user *)sub_info->envp);
104878+ (const char __user *const __force_user *)sub_info->argv,
104879+ (const char __user *const __force_user *)sub_info->envp);
104880 out:
104881 sub_info->retval = retval;
104882 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
104883@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
104884 *
104885 * Thus the __user pointer cast is valid here.
104886 */
104887- sys_wait4(pid, (int __user *)&ret, 0, NULL);
104888+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
104889
104890 /*
104891 * If ret is 0, either ____call_usermodehelper failed and the
104892@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
104893 goto out;
104894
104895 INIT_WORK(&sub_info->work, __call_usermodehelper);
104896+#ifdef CONFIG_GRKERNSEC
104897+ sub_info->origpath = path;
104898+ sub_info->path = kstrdup(path, gfp_mask);
104899+#else
104900 sub_info->path = path;
104901+#endif
104902 sub_info->argv = argv;
104903 sub_info->envp = envp;
104904
104905@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
104906 static int proc_cap_handler(struct ctl_table *table, int write,
104907 void __user *buffer, size_t *lenp, loff_t *ppos)
104908 {
104909- struct ctl_table t;
104910+ ctl_table_no_const t;
104911 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
104912 kernel_cap_t new_cap;
104913 int err, i;
104914diff --git a/kernel/kprobes.c b/kernel/kprobes.c
104915index c90e417..e6c515d 100644
104916--- a/kernel/kprobes.c
104917+++ b/kernel/kprobes.c
104918@@ -31,6 +31,9 @@
104919 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
104920 * <prasanna@in.ibm.com> added function-return probes.
104921 */
104922+#ifdef CONFIG_GRKERNSEC_HIDESYM
104923+#define __INCLUDED_BY_HIDESYM 1
104924+#endif
104925 #include <linux/kprobes.h>
104926 #include <linux/hash.h>
104927 #include <linux/init.h>
104928@@ -122,12 +125,12 @@ enum kprobe_slot_state {
104929
104930 static void *alloc_insn_page(void)
104931 {
104932- return module_alloc(PAGE_SIZE);
104933+ return module_alloc_exec(PAGE_SIZE);
104934 }
104935
104936 static void free_insn_page(void *page)
104937 {
104938- module_memfree(page);
104939+ module_memfree_exec(page);
104940 }
104941
104942 struct kprobe_insn_cache kprobe_insn_slots = {
104943@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
104944 kprobe_type = "k";
104945
104946 if (sym)
104947- seq_printf(pi, "%p %s %s+0x%x %s ",
104948+ seq_printf(pi, "%pK %s %s+0x%x %s ",
104949 p->addr, kprobe_type, sym, offset,
104950 (modname ? modname : " "));
104951 else
104952- seq_printf(pi, "%p %s %p ",
104953+ seq_printf(pi, "%pK %s %pK ",
104954 p->addr, kprobe_type, p->addr);
104955
104956 if (!pp)
104957diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
104958index 6683cce..daf8999 100644
104959--- a/kernel/ksysfs.c
104960+++ b/kernel/ksysfs.c
104961@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
104962 {
104963 if (count+1 > UEVENT_HELPER_PATH_LEN)
104964 return -ENOENT;
104965+ if (!capable(CAP_SYS_ADMIN))
104966+ return -EPERM;
104967 memcpy(uevent_helper, buf, count);
104968 uevent_helper[count] = '\0';
104969 if (count && uevent_helper[count-1] == '\n')
104970@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
104971 return count;
104972 }
104973
104974-static struct bin_attribute notes_attr = {
104975+static bin_attribute_no_const notes_attr __read_only = {
104976 .attr = {
104977 .name = "notes",
104978 .mode = S_IRUGO,
104979diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
104980index aaeae88..10f3663 100644
104981--- a/kernel/locking/lockdep.c
104982+++ b/kernel/locking/lockdep.c
104983@@ -613,6 +613,10 @@ static int static_obj(void *obj)
104984 end = (unsigned long) &_end,
104985 addr = (unsigned long) obj;
104986
104987+#ifdef CONFIG_PAX_KERNEXEC
104988+ start = ktla_ktva(start);
104989+#endif
104990+
104991 /*
104992 * static variable?
104993 */
104994@@ -757,6 +761,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
104995 if (!static_obj(lock->key)) {
104996 debug_locks_off();
104997 printk("INFO: trying to register non-static key.\n");
104998+ printk("lock:%pS key:%pS.\n", lock, lock->key);
104999 printk("the code is fine but needs lockdep annotation.\n");
105000 printk("turning off the locking correctness validator.\n");
105001 dump_stack();
105002@@ -3102,7 +3107,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
105003 if (!class)
105004 return 0;
105005 }
105006- atomic_inc((atomic_t *)&class->ops);
105007+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
105008 if (very_verbose(class)) {
105009 printk("\nacquire class [%p] %s", class->key, class->name);
105010 if (class->name_version > 1)
105011diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
105012index d83d798..ea3120d 100644
105013--- a/kernel/locking/lockdep_proc.c
105014+++ b/kernel/locking/lockdep_proc.c
105015@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
105016 return 0;
105017 }
105018
105019- seq_printf(m, "%p", class->key);
105020+ seq_printf(m, "%pK", class->key);
105021 #ifdef CONFIG_DEBUG_LOCKDEP
105022 seq_printf(m, " OPS:%8ld", class->ops);
105023 #endif
105024@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
105025
105026 list_for_each_entry(entry, &class->locks_after, entry) {
105027 if (entry->distance == 1) {
105028- seq_printf(m, " -> [%p] ", entry->class->key);
105029+ seq_printf(m, " -> [%pK] ", entry->class->key);
105030 print_name(m, entry->class);
105031 seq_puts(m, "\n");
105032 }
105033@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
105034 if (!class->key)
105035 continue;
105036
105037- seq_printf(m, "[%p] ", class->key);
105038+ seq_printf(m, "[%pK] ", class->key);
105039 print_name(m, class);
105040 seq_puts(m, "\n");
105041 }
105042@@ -508,7 +508,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
105043 if (!i)
105044 seq_line(m, '-', 40-namelen, namelen);
105045
105046- snprintf(ip, sizeof(ip), "[<%p>]",
105047+ snprintf(ip, sizeof(ip), "[<%pK>]",
105048 (void *)class->contention_point[i]);
105049 seq_printf(m, "%40s %14lu %29s %pS\n",
105050 name, stats->contention_point[i],
105051@@ -523,7 +523,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
105052 if (!i)
105053 seq_line(m, '-', 40-namelen, namelen);
105054
105055- snprintf(ip, sizeof(ip), "[<%p>]",
105056+ snprintf(ip, sizeof(ip), "[<%pK>]",
105057 (void *)class->contending_point[i]);
105058 seq_printf(m, "%40s %14lu %29s %pS\n",
105059 name, stats->contending_point[i],
105060diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
105061index 3ef3736..9c951fa 100644
105062--- a/kernel/locking/mutex-debug.c
105063+++ b/kernel/locking/mutex-debug.c
105064@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
105065 }
105066
105067 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
105068- struct thread_info *ti)
105069+ struct task_struct *task)
105070 {
105071 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
105072
105073 /* Mark the current thread as blocked on the lock: */
105074- ti->task->blocked_on = waiter;
105075+ task->blocked_on = waiter;
105076 }
105077
105078 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
105079- struct thread_info *ti)
105080+ struct task_struct *task)
105081 {
105082 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
105083- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
105084- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
105085- ti->task->blocked_on = NULL;
105086+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
105087+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
105088+ task->blocked_on = NULL;
105089
105090 list_del_init(&waiter->list);
105091 waiter->task = NULL;
105092diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
105093index 0799fd3..d06ae3b 100644
105094--- a/kernel/locking/mutex-debug.h
105095+++ b/kernel/locking/mutex-debug.h
105096@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
105097 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
105098 extern void debug_mutex_add_waiter(struct mutex *lock,
105099 struct mutex_waiter *waiter,
105100- struct thread_info *ti);
105101+ struct task_struct *task);
105102 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
105103- struct thread_info *ti);
105104+ struct task_struct *task);
105105 extern void debug_mutex_unlock(struct mutex *lock);
105106 extern void debug_mutex_init(struct mutex *lock, const char *name,
105107 struct lock_class_key *key);
105108diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
105109index 4cccea6..4382db9 100644
105110--- a/kernel/locking/mutex.c
105111+++ b/kernel/locking/mutex.c
105112@@ -533,7 +533,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
105113 goto skip_wait;
105114
105115 debug_mutex_lock_common(lock, &waiter);
105116- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
105117+ debug_mutex_add_waiter(lock, &waiter, task);
105118
105119 /* add waiting tasks to the end of the waitqueue (FIFO): */
105120 list_add_tail(&waiter.list, &lock->wait_list);
105121@@ -580,7 +580,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
105122 }
105123 __set_task_state(task, TASK_RUNNING);
105124
105125- mutex_remove_waiter(lock, &waiter, current_thread_info());
105126+ mutex_remove_waiter(lock, &waiter, task);
105127 /* set it to 0 if there are no waiters left: */
105128 if (likely(list_empty(&lock->wait_list)))
105129 atomic_set(&lock->count, 0);
105130@@ -601,7 +601,7 @@ skip_wait:
105131 return 0;
105132
105133 err:
105134- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
105135+ mutex_remove_waiter(lock, &waiter, task);
105136 spin_unlock_mutex(&lock->wait_lock, flags);
105137 debug_mutex_free_waiter(&waiter);
105138 mutex_release(&lock->dep_map, 1, ip);
105139diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
105140index 1d96dd0..994ff19 100644
105141--- a/kernel/locking/rtmutex-tester.c
105142+++ b/kernel/locking/rtmutex-tester.c
105143@@ -22,7 +22,7 @@
105144 #define MAX_RT_TEST_MUTEXES 8
105145
105146 static spinlock_t rttest_lock;
105147-static atomic_t rttest_event;
105148+static atomic_unchecked_t rttest_event;
105149
105150 struct test_thread_data {
105151 int opcode;
105152@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105153
105154 case RTTEST_LOCKCONT:
105155 td->mutexes[td->opdata] = 1;
105156- td->event = atomic_add_return(1, &rttest_event);
105157+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105158 return 0;
105159
105160 case RTTEST_RESET:
105161@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105162 return 0;
105163
105164 case RTTEST_RESETEVENT:
105165- atomic_set(&rttest_event, 0);
105166+ atomic_set_unchecked(&rttest_event, 0);
105167 return 0;
105168
105169 default:
105170@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105171 return ret;
105172
105173 td->mutexes[id] = 1;
105174- td->event = atomic_add_return(1, &rttest_event);
105175+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105176 rt_mutex_lock(&mutexes[id]);
105177- td->event = atomic_add_return(1, &rttest_event);
105178+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105179 td->mutexes[id] = 4;
105180 return 0;
105181
105182@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105183 return ret;
105184
105185 td->mutexes[id] = 1;
105186- td->event = atomic_add_return(1, &rttest_event);
105187+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105188 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
105189- td->event = atomic_add_return(1, &rttest_event);
105190+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105191 td->mutexes[id] = ret ? 0 : 4;
105192 return ret ? -EINTR : 0;
105193
105194@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
105195 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
105196 return ret;
105197
105198- td->event = atomic_add_return(1, &rttest_event);
105199+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105200 rt_mutex_unlock(&mutexes[id]);
105201- td->event = atomic_add_return(1, &rttest_event);
105202+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105203 td->mutexes[id] = 0;
105204 return 0;
105205
105206@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105207 break;
105208
105209 td->mutexes[dat] = 2;
105210- td->event = atomic_add_return(1, &rttest_event);
105211+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105212 break;
105213
105214 default:
105215@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105216 return;
105217
105218 td->mutexes[dat] = 3;
105219- td->event = atomic_add_return(1, &rttest_event);
105220+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105221 break;
105222
105223 case RTTEST_LOCKNOWAIT:
105224@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
105225 return;
105226
105227 td->mutexes[dat] = 1;
105228- td->event = atomic_add_return(1, &rttest_event);
105229+ td->event = atomic_add_return_unchecked(1, &rttest_event);
105230 return;
105231
105232 default:
105233diff --git a/kernel/module.c b/kernel/module.c
105234index cfc9e84..a058697 100644
105235--- a/kernel/module.c
105236+++ b/kernel/module.c
105237@@ -59,6 +59,7 @@
105238 #include <linux/jump_label.h>
105239 #include <linux/pfn.h>
105240 #include <linux/bsearch.h>
105241+#include <linux/grsecurity.h>
105242 #include <uapi/linux/module.h>
105243 #include "module-internal.h"
105244
105245@@ -145,7 +146,7 @@ module_param(sig_enforce, bool_enable_only, 0644);
105246 #endif /* CONFIG_MODULE_SIG */
105247
105248 /* Block module loading/unloading? */
105249-int modules_disabled = 0;
105250+int modules_disabled __read_only = 0;
105251 core_param(nomodule, modules_disabled, bint, 0);
105252
105253 /* Waiting for a module to finish initializing? */
105254@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
105255
105256 /* Bounds of module allocation, for speeding __module_address.
105257 * Protected by module_mutex. */
105258-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
105259+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
105260+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
105261
105262 int register_module_notifier(struct notifier_block *nb)
105263 {
105264@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
105265 return true;
105266
105267 list_for_each_entry_rcu(mod, &modules, list) {
105268- struct symsearch arr[] = {
105269+ struct symsearch modarr[] = {
105270 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
105271 NOT_GPL_ONLY, false },
105272 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
105273@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
105274 if (mod->state == MODULE_STATE_UNFORMED)
105275 continue;
105276
105277- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
105278+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
105279 return true;
105280 }
105281 return false;
105282@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
105283 if (!pcpusec->sh_size)
105284 return 0;
105285
105286- if (align > PAGE_SIZE) {
105287+ if (align-1 >= PAGE_SIZE) {
105288 pr_warn("%s: per-cpu alignment %li > %li\n",
105289 mod->name, align, PAGE_SIZE);
105290 align = PAGE_SIZE;
105291@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
105292 static ssize_t show_coresize(struct module_attribute *mattr,
105293 struct module_kobject *mk, char *buffer)
105294 {
105295- return sprintf(buffer, "%u\n", mk->mod->core_size);
105296+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
105297 }
105298
105299 static struct module_attribute modinfo_coresize =
105300@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
105301 static ssize_t show_initsize(struct module_attribute *mattr,
105302 struct module_kobject *mk, char *buffer)
105303 {
105304- return sprintf(buffer, "%u\n", mk->mod->init_size);
105305+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
105306 }
105307
105308 static struct module_attribute modinfo_initsize =
105309@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
105310 goto bad_version;
105311 }
105312
105313+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105314+ /*
105315+ * avoid potentially printing jibberish on attempted load
105316+ * of a module randomized with a different seed
105317+ */
105318+ pr_warn("no symbol version for %s\n", symname);
105319+#else
105320 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
105321+#endif
105322 return 0;
105323
105324 bad_version:
105325+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105326+ /*
105327+ * avoid potentially printing jibberish on attempted load
105328+ * of a module randomized with a different seed
105329+ */
105330+ pr_warn("attempted module disagrees about version of symbol %s\n",
105331+ symname);
105332+#else
105333 pr_warn("%s: disagrees about version of symbol %s\n",
105334 mod->name, symname);
105335+#endif
105336 return 0;
105337 }
105338
105339@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
105340 */
105341 #ifdef CONFIG_SYSFS
105342
105343-#ifdef CONFIG_KALLSYMS
105344+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
105345 static inline bool sect_empty(const Elf_Shdr *sect)
105346 {
105347 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
105348@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
105349 {
105350 unsigned int notes, loaded, i;
105351 struct module_notes_attrs *notes_attrs;
105352- struct bin_attribute *nattr;
105353+ bin_attribute_no_const *nattr;
105354
105355 /* failed to create section attributes, so can't create notes */
105356 if (!mod->sect_attrs)
105357@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
105358 static int module_add_modinfo_attrs(struct module *mod)
105359 {
105360 struct module_attribute *attr;
105361- struct module_attribute *temp_attr;
105362+ module_attribute_no_const *temp_attr;
105363 int error = 0;
105364 int i;
105365
105366@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
105367
105368 static void unset_module_core_ro_nx(struct module *mod)
105369 {
105370- set_page_attributes(mod->module_core + mod->core_text_size,
105371- mod->module_core + mod->core_size,
105372+ set_page_attributes(mod->module_core_rw,
105373+ mod->module_core_rw + mod->core_size_rw,
105374 set_memory_x);
105375- set_page_attributes(mod->module_core,
105376- mod->module_core + mod->core_ro_size,
105377+ set_page_attributes(mod->module_core_rx,
105378+ mod->module_core_rx + mod->core_size_rx,
105379 set_memory_rw);
105380 }
105381
105382 static void unset_module_init_ro_nx(struct module *mod)
105383 {
105384- set_page_attributes(mod->module_init + mod->init_text_size,
105385- mod->module_init + mod->init_size,
105386+ set_page_attributes(mod->module_init_rw,
105387+ mod->module_init_rw + mod->init_size_rw,
105388 set_memory_x);
105389- set_page_attributes(mod->module_init,
105390- mod->module_init + mod->init_ro_size,
105391+ set_page_attributes(mod->module_init_rx,
105392+ mod->module_init_rx + mod->init_size_rx,
105393 set_memory_rw);
105394 }
105395
105396@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
105397 list_for_each_entry_rcu(mod, &modules, list) {
105398 if (mod->state == MODULE_STATE_UNFORMED)
105399 continue;
105400- if ((mod->module_core) && (mod->core_text_size)) {
105401- set_page_attributes(mod->module_core,
105402- mod->module_core + mod->core_text_size,
105403+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
105404+ set_page_attributes(mod->module_core_rx,
105405+ mod->module_core_rx + mod->core_size_rx,
105406 set_memory_rw);
105407 }
105408- if ((mod->module_init) && (mod->init_text_size)) {
105409- set_page_attributes(mod->module_init,
105410- mod->module_init + mod->init_text_size,
105411+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
105412+ set_page_attributes(mod->module_init_rx,
105413+ mod->module_init_rx + mod->init_size_rx,
105414 set_memory_rw);
105415 }
105416 }
105417@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
105418 list_for_each_entry_rcu(mod, &modules, list) {
105419 if (mod->state == MODULE_STATE_UNFORMED)
105420 continue;
105421- if ((mod->module_core) && (mod->core_text_size)) {
105422- set_page_attributes(mod->module_core,
105423- mod->module_core + mod->core_text_size,
105424+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
105425+ set_page_attributes(mod->module_core_rx,
105426+ mod->module_core_rx + mod->core_size_rx,
105427 set_memory_ro);
105428 }
105429- if ((mod->module_init) && (mod->init_text_size)) {
105430- set_page_attributes(mod->module_init,
105431- mod->module_init + mod->init_text_size,
105432+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
105433+ set_page_attributes(mod->module_init_rx,
105434+ mod->module_init_rx + mod->init_size_rx,
105435 set_memory_ro);
105436 }
105437 }
105438@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
105439 #else
105440 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
105441 static void unset_module_core_ro_nx(struct module *mod) { }
105442-static void unset_module_init_ro_nx(struct module *mod) { }
105443+static void unset_module_init_ro_nx(struct module *mod)
105444+{
105445+
105446+#ifdef CONFIG_PAX_KERNEXEC
105447+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
105448+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
105449+#endif
105450+
105451+}
105452 #endif
105453
105454 void __weak module_memfree(void *module_region)
105455@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
105456 /* This may be NULL, but that's OK */
105457 unset_module_init_ro_nx(mod);
105458 module_arch_freeing_init(mod);
105459- module_memfree(mod->module_init);
105460+ module_memfree(mod->module_init_rw);
105461+ module_memfree_exec(mod->module_init_rx);
105462 kfree(mod->args);
105463 percpu_modfree(mod);
105464
105465 /* Free lock-classes; relies on the preceding sync_rcu(). */
105466- lockdep_free_key_range(mod->module_core, mod->core_size);
105467+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
105468+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
105469
105470 /* Finally, free the core (containing the module structure) */
105471 unset_module_core_ro_nx(mod);
105472- module_memfree(mod->module_core);
105473+ module_memfree_exec(mod->module_core_rx);
105474+ module_memfree(mod->module_core_rw);
105475
105476 #ifdef CONFIG_MPU
105477 update_protections(current->mm);
105478@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105479 int ret = 0;
105480 const struct kernel_symbol *ksym;
105481
105482+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105483+ int is_fs_load = 0;
105484+ int register_filesystem_found = 0;
105485+ char *p;
105486+
105487+ p = strstr(mod->args, "grsec_modharden_fs");
105488+ if (p) {
105489+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
105490+ /* copy \0 as well */
105491+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
105492+ is_fs_load = 1;
105493+ }
105494+#endif
105495+
105496 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
105497 const char *name = info->strtab + sym[i].st_name;
105498
105499+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105500+ /* it's a real shame this will never get ripped and copied
105501+ upstream! ;(
105502+ */
105503+ if (is_fs_load && !strcmp(name, "register_filesystem"))
105504+ register_filesystem_found = 1;
105505+#endif
105506+
105507 switch (sym[i].st_shndx) {
105508 case SHN_COMMON:
105509 /* Ignore common symbols */
105510@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105511 ksym = resolve_symbol_wait(mod, info, name);
105512 /* Ok if resolved. */
105513 if (ksym && !IS_ERR(ksym)) {
105514+ pax_open_kernel();
105515 sym[i].st_value = ksym->value;
105516+ pax_close_kernel();
105517 break;
105518 }
105519
105520@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
105521 secbase = (unsigned long)mod_percpu(mod);
105522 else
105523 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
105524+ pax_open_kernel();
105525 sym[i].st_value += secbase;
105526+ pax_close_kernel();
105527 break;
105528 }
105529 }
105530
105531+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105532+ if (is_fs_load && !register_filesystem_found) {
105533+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
105534+ ret = -EPERM;
105535+ }
105536+#endif
105537+
105538 return ret;
105539 }
105540
105541@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
105542 || s->sh_entsize != ~0UL
105543 || strstarts(sname, ".init"))
105544 continue;
105545- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
105546+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
105547+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
105548+ else
105549+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
105550 pr_debug("\t%s\n", sname);
105551 }
105552- switch (m) {
105553- case 0: /* executable */
105554- mod->core_size = debug_align(mod->core_size);
105555- mod->core_text_size = mod->core_size;
105556- break;
105557- case 1: /* RO: text and ro-data */
105558- mod->core_size = debug_align(mod->core_size);
105559- mod->core_ro_size = mod->core_size;
105560- break;
105561- case 3: /* whole core */
105562- mod->core_size = debug_align(mod->core_size);
105563- break;
105564- }
105565 }
105566
105567 pr_debug("Init section allocation order:\n");
105568@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
105569 || s->sh_entsize != ~0UL
105570 || !strstarts(sname, ".init"))
105571 continue;
105572- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
105573- | INIT_OFFSET_MASK);
105574+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
105575+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
105576+ else
105577+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
105578+ s->sh_entsize |= INIT_OFFSET_MASK;
105579 pr_debug("\t%s\n", sname);
105580 }
105581- switch (m) {
105582- case 0: /* executable */
105583- mod->init_size = debug_align(mod->init_size);
105584- mod->init_text_size = mod->init_size;
105585- break;
105586- case 1: /* RO: text and ro-data */
105587- mod->init_size = debug_align(mod->init_size);
105588- mod->init_ro_size = mod->init_size;
105589- break;
105590- case 3: /* whole init */
105591- mod->init_size = debug_align(mod->init_size);
105592- break;
105593- }
105594 }
105595 }
105596
105597@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
105598
105599 /* Put symbol section at end of init part of module. */
105600 symsect->sh_flags |= SHF_ALLOC;
105601- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
105602+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
105603 info->index.sym) | INIT_OFFSET_MASK;
105604 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
105605
105606@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
105607 }
105608
105609 /* Append room for core symbols at end of core part. */
105610- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
105611- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
105612- mod->core_size += strtab_size;
105613- mod->core_size = debug_align(mod->core_size);
105614+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
105615+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
105616+ mod->core_size_rx += strtab_size;
105617+ mod->core_size_rx = debug_align(mod->core_size_rx);
105618
105619 /* Put string table section at end of init part of module. */
105620 strsect->sh_flags |= SHF_ALLOC;
105621- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
105622+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
105623 info->index.str) | INIT_OFFSET_MASK;
105624- mod->init_size = debug_align(mod->init_size);
105625+ mod->init_size_rx = debug_align(mod->init_size_rx);
105626 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
105627 }
105628
105629@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
105630 /* Make sure we get permanent strtab: don't use info->strtab. */
105631 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
105632
105633+ pax_open_kernel();
105634+
105635 /* Set types up while we still have access to sections. */
105636 for (i = 0; i < mod->num_symtab; i++)
105637 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
105638
105639- mod->core_symtab = dst = mod->module_core + info->symoffs;
105640- mod->core_strtab = s = mod->module_core + info->stroffs;
105641+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
105642+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
105643 src = mod->symtab;
105644 for (ndst = i = 0; i < mod->num_symtab; i++) {
105645 if (i == 0 ||
105646@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
105647 }
105648 }
105649 mod->core_num_syms = ndst;
105650+
105651+ pax_close_kernel();
105652 }
105653 #else
105654 static inline void layout_symtab(struct module *mod, struct load_info *info)
105655@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
105656 return vmalloc_exec(size);
105657 }
105658
105659-static void *module_alloc_update_bounds(unsigned long size)
105660+static void *module_alloc_update_bounds_rw(unsigned long size)
105661 {
105662 void *ret = module_alloc(size);
105663
105664 if (ret) {
105665 mutex_lock(&module_mutex);
105666 /* Update module bounds. */
105667- if ((unsigned long)ret < module_addr_min)
105668- module_addr_min = (unsigned long)ret;
105669- if ((unsigned long)ret + size > module_addr_max)
105670- module_addr_max = (unsigned long)ret + size;
105671+ if ((unsigned long)ret < module_addr_min_rw)
105672+ module_addr_min_rw = (unsigned long)ret;
105673+ if ((unsigned long)ret + size > module_addr_max_rw)
105674+ module_addr_max_rw = (unsigned long)ret + size;
105675+ mutex_unlock(&module_mutex);
105676+ }
105677+ return ret;
105678+}
105679+
105680+static void *module_alloc_update_bounds_rx(unsigned long size)
105681+{
105682+ void *ret = module_alloc_exec(size);
105683+
105684+ if (ret) {
105685+ mutex_lock(&module_mutex);
105686+ /* Update module bounds. */
105687+ if ((unsigned long)ret < module_addr_min_rx)
105688+ module_addr_min_rx = (unsigned long)ret;
105689+ if ((unsigned long)ret + size > module_addr_max_rx)
105690+ module_addr_max_rx = (unsigned long)ret + size;
105691 mutex_unlock(&module_mutex);
105692 }
105693 return ret;
105694@@ -2666,7 +2729,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
105695 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
105696
105697 if (info->index.sym == 0) {
105698+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
105699+ /*
105700+ * avoid potentially printing jibberish on attempted load
105701+ * of a module randomized with a different seed
105702+ */
105703+ pr_warn("module has no symbols (stripped?)\n");
105704+#else
105705 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
105706+#endif
105707 return ERR_PTR(-ENOEXEC);
105708 }
105709
105710@@ -2682,8 +2753,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
105711 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
105712 {
105713 const char *modmagic = get_modinfo(info, "vermagic");
105714+ const char *license = get_modinfo(info, "license");
105715 int err;
105716
105717+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
105718+ if (!license || !license_is_gpl_compatible(license))
105719+ return -ENOEXEC;
105720+#endif
105721+
105722 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
105723 modmagic = NULL;
105724
105725@@ -2708,7 +2785,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
105726 }
105727
105728 /* Set up license info based on the info section */
105729- set_license(mod, get_modinfo(info, "license"));
105730+ set_license(mod, license);
105731
105732 return 0;
105733 }
105734@@ -2805,7 +2882,7 @@ static int move_module(struct module *mod, struct load_info *info)
105735 void *ptr;
105736
105737 /* Do the allocs. */
105738- ptr = module_alloc_update_bounds(mod->core_size);
105739+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
105740 /*
105741 * The pointer to this block is stored in the module structure
105742 * which is inside the block. Just mark it as not being a
105743@@ -2815,11 +2892,11 @@ static int move_module(struct module *mod, struct load_info *info)
105744 if (!ptr)
105745 return -ENOMEM;
105746
105747- memset(ptr, 0, mod->core_size);
105748- mod->module_core = ptr;
105749+ memset(ptr, 0, mod->core_size_rw);
105750+ mod->module_core_rw = ptr;
105751
105752- if (mod->init_size) {
105753- ptr = module_alloc_update_bounds(mod->init_size);
105754+ if (mod->init_size_rw) {
105755+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
105756 /*
105757 * The pointer to this block is stored in the module structure
105758 * which is inside the block. This block doesn't need to be
105759@@ -2828,13 +2905,45 @@ static int move_module(struct module *mod, struct load_info *info)
105760 */
105761 kmemleak_ignore(ptr);
105762 if (!ptr) {
105763- module_memfree(mod->module_core);
105764+ module_memfree(mod->module_core_rw);
105765 return -ENOMEM;
105766 }
105767- memset(ptr, 0, mod->init_size);
105768- mod->module_init = ptr;
105769+ memset(ptr, 0, mod->init_size_rw);
105770+ mod->module_init_rw = ptr;
105771 } else
105772- mod->module_init = NULL;
105773+ mod->module_init_rw = NULL;
105774+
105775+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
105776+ kmemleak_not_leak(ptr);
105777+ if (!ptr) {
105778+ if (mod->module_init_rw)
105779+ module_memfree(mod->module_init_rw);
105780+ module_memfree(mod->module_core_rw);
105781+ return -ENOMEM;
105782+ }
105783+
105784+ pax_open_kernel();
105785+ memset(ptr, 0, mod->core_size_rx);
105786+ pax_close_kernel();
105787+ mod->module_core_rx = ptr;
105788+
105789+ if (mod->init_size_rx) {
105790+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
105791+ kmemleak_ignore(ptr);
105792+ if (!ptr && mod->init_size_rx) {
105793+ module_memfree_exec(mod->module_core_rx);
105794+ if (mod->module_init_rw)
105795+ module_memfree(mod->module_init_rw);
105796+ module_memfree(mod->module_core_rw);
105797+ return -ENOMEM;
105798+ }
105799+
105800+ pax_open_kernel();
105801+ memset(ptr, 0, mod->init_size_rx);
105802+ pax_close_kernel();
105803+ mod->module_init_rx = ptr;
105804+ } else
105805+ mod->module_init_rx = NULL;
105806
105807 /* Transfer each section which specifies SHF_ALLOC */
105808 pr_debug("final section addresses:\n");
105809@@ -2845,16 +2954,45 @@ static int move_module(struct module *mod, struct load_info *info)
105810 if (!(shdr->sh_flags & SHF_ALLOC))
105811 continue;
105812
105813- if (shdr->sh_entsize & INIT_OFFSET_MASK)
105814- dest = mod->module_init
105815- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105816- else
105817- dest = mod->module_core + shdr->sh_entsize;
105818+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
105819+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
105820+ dest = mod->module_init_rw
105821+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105822+ else
105823+ dest = mod->module_init_rx
105824+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
105825+ } else {
105826+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
105827+ dest = mod->module_core_rw + shdr->sh_entsize;
105828+ else
105829+ dest = mod->module_core_rx + shdr->sh_entsize;
105830+ }
105831+
105832+ if (shdr->sh_type != SHT_NOBITS) {
105833+
105834+#ifdef CONFIG_PAX_KERNEXEC
105835+#ifdef CONFIG_X86_64
105836+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
105837+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
105838+#endif
105839+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
105840+ pax_open_kernel();
105841+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
105842+ pax_close_kernel();
105843+ } else
105844+#endif
105845
105846- if (shdr->sh_type != SHT_NOBITS)
105847 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
105848+ }
105849 /* Update sh_addr to point to copy in image. */
105850- shdr->sh_addr = (unsigned long)dest;
105851+
105852+#ifdef CONFIG_PAX_KERNEXEC
105853+ if (shdr->sh_flags & SHF_EXECINSTR)
105854+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
105855+ else
105856+#endif
105857+
105858+ shdr->sh_addr = (unsigned long)dest;
105859 pr_debug("\t0x%lx %s\n",
105860 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
105861 }
105862@@ -2911,12 +3049,12 @@ static void flush_module_icache(const struct module *mod)
105863 * Do it before processing of module parameters, so the module
105864 * can provide parameter accessor functions of its own.
105865 */
105866- if (mod->module_init)
105867- flush_icache_range((unsigned long)mod->module_init,
105868- (unsigned long)mod->module_init
105869- + mod->init_size);
105870- flush_icache_range((unsigned long)mod->module_core,
105871- (unsigned long)mod->module_core + mod->core_size);
105872+ if (mod->module_init_rx)
105873+ flush_icache_range((unsigned long)mod->module_init_rx,
105874+ (unsigned long)mod->module_init_rx
105875+ + mod->init_size_rx);
105876+ flush_icache_range((unsigned long)mod->module_core_rx,
105877+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
105878
105879 set_fs(old_fs);
105880 }
105881@@ -2974,8 +3112,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
105882 {
105883 percpu_modfree(mod);
105884 module_arch_freeing_init(mod);
105885- module_memfree(mod->module_init);
105886- module_memfree(mod->module_core);
105887+ module_memfree_exec(mod->module_init_rx);
105888+ module_memfree_exec(mod->module_core_rx);
105889+ module_memfree(mod->module_init_rw);
105890+ module_memfree(mod->module_core_rw);
105891 }
105892
105893 int __weak module_finalize(const Elf_Ehdr *hdr,
105894@@ -2988,7 +3128,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
105895 static int post_relocation(struct module *mod, const struct load_info *info)
105896 {
105897 /* Sort exception table now relocations are done. */
105898+ pax_open_kernel();
105899 sort_extable(mod->extable, mod->extable + mod->num_exentries);
105900+ pax_close_kernel();
105901
105902 /* Copy relocated percpu area over. */
105903 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
105904@@ -3036,13 +3178,15 @@ static void do_mod_ctors(struct module *mod)
105905 /* For freeing module_init on success, in case kallsyms traversing */
105906 struct mod_initfree {
105907 struct rcu_head rcu;
105908- void *module_init;
105909+ void *module_init_rw;
105910+ void *module_init_rx;
105911 };
105912
105913 static void do_free_init(struct rcu_head *head)
105914 {
105915 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
105916- module_memfree(m->module_init);
105917+ module_memfree(m->module_init_rw);
105918+ module_memfree_exec(m->module_init_rx);
105919 kfree(m);
105920 }
105921
105922@@ -3062,7 +3206,8 @@ static noinline int do_init_module(struct module *mod)
105923 ret = -ENOMEM;
105924 goto fail;
105925 }
105926- freeinit->module_init = mod->module_init;
105927+ freeinit->module_init_rw = mod->module_init_rw;
105928+ freeinit->module_init_rx = mod->module_init_rx;
105929
105930 /*
105931 * We want to find out whether @mod uses async during init. Clear
105932@@ -3121,10 +3266,10 @@ static noinline int do_init_module(struct module *mod)
105933 #endif
105934 unset_module_init_ro_nx(mod);
105935 module_arch_freeing_init(mod);
105936- mod->module_init = NULL;
105937- mod->init_size = 0;
105938- mod->init_ro_size = 0;
105939- mod->init_text_size = 0;
105940+ mod->module_init_rw = NULL;
105941+ mod->module_init_rx = NULL;
105942+ mod->init_size_rw = 0;
105943+ mod->init_size_rx = 0;
105944 /*
105945 * We want to free module_init, but be aware that kallsyms may be
105946 * walking this with preempt disabled. In all the failure paths,
105947@@ -3212,16 +3357,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
105948 module_bug_finalize(info->hdr, info->sechdrs, mod);
105949
105950 /* Set RO and NX regions for core */
105951- set_section_ro_nx(mod->module_core,
105952- mod->core_text_size,
105953- mod->core_ro_size,
105954- mod->core_size);
105955+ set_section_ro_nx(mod->module_core_rx,
105956+ mod->core_size_rx,
105957+ mod->core_size_rx,
105958+ mod->core_size_rx);
105959
105960 /* Set RO and NX regions for init */
105961- set_section_ro_nx(mod->module_init,
105962- mod->init_text_size,
105963- mod->init_ro_size,
105964- mod->init_size);
105965+ set_section_ro_nx(mod->module_init_rx,
105966+ mod->init_size_rx,
105967+ mod->init_size_rx,
105968+ mod->init_size_rx);
105969
105970 /* Mark state as coming so strong_try_module_get() ignores us,
105971 * but kallsyms etc. can see us. */
105972@@ -3305,9 +3450,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
105973 if (err)
105974 goto free_unload;
105975
105976+ /* Now copy in args */
105977+ mod->args = strndup_user(uargs, ~0UL >> 1);
105978+ if (IS_ERR(mod->args)) {
105979+ err = PTR_ERR(mod->args);
105980+ goto free_unload;
105981+ }
105982+
105983 /* Set up MODINFO_ATTR fields */
105984 setup_modinfo(mod, info);
105985
105986+#ifdef CONFIG_GRKERNSEC_MODHARDEN
105987+ {
105988+ char *p, *p2;
105989+
105990+ if (strstr(mod->args, "grsec_modharden_netdev")) {
105991+ 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);
105992+ err = -EPERM;
105993+ goto free_modinfo;
105994+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
105995+ p += sizeof("grsec_modharden_normal") - 1;
105996+ p2 = strstr(p, "_");
105997+ if (p2) {
105998+ *p2 = '\0';
105999+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
106000+ *p2 = '_';
106001+ }
106002+ err = -EPERM;
106003+ goto free_modinfo;
106004+ }
106005+ }
106006+#endif
106007+
106008 /* Fix up syms, so that st_value is a pointer to location. */
106009 err = simplify_symbols(mod, info);
106010 if (err < 0)
106011@@ -3323,13 +3497,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
106012
106013 flush_module_icache(mod);
106014
106015- /* Now copy in args */
106016- mod->args = strndup_user(uargs, ~0UL >> 1);
106017- if (IS_ERR(mod->args)) {
106018- err = PTR_ERR(mod->args);
106019- goto free_arch_cleanup;
106020- }
106021-
106022 dynamic_debug_setup(info->debug, info->num_debug);
106023
106024 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
106025@@ -3380,11 +3547,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
106026 ddebug_cleanup:
106027 dynamic_debug_remove(info->debug);
106028 synchronize_sched();
106029- kfree(mod->args);
106030- free_arch_cleanup:
106031 module_arch_cleanup(mod);
106032 free_modinfo:
106033 free_modinfo(mod);
106034+ kfree(mod->args);
106035 free_unload:
106036 module_unload_free(mod);
106037 unlink_mod:
106038@@ -3397,7 +3563,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
106039 mutex_unlock(&module_mutex);
106040 free_module:
106041 /* Free lock-classes; relies on the preceding sync_rcu() */
106042- lockdep_free_key_range(mod->module_core, mod->core_size);
106043+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
106044+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
106045
106046 module_deallocate(mod, info);
106047 free_copy:
106048@@ -3474,10 +3641,16 @@ static const char *get_ksymbol(struct module *mod,
106049 unsigned long nextval;
106050
106051 /* At worse, next value is at end of module */
106052- if (within_module_init(addr, mod))
106053- nextval = (unsigned long)mod->module_init+mod->init_text_size;
106054+ if (within_module_init_rx(addr, mod))
106055+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
106056+ else if (within_module_init_rw(addr, mod))
106057+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
106058+ else if (within_module_core_rx(addr, mod))
106059+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
106060+ else if (within_module_core_rw(addr, mod))
106061+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
106062 else
106063- nextval = (unsigned long)mod->module_core+mod->core_text_size;
106064+ return NULL;
106065
106066 /* Scan for closest preceding symbol, and next symbol. (ELF
106067 starts real symbols at 1). */
106068@@ -3725,7 +3898,7 @@ static int m_show(struct seq_file *m, void *p)
106069 return 0;
106070
106071 seq_printf(m, "%s %u",
106072- mod->name, mod->init_size + mod->core_size);
106073+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
106074 print_unload_info(m, mod);
106075
106076 /* Informative for users. */
106077@@ -3734,7 +3907,7 @@ static int m_show(struct seq_file *m, void *p)
106078 mod->state == MODULE_STATE_COMING ? "Loading" :
106079 "Live");
106080 /* Used by oprofile and other similar tools. */
106081- seq_printf(m, " 0x%pK", mod->module_core);
106082+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
106083
106084 /* Taints info */
106085 if (mod->taints)
106086@@ -3770,7 +3943,17 @@ static const struct file_operations proc_modules_operations = {
106087
106088 static int __init proc_modules_init(void)
106089 {
106090+#ifndef CONFIG_GRKERNSEC_HIDESYM
106091+#ifdef CONFIG_GRKERNSEC_PROC_USER
106092+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
106093+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
106094+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
106095+#else
106096 proc_create("modules", 0, NULL, &proc_modules_operations);
106097+#endif
106098+#else
106099+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
106100+#endif
106101 return 0;
106102 }
106103 module_init(proc_modules_init);
106104@@ -3831,7 +4014,8 @@ struct module *__module_address(unsigned long addr)
106105 {
106106 struct module *mod;
106107
106108- if (addr < module_addr_min || addr > module_addr_max)
106109+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
106110+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
106111 return NULL;
106112
106113 list_for_each_entry_rcu(mod, &modules, list) {
106114@@ -3872,11 +4056,20 @@ bool is_module_text_address(unsigned long addr)
106115 */
106116 struct module *__module_text_address(unsigned long addr)
106117 {
106118- struct module *mod = __module_address(addr);
106119+ struct module *mod;
106120+
106121+#ifdef CONFIG_X86_32
106122+ addr = ktla_ktva(addr);
106123+#endif
106124+
106125+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
106126+ return NULL;
106127+
106128+ mod = __module_address(addr);
106129+
106130 if (mod) {
106131 /* Make sure it's within the text section. */
106132- if (!within(addr, mod->module_init, mod->init_text_size)
106133- && !within(addr, mod->module_core, mod->core_text_size))
106134+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
106135 mod = NULL;
106136 }
106137 return mod;
106138diff --git a/kernel/notifier.c b/kernel/notifier.c
106139index ae9fc7c..5085fbf 100644
106140--- a/kernel/notifier.c
106141+++ b/kernel/notifier.c
106142@@ -5,6 +5,7 @@
106143 #include <linux/rcupdate.h>
106144 #include <linux/vmalloc.h>
106145 #include <linux/reboot.h>
106146+#include <linux/mm.h>
106147
106148 /*
106149 * Notifier list for kernel code which wants to be called
106150@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
106151 while ((*nl) != NULL) {
106152 if (n->priority > (*nl)->priority)
106153 break;
106154- nl = &((*nl)->next);
106155+ nl = (struct notifier_block **)&((*nl)->next);
106156 }
106157- n->next = *nl;
106158+ pax_open_kernel();
106159+ *(const void **)&n->next = *nl;
106160 rcu_assign_pointer(*nl, n);
106161+ pax_close_kernel();
106162 return 0;
106163 }
106164
106165@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
106166 return 0;
106167 if (n->priority > (*nl)->priority)
106168 break;
106169- nl = &((*nl)->next);
106170+ nl = (struct notifier_block **)&((*nl)->next);
106171 }
106172- n->next = *nl;
106173+ pax_open_kernel();
106174+ *(const void **)&n->next = *nl;
106175 rcu_assign_pointer(*nl, n);
106176+ pax_close_kernel();
106177 return 0;
106178 }
106179
106180@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
106181 {
106182 while ((*nl) != NULL) {
106183 if ((*nl) == n) {
106184+ pax_open_kernel();
106185 rcu_assign_pointer(*nl, n->next);
106186+ pax_close_kernel();
106187 return 0;
106188 }
106189- nl = &((*nl)->next);
106190+ nl = (struct notifier_block **)&((*nl)->next);
106191 }
106192 return -ENOENT;
106193 }
106194diff --git a/kernel/padata.c b/kernel/padata.c
106195index b38bea9..91acfbe 100644
106196--- a/kernel/padata.c
106197+++ b/kernel/padata.c
106198@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
106199 * seq_nr mod. number of cpus in use.
106200 */
106201
106202- seq_nr = atomic_inc_return(&pd->seq_nr);
106203+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
106204 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
106205
106206 return padata_index_to_cpu(pd, cpu_index);
106207@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
106208 padata_init_pqueues(pd);
106209 padata_init_squeues(pd);
106210 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
106211- atomic_set(&pd->seq_nr, -1);
106212+ atomic_set_unchecked(&pd->seq_nr, -1);
106213 atomic_set(&pd->reorder_objects, 0);
106214 atomic_set(&pd->refcnt, 0);
106215 pd->pinst = pinst;
106216diff --git a/kernel/panic.c b/kernel/panic.c
106217index 8136ad7..15c857b 100644
106218--- a/kernel/panic.c
106219+++ b/kernel/panic.c
106220@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
106221 /*
106222 * Stop ourself in panic -- architecture code may override this
106223 */
106224-void __weak panic_smp_self_stop(void)
106225+void __weak __noreturn panic_smp_self_stop(void)
106226 {
106227 while (1)
106228 cpu_relax();
106229@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
106230 disable_trace_on_warning();
106231
106232 pr_warn("------------[ cut here ]------------\n");
106233- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
106234+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
106235 raw_smp_processor_id(), current->pid, file, line, caller);
106236
106237 if (args)
106238@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
106239 */
106240 __visible void __stack_chk_fail(void)
106241 {
106242- panic("stack-protector: Kernel stack is corrupted in: %p\n",
106243+ dump_stack();
106244+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
106245 __builtin_return_address(0));
106246 }
106247 EXPORT_SYMBOL(__stack_chk_fail);
106248diff --git a/kernel/pid.c b/kernel/pid.c
106249index 4fd07d5..02bce4f 100644
106250--- a/kernel/pid.c
106251+++ b/kernel/pid.c
106252@@ -33,6 +33,7 @@
106253 #include <linux/rculist.h>
106254 #include <linux/bootmem.h>
106255 #include <linux/hash.h>
106256+#include <linux/security.h>
106257 #include <linux/pid_namespace.h>
106258 #include <linux/init_task.h>
106259 #include <linux/syscalls.h>
106260@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
106261
106262 int pid_max = PID_MAX_DEFAULT;
106263
106264-#define RESERVED_PIDS 300
106265+#define RESERVED_PIDS 500
106266
106267 int pid_max_min = RESERVED_PIDS + 1;
106268 int pid_max_max = PID_MAX_LIMIT;
106269@@ -451,10 +452,18 @@ EXPORT_SYMBOL(pid_task);
106270 */
106271 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
106272 {
106273+ struct task_struct *task;
106274+
106275 rcu_lockdep_assert(rcu_read_lock_held(),
106276 "find_task_by_pid_ns() needs rcu_read_lock()"
106277 " protection");
106278- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
106279+
106280+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
106281+
106282+ if (gr_pid_is_chrooted(task))
106283+ return NULL;
106284+
106285+ return task;
106286 }
106287
106288 struct task_struct *find_task_by_vpid(pid_t vnr)
106289@@ -462,6 +471,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
106290 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
106291 }
106292
106293+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
106294+{
106295+ rcu_lockdep_assert(rcu_read_lock_held(),
106296+ "find_task_by_pid_ns() needs rcu_read_lock()"
106297+ " protection");
106298+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
106299+}
106300+
106301 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
106302 {
106303 struct pid *pid;
106304diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
106305index a65ba13..f600dbb 100644
106306--- a/kernel/pid_namespace.c
106307+++ b/kernel/pid_namespace.c
106308@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
106309 void __user *buffer, size_t *lenp, loff_t *ppos)
106310 {
106311 struct pid_namespace *pid_ns = task_active_pid_ns(current);
106312- struct ctl_table tmp = *table;
106313+ ctl_table_no_const tmp = *table;
106314
106315 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
106316 return -EPERM;
106317diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
106318index 9e30231..75a6d97 100644
106319--- a/kernel/power/Kconfig
106320+++ b/kernel/power/Kconfig
106321@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
106322 config HIBERNATION
106323 bool "Hibernation (aka 'suspend to disk')"
106324 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
106325+ depends on !GRKERNSEC_KMEM
106326+ depends on !PAX_MEMORY_SANITIZE
106327 select HIBERNATE_CALLBACKS
106328 select LZO_COMPRESS
106329 select LZO_DECOMPRESS
106330diff --git a/kernel/power/process.c b/kernel/power/process.c
106331index 564f786..361a18e 100644
106332--- a/kernel/power/process.c
106333+++ b/kernel/power/process.c
106334@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
106335 unsigned int elapsed_msecs;
106336 bool wakeup = false;
106337 int sleep_usecs = USEC_PER_MSEC;
106338+ bool timedout = false;
106339
106340 do_gettimeofday(&start);
106341
106342@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
106343
106344 while (true) {
106345 todo = 0;
106346+ if (time_after(jiffies, end_time))
106347+ timedout = true;
106348 read_lock(&tasklist_lock);
106349 for_each_process_thread(g, p) {
106350 if (p == current || !freeze_task(p))
106351 continue;
106352
106353- if (!freezer_should_skip(p))
106354+ if (!freezer_should_skip(p)) {
106355 todo++;
106356+ if (timedout) {
106357+ printk(KERN_ERR "Task refusing to freeze:\n");
106358+ sched_show_task(p);
106359+ }
106360+ }
106361 }
106362 read_unlock(&tasklist_lock);
106363
106364@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
106365 todo += wq_busy;
106366 }
106367
106368- if (!todo || time_after(jiffies, end_time))
106369+ if (!todo || timedout)
106370 break;
106371
106372 if (pm_wakeup_pending()) {
106373diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
106374index bff0169..c90815d 100644
106375--- a/kernel/printk/printk.c
106376+++ b/kernel/printk/printk.c
106377@@ -463,7 +463,7 @@ static int log_store(int facility, int level,
106378 return msg->text_len;
106379 }
106380
106381-int dmesg_restrict = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
106382+int dmesg_restrict __read_only = IS_ENABLED(CONFIG_SECURITY_DMESG_RESTRICT);
106383
106384 static int syslog_action_restricted(int type)
106385 {
106386@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
106387 if (from_file && type != SYSLOG_ACTION_OPEN)
106388 goto ok;
106389
106390+#ifdef CONFIG_GRKERNSEC_DMESG
106391+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
106392+ return -EPERM;
106393+#endif
106394+
106395 if (syslog_action_restricted(type)) {
106396 if (capable(CAP_SYSLOG))
106397 goto ok;
106398diff --git a/kernel/profile.c b/kernel/profile.c
106399index a7bcd28..5b368fa 100644
106400--- a/kernel/profile.c
106401+++ b/kernel/profile.c
106402@@ -37,7 +37,7 @@ struct profile_hit {
106403 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
106404 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
106405
106406-static atomic_t *prof_buffer;
106407+static atomic_unchecked_t *prof_buffer;
106408 static unsigned long prof_len, prof_shift;
106409
106410 int prof_on __read_mostly;
106411@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
106412 hits[i].pc = 0;
106413 continue;
106414 }
106415- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
106416+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
106417 hits[i].hits = hits[i].pc = 0;
106418 }
106419 }
106420@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
106421 * Add the current hit(s) and flush the write-queue out
106422 * to the global buffer:
106423 */
106424- atomic_add(nr_hits, &prof_buffer[pc]);
106425+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
106426 for (i = 0; i < NR_PROFILE_HIT; ++i) {
106427- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
106428+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
106429 hits[i].pc = hits[i].hits = 0;
106430 }
106431 out:
106432@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
106433 {
106434 unsigned long pc;
106435 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
106436- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
106437+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
106438 }
106439 #endif /* !CONFIG_SMP */
106440
106441@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
106442 return -EFAULT;
106443 buf++; p++; count--; read++;
106444 }
106445- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
106446+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
106447 if (copy_to_user(buf, (void *)pnt, count))
106448 return -EFAULT;
106449 read += count;
106450@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
106451 }
106452 #endif
106453 profile_discard_flip_buffers();
106454- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
106455+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
106456 return count;
106457 }
106458
106459diff --git a/kernel/ptrace.c b/kernel/ptrace.c
106460index c8e0e05..2be5614 100644
106461--- a/kernel/ptrace.c
106462+++ b/kernel/ptrace.c
106463@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
106464 if (seize)
106465 flags |= PT_SEIZED;
106466 rcu_read_lock();
106467- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
106468+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
106469 flags |= PT_PTRACE_CAP;
106470 rcu_read_unlock();
106471 task->ptrace = flags;
106472@@ -514,7 +514,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
106473 break;
106474 return -EIO;
106475 }
106476- if (copy_to_user(dst, buf, retval))
106477+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
106478 return -EFAULT;
106479 copied += retval;
106480 src += retval;
106481@@ -802,7 +802,7 @@ int ptrace_request(struct task_struct *child, long request,
106482 bool seized = child->ptrace & PT_SEIZED;
106483 int ret = -EIO;
106484 siginfo_t siginfo, *si;
106485- void __user *datavp = (void __user *) data;
106486+ void __user *datavp = (__force void __user *) data;
106487 unsigned long __user *datalp = datavp;
106488 unsigned long flags;
106489
106490@@ -1048,14 +1048,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
106491 goto out;
106492 }
106493
106494+ if (gr_handle_ptrace(child, request)) {
106495+ ret = -EPERM;
106496+ goto out_put_task_struct;
106497+ }
106498+
106499 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
106500 ret = ptrace_attach(child, request, addr, data);
106501 /*
106502 * Some architectures need to do book-keeping after
106503 * a ptrace attach.
106504 */
106505- if (!ret)
106506+ if (!ret) {
106507 arch_ptrace_attach(child);
106508+ gr_audit_ptrace(child);
106509+ }
106510 goto out_put_task_struct;
106511 }
106512
106513@@ -1083,7 +1090,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
106514 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
106515 if (copied != sizeof(tmp))
106516 return -EIO;
106517- return put_user(tmp, (unsigned long __user *)data);
106518+ return put_user(tmp, (__force unsigned long __user *)data);
106519 }
106520
106521 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
106522@@ -1176,7 +1183,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
106523 }
106524
106525 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
106526- compat_long_t, addr, compat_long_t, data)
106527+ compat_ulong_t, addr, compat_ulong_t, data)
106528 {
106529 struct task_struct *child;
106530 long ret;
106531@@ -1192,14 +1199,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
106532 goto out;
106533 }
106534
106535+ if (gr_handle_ptrace(child, request)) {
106536+ ret = -EPERM;
106537+ goto out_put_task_struct;
106538+ }
106539+
106540 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
106541 ret = ptrace_attach(child, request, addr, data);
106542 /*
106543 * Some architectures need to do book-keeping after
106544 * a ptrace attach.
106545 */
106546- if (!ret)
106547+ if (!ret) {
106548 arch_ptrace_attach(child);
106549+ gr_audit_ptrace(child);
106550+ }
106551 goto out_put_task_struct;
106552 }
106553
106554diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
106555index 8dbe276..8e87dbd 100644
106556--- a/kernel/rcu/rcutorture.c
106557+++ b/kernel/rcu/rcutorture.c
106558@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
106559 rcu_torture_count) = { 0 };
106560 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
106561 rcu_torture_batch) = { 0 };
106562-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
106563-static atomic_t n_rcu_torture_alloc;
106564-static atomic_t n_rcu_torture_alloc_fail;
106565-static atomic_t n_rcu_torture_free;
106566-static atomic_t n_rcu_torture_mberror;
106567-static atomic_t n_rcu_torture_error;
106568+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
106569+static atomic_unchecked_t n_rcu_torture_alloc;
106570+static atomic_unchecked_t n_rcu_torture_alloc_fail;
106571+static atomic_unchecked_t n_rcu_torture_free;
106572+static atomic_unchecked_t n_rcu_torture_mberror;
106573+static atomic_unchecked_t n_rcu_torture_error;
106574 static long n_rcu_torture_barrier_error;
106575 static long n_rcu_torture_boost_ktrerror;
106576 static long n_rcu_torture_boost_rterror;
106577@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
106578 static long n_rcu_torture_timers;
106579 static long n_barrier_attempts;
106580 static long n_barrier_successes;
106581-static atomic_long_t n_cbfloods;
106582+static atomic_long_unchecked_t n_cbfloods;
106583 static struct list_head rcu_torture_removed;
106584
106585 static int rcu_torture_writer_state;
106586@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
106587
106588 spin_lock_bh(&rcu_torture_lock);
106589 if (list_empty(&rcu_torture_freelist)) {
106590- atomic_inc(&n_rcu_torture_alloc_fail);
106591+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
106592 spin_unlock_bh(&rcu_torture_lock);
106593 return NULL;
106594 }
106595- atomic_inc(&n_rcu_torture_alloc);
106596+ atomic_inc_unchecked(&n_rcu_torture_alloc);
106597 p = rcu_torture_freelist.next;
106598 list_del_init(p);
106599 spin_unlock_bh(&rcu_torture_lock);
106600@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
106601 static void
106602 rcu_torture_free(struct rcu_torture *p)
106603 {
106604- atomic_inc(&n_rcu_torture_free);
106605+ atomic_inc_unchecked(&n_rcu_torture_free);
106606 spin_lock_bh(&rcu_torture_lock);
106607 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
106608 spin_unlock_bh(&rcu_torture_lock);
106609@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
106610 i = rp->rtort_pipe_count;
106611 if (i > RCU_TORTURE_PIPE_LEN)
106612 i = RCU_TORTURE_PIPE_LEN;
106613- atomic_inc(&rcu_torture_wcount[i]);
106614+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
106615 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
106616 rp->rtort_mbtest = 0;
106617 return true;
106618@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
106619 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
106620 do {
106621 schedule_timeout_interruptible(cbflood_inter_holdoff);
106622- atomic_long_inc(&n_cbfloods);
106623+ atomic_long_inc_unchecked(&n_cbfloods);
106624 WARN_ON(signal_pending(current));
106625 for (i = 0; i < cbflood_n_burst; i++) {
106626 for (j = 0; j < cbflood_n_per_burst; j++) {
106627@@ -923,7 +923,7 @@ rcu_torture_writer(void *arg)
106628 i = old_rp->rtort_pipe_count;
106629 if (i > RCU_TORTURE_PIPE_LEN)
106630 i = RCU_TORTURE_PIPE_LEN;
106631- atomic_inc(&rcu_torture_wcount[i]);
106632+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
106633 old_rp->rtort_pipe_count++;
106634 switch (synctype[torture_random(&rand) % nsynctypes]) {
106635 case RTWS_DEF_FREE:
106636@@ -1061,7 +1061,7 @@ static void rcu_torture_timer(unsigned long unused)
106637 return;
106638 }
106639 if (p->rtort_mbtest == 0)
106640- atomic_inc(&n_rcu_torture_mberror);
106641+ atomic_inc_unchecked(&n_rcu_torture_mberror);
106642 spin_lock(&rand_lock);
106643 cur_ops->read_delay(&rand);
106644 n_rcu_torture_timers++;
106645@@ -1136,7 +1136,7 @@ rcu_torture_reader(void *arg)
106646 continue;
106647 }
106648 if (p->rtort_mbtest == 0)
106649- atomic_inc(&n_rcu_torture_mberror);
106650+ atomic_inc_unchecked(&n_rcu_torture_mberror);
106651 cur_ops->read_delay(&rand);
106652 preempt_disable();
106653 pipe_count = p->rtort_pipe_count;
106654@@ -1205,11 +1205,11 @@ rcu_torture_stats_print(void)
106655 rcu_torture_current,
106656 rcu_torture_current_version,
106657 list_empty(&rcu_torture_freelist),
106658- atomic_read(&n_rcu_torture_alloc),
106659- atomic_read(&n_rcu_torture_alloc_fail),
106660- atomic_read(&n_rcu_torture_free));
106661+ atomic_read_unchecked(&n_rcu_torture_alloc),
106662+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
106663+ atomic_read_unchecked(&n_rcu_torture_free));
106664 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
106665- atomic_read(&n_rcu_torture_mberror),
106666+ atomic_read_unchecked(&n_rcu_torture_mberror),
106667 n_rcu_torture_boost_ktrerror,
106668 n_rcu_torture_boost_rterror);
106669 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
106670@@ -1221,17 +1221,17 @@ rcu_torture_stats_print(void)
106671 n_barrier_successes,
106672 n_barrier_attempts,
106673 n_rcu_torture_barrier_error);
106674- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
106675+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
106676
106677 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
106678- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
106679+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
106680 n_rcu_torture_barrier_error != 0 ||
106681 n_rcu_torture_boost_ktrerror != 0 ||
106682 n_rcu_torture_boost_rterror != 0 ||
106683 n_rcu_torture_boost_failure != 0 ||
106684 i > 1) {
106685 pr_cont("%s", "!!! ");
106686- atomic_inc(&n_rcu_torture_error);
106687+ atomic_inc_unchecked(&n_rcu_torture_error);
106688 WARN_ON_ONCE(1);
106689 }
106690 pr_cont("Reader Pipe: ");
106691@@ -1248,7 +1248,7 @@ rcu_torture_stats_print(void)
106692 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
106693 pr_cont("Free-Block Circulation: ");
106694 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
106695- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
106696+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
106697 }
106698 pr_cont("\n");
106699
106700@@ -1595,7 +1595,7 @@ rcu_torture_cleanup(void)
106701
106702 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
106703
106704- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
106705+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
106706 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
106707 else if (torture_onoff_failures())
106708 rcu_torture_print_module_parms(cur_ops,
106709@@ -1720,18 +1720,18 @@ rcu_torture_init(void)
106710
106711 rcu_torture_current = NULL;
106712 rcu_torture_current_version = 0;
106713- atomic_set(&n_rcu_torture_alloc, 0);
106714- atomic_set(&n_rcu_torture_alloc_fail, 0);
106715- atomic_set(&n_rcu_torture_free, 0);
106716- atomic_set(&n_rcu_torture_mberror, 0);
106717- atomic_set(&n_rcu_torture_error, 0);
106718+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
106719+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
106720+ atomic_set_unchecked(&n_rcu_torture_free, 0);
106721+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
106722+ atomic_set_unchecked(&n_rcu_torture_error, 0);
106723 n_rcu_torture_barrier_error = 0;
106724 n_rcu_torture_boost_ktrerror = 0;
106725 n_rcu_torture_boost_rterror = 0;
106726 n_rcu_torture_boost_failure = 0;
106727 n_rcu_torture_boosts = 0;
106728 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
106729- atomic_set(&rcu_torture_wcount[i], 0);
106730+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
106731 for_each_possible_cpu(cpu) {
106732 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
106733 per_cpu(rcu_torture_count, cpu)[i] = 0;
106734diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
106735index ec30868..89752ff 100644
106736--- a/kernel/rcu/tiny.c
106737+++ b/kernel/rcu/tiny.c
106738@@ -42,7 +42,7 @@
106739 /* Forward declarations for tiny_plugin.h. */
106740 struct rcu_ctrlblk;
106741 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
106742-static void rcu_process_callbacks(struct softirq_action *unused);
106743+static void rcu_process_callbacks(void);
106744 static void __call_rcu(struct rcu_head *head,
106745 void (*func)(struct rcu_head *rcu),
106746 struct rcu_ctrlblk *rcp);
106747@@ -203,7 +203,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
106748 false));
106749 }
106750
106751-static void rcu_process_callbacks(struct softirq_action *unused)
106752+static __latent_entropy void rcu_process_callbacks(void)
106753 {
106754 __rcu_process_callbacks(&rcu_sched_ctrlblk);
106755 __rcu_process_callbacks(&rcu_bh_ctrlblk);
106756diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
106757index f94e209..d2985bd 100644
106758--- a/kernel/rcu/tiny_plugin.h
106759+++ b/kernel/rcu/tiny_plugin.h
106760@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
106761 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
106762 jiffies - rcp->gp_start, rcp->qlen);
106763 dump_stack();
106764- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
106765+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
106766 3 * rcu_jiffies_till_stall_check() + 3;
106767 } else if (ULONG_CMP_GE(j, js)) {
106768- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106769+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106770 }
106771 }
106772
106773@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
106774 {
106775 rcp->ticks_this_gp = 0;
106776 rcp->gp_start = jiffies;
106777- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106778+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
106779 }
106780
106781 static void check_cpu_stalls(void)
106782diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
106783index 8cf7304..953f8ad 100644
106784--- a/kernel/rcu/tree.c
106785+++ b/kernel/rcu/tree.c
106786@@ -290,7 +290,7 @@ static void rcu_momentary_dyntick_idle(void)
106787 */
106788 rdtp = this_cpu_ptr(&rcu_dynticks);
106789 smp_mb__before_atomic(); /* Earlier stuff before QS. */
106790- atomic_add(2, &rdtp->dynticks); /* QS. */
106791+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
106792 smp_mb__after_atomic(); /* Later stuff after QS. */
106793 break;
106794 }
106795@@ -602,9 +602,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
106796 rcu_prepare_for_idle();
106797 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
106798 smp_mb__before_atomic(); /* See above. */
106799- atomic_inc(&rdtp->dynticks);
106800+ atomic_inc_unchecked(&rdtp->dynticks);
106801 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
106802- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
106803+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
106804 rcu_dynticks_task_enter();
106805
106806 /*
106807@@ -725,10 +725,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
106808
106809 rcu_dynticks_task_exit();
106810 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
106811- atomic_inc(&rdtp->dynticks);
106812+ atomic_inc_unchecked(&rdtp->dynticks);
106813 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
106814 smp_mb__after_atomic(); /* See above. */
106815- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106816+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106817 rcu_cleanup_after_idle();
106818 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
106819 if (!user && !is_idle_task(current)) {
106820@@ -862,12 +862,12 @@ void rcu_nmi_enter(void)
106821 * to be in the outermost NMI handler that interrupted an RCU-idle
106822 * period (observation due to Andy Lutomirski).
106823 */
106824- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
106825+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
106826 smp_mb__before_atomic(); /* Force delay from prior write. */
106827- atomic_inc(&rdtp->dynticks);
106828+ atomic_inc_unchecked(&rdtp->dynticks);
106829 /* atomic_inc() before later RCU read-side crit sects */
106830 smp_mb__after_atomic(); /* See above. */
106831- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106832+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106833 incby = 1;
106834 }
106835 rdtp->dynticks_nmi_nesting += incby;
106836@@ -892,7 +892,7 @@ void rcu_nmi_exit(void)
106837 * to us!)
106838 */
106839 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
106840- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
106841+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
106842
106843 /*
106844 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
106845@@ -907,9 +907,9 @@ void rcu_nmi_exit(void)
106846 rdtp->dynticks_nmi_nesting = 0;
106847 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
106848 smp_mb__before_atomic(); /* See above. */
106849- atomic_inc(&rdtp->dynticks);
106850+ atomic_inc_unchecked(&rdtp->dynticks);
106851 smp_mb__after_atomic(); /* Force delay to next write. */
106852- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
106853+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
106854 }
106855
106856 /**
106857@@ -922,7 +922,7 @@ void rcu_nmi_exit(void)
106858 */
106859 bool notrace __rcu_is_watching(void)
106860 {
106861- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
106862+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
106863 }
106864
106865 /**
106866@@ -1005,7 +1005,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
106867 static int dyntick_save_progress_counter(struct rcu_data *rdp,
106868 bool *isidle, unsigned long *maxj)
106869 {
106870- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
106871+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
106872 rcu_sysidle_check_cpu(rdp, isidle, maxj);
106873 if ((rdp->dynticks_snap & 0x1) == 0) {
106874 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
106875@@ -1013,7 +1013,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
106876 } else {
106877 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
106878 rdp->mynode->gpnum))
106879- ACCESS_ONCE(rdp->gpwrap) = true;
106880+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
106881 return 0;
106882 }
106883 }
106884@@ -1031,7 +1031,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
106885 int *rcrmp;
106886 unsigned int snap;
106887
106888- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
106889+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
106890 snap = (unsigned int)rdp->dynticks_snap;
106891
106892 /*
106893@@ -1094,10 +1094,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
106894 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
106895 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
106896 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
106897- ACCESS_ONCE(rdp->cond_resched_completed) =
106898+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
106899 ACCESS_ONCE(rdp->mynode->completed);
106900 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
106901- ACCESS_ONCE(*rcrmp) =
106902+ ACCESS_ONCE_RW(*rcrmp) =
106903 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
106904 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
106905 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
106906@@ -1119,7 +1119,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
106907 rsp->gp_start = j;
106908 smp_wmb(); /* Record start time before stall time. */
106909 j1 = rcu_jiffies_till_stall_check();
106910- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
106911+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
106912 rsp->jiffies_resched = j + j1 / 2;
106913 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
106914 }
106915@@ -1178,7 +1178,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
106916 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106917 return;
106918 }
106919- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
106920+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
106921 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106922
106923 /*
106924@@ -1263,7 +1263,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
106925
106926 raw_spin_lock_irqsave(&rnp->lock, flags);
106927 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
106928- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
106929+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
106930 3 * rcu_jiffies_till_stall_check() + 3;
106931 raw_spin_unlock_irqrestore(&rnp->lock, flags);
106932
106933@@ -1347,7 +1347,7 @@ void rcu_cpu_stall_reset(void)
106934 struct rcu_state *rsp;
106935
106936 for_each_rcu_flavor(rsp)
106937- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
106938+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
106939 }
106940
106941 /*
106942@@ -1704,7 +1704,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
106943 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
106944 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
106945 zero_cpu_stall_ticks(rdp);
106946- ACCESS_ONCE(rdp->gpwrap) = false;
106947+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
106948 }
106949 return ret;
106950 }
106951@@ -1740,7 +1740,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106952 struct rcu_data *rdp;
106953 struct rcu_node *rnp = rcu_get_root(rsp);
106954
106955- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106956+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106957 raw_spin_lock_irq(&rnp->lock);
106958 smp_mb__after_unlock_lock();
106959 if (!ACCESS_ONCE(rsp->gp_flags)) {
106960@@ -1748,7 +1748,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106961 raw_spin_unlock_irq(&rnp->lock);
106962 return 0;
106963 }
106964- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
106965+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
106966
106967 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
106968 /*
106969@@ -1834,9 +1834,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
106970 rdp = this_cpu_ptr(rsp->rda);
106971 rcu_preempt_check_blocked_tasks(rnp);
106972 rnp->qsmask = rnp->qsmaskinit;
106973- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
106974+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
106975 if (WARN_ON_ONCE(rnp->completed != rsp->completed))
106976- ACCESS_ONCE(rnp->completed) = rsp->completed;
106977+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
106978 if (rnp == rdp->mynode)
106979 (void)__note_gp_changes(rsp, rnp, rdp);
106980 rcu_preempt_boost_start_gp(rnp);
106981@@ -1845,7 +1845,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
106982 rnp->grphi, rnp->qsmask);
106983 raw_spin_unlock_irq(&rnp->lock);
106984 cond_resched_rcu_qs();
106985- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106986+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106987 if (gp_init_delay > 0 &&
106988 !(rsp->gpnum % (rcu_num_nodes * PER_RCU_NODE_PERIOD)))
106989 schedule_timeout_uninterruptible(gp_init_delay);
106990@@ -1864,7 +1864,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
106991 unsigned long maxj;
106992 struct rcu_node *rnp = rcu_get_root(rsp);
106993
106994- ACCESS_ONCE(rsp->gp_activity) = jiffies;
106995+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
106996 rsp->n_force_qs++;
106997 if (fqs_state == RCU_SAVE_DYNTICK) {
106998 /* Collect dyntick-idle snapshots. */
106999@@ -1885,7 +1885,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
107000 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
107001 raw_spin_lock_irq(&rnp->lock);
107002 smp_mb__after_unlock_lock();
107003- ACCESS_ONCE(rsp->gp_flags) =
107004+ ACCESS_ONCE_RW(rsp->gp_flags) =
107005 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
107006 raw_spin_unlock_irq(&rnp->lock);
107007 }
107008@@ -1903,7 +1903,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
107009 struct rcu_data *rdp;
107010 struct rcu_node *rnp = rcu_get_root(rsp);
107011
107012- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107013+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107014 raw_spin_lock_irq(&rnp->lock);
107015 smp_mb__after_unlock_lock();
107016 gp_duration = jiffies - rsp->gp_start;
107017@@ -1934,7 +1934,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
107018 smp_mb__after_unlock_lock();
107019 WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp));
107020 WARN_ON_ONCE(rnp->qsmask);
107021- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
107022+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
107023 rdp = this_cpu_ptr(rsp->rda);
107024 if (rnp == rdp->mynode)
107025 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
107026@@ -1942,7 +1942,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
107027 nocb += rcu_future_gp_cleanup(rsp, rnp);
107028 raw_spin_unlock_irq(&rnp->lock);
107029 cond_resched_rcu_qs();
107030- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107031+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107032 }
107033 rnp = rcu_get_root(rsp);
107034 raw_spin_lock_irq(&rnp->lock);
107035@@ -1950,14 +1950,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
107036 rcu_nocb_gp_set(rnp, nocb);
107037
107038 /* Declare grace period done. */
107039- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
107040+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
107041 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
107042 rsp->fqs_state = RCU_GP_IDLE;
107043 rdp = this_cpu_ptr(rsp->rda);
107044 /* Advance CBs to reduce false positives below. */
107045 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
107046 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
107047- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107048+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107049 trace_rcu_grace_period(rsp->name,
107050 ACCESS_ONCE(rsp->gpnum),
107051 TPS("newreq"));
107052@@ -1993,7 +1993,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
107053 if (rcu_gp_init(rsp))
107054 break;
107055 cond_resched_rcu_qs();
107056- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107057+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107058 WARN_ON(signal_pending(current));
107059 trace_rcu_grace_period(rsp->name,
107060 ACCESS_ONCE(rsp->gpnum),
107061@@ -2037,11 +2037,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
107062 ACCESS_ONCE(rsp->gpnum),
107063 TPS("fqsend"));
107064 cond_resched_rcu_qs();
107065- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107066+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107067 } else {
107068 /* Deal with stray signal. */
107069 cond_resched_rcu_qs();
107070- ACCESS_ONCE(rsp->gp_activity) = jiffies;
107071+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
107072 WARN_ON(signal_pending(current));
107073 trace_rcu_grace_period(rsp->name,
107074 ACCESS_ONCE(rsp->gpnum),
107075@@ -2086,7 +2086,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
107076 */
107077 return false;
107078 }
107079- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107080+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
107081 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
107082 TPS("newreq"));
107083
107084@@ -2359,7 +2359,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
107085 rsp->qlen += rdp->qlen;
107086 rdp->n_cbs_orphaned += rdp->qlen;
107087 rdp->qlen_lazy = 0;
107088- ACCESS_ONCE(rdp->qlen) = 0;
107089+ ACCESS_ONCE_RW(rdp->qlen) = 0;
107090 }
107091
107092 /*
107093@@ -2636,7 +2636,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
107094 }
107095 smp_mb(); /* List handling before counting for rcu_barrier(). */
107096 rdp->qlen_lazy -= count_lazy;
107097- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
107098+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
107099 rdp->n_cbs_invoked += count;
107100
107101 /* Reinstate batch limit if we have worked down the excess. */
107102@@ -2814,7 +2814,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
107103 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
107104 return; /* Someone beat us to it. */
107105 }
107106- ACCESS_ONCE(rsp->gp_flags) =
107107+ ACCESS_ONCE_RW(rsp->gp_flags) =
107108 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
107109 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
107110 rcu_gp_kthread_wake(rsp);
107111@@ -2860,7 +2860,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
107112 /*
107113 * Do RCU core processing for the current CPU.
107114 */
107115-static void rcu_process_callbacks(struct softirq_action *unused)
107116+static void rcu_process_callbacks(void)
107117 {
107118 struct rcu_state *rsp;
107119
107120@@ -2972,7 +2972,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
107121 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
107122 if (debug_rcu_head_queue(head)) {
107123 /* Probable double call_rcu(), so leak the callback. */
107124- ACCESS_ONCE(head->func) = rcu_leak_callback;
107125+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
107126 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
107127 return;
107128 }
107129@@ -3011,7 +3011,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
107130 if (!likely(rdp->nxtlist))
107131 init_default_callback_list(rdp);
107132 }
107133- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
107134+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
107135 if (lazy)
107136 rdp->qlen_lazy++;
107137 else
107138@@ -3284,11 +3284,11 @@ void synchronize_sched_expedited(void)
107139 * counter wrap on a 32-bit system. Quite a few more CPUs would of
107140 * course be required on a 64-bit system.
107141 */
107142- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
107143+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
107144 (ulong)atomic_long_read(&rsp->expedited_done) +
107145 ULONG_MAX / 8)) {
107146 synchronize_sched();
107147- atomic_long_inc(&rsp->expedited_wrap);
107148+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
107149 return;
107150 }
107151
107152@@ -3296,12 +3296,12 @@ void synchronize_sched_expedited(void)
107153 * Take a ticket. Note that atomic_inc_return() implies a
107154 * full memory barrier.
107155 */
107156- snap = atomic_long_inc_return(&rsp->expedited_start);
107157+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
107158 firstsnap = snap;
107159 if (!try_get_online_cpus()) {
107160 /* CPU hotplug operation in flight, fall back to normal GP. */
107161 wait_rcu_gp(call_rcu_sched);
107162- atomic_long_inc(&rsp->expedited_normal);
107163+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107164 return;
107165 }
107166 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
107167@@ -3314,7 +3314,7 @@ void synchronize_sched_expedited(void)
107168 for_each_cpu(cpu, cm) {
107169 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
107170
107171- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
107172+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
107173 cpumask_clear_cpu(cpu, cm);
107174 }
107175 if (cpumask_weight(cm) == 0)
107176@@ -3329,14 +3329,14 @@ void synchronize_sched_expedited(void)
107177 synchronize_sched_expedited_cpu_stop,
107178 NULL) == -EAGAIN) {
107179 put_online_cpus();
107180- atomic_long_inc(&rsp->expedited_tryfail);
107181+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
107182
107183 /* Check to see if someone else did our work for us. */
107184 s = atomic_long_read(&rsp->expedited_done);
107185 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
107186 /* ensure test happens before caller kfree */
107187 smp_mb__before_atomic(); /* ^^^ */
107188- atomic_long_inc(&rsp->expedited_workdone1);
107189+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
107190 free_cpumask_var(cm);
107191 return;
107192 }
107193@@ -3346,7 +3346,7 @@ void synchronize_sched_expedited(void)
107194 udelay(trycount * num_online_cpus());
107195 } else {
107196 wait_rcu_gp(call_rcu_sched);
107197- atomic_long_inc(&rsp->expedited_normal);
107198+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107199 free_cpumask_var(cm);
107200 return;
107201 }
107202@@ -3356,7 +3356,7 @@ void synchronize_sched_expedited(void)
107203 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
107204 /* ensure test happens before caller kfree */
107205 smp_mb__before_atomic(); /* ^^^ */
107206- atomic_long_inc(&rsp->expedited_workdone2);
107207+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
107208 free_cpumask_var(cm);
107209 return;
107210 }
107211@@ -3371,14 +3371,14 @@ void synchronize_sched_expedited(void)
107212 if (!try_get_online_cpus()) {
107213 /* CPU hotplug operation in flight, use normal GP. */
107214 wait_rcu_gp(call_rcu_sched);
107215- atomic_long_inc(&rsp->expedited_normal);
107216+ atomic_long_inc_unchecked(&rsp->expedited_normal);
107217 free_cpumask_var(cm);
107218 return;
107219 }
107220- snap = atomic_long_read(&rsp->expedited_start);
107221+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
107222 smp_mb(); /* ensure read is before try_stop_cpus(). */
107223 }
107224- atomic_long_inc(&rsp->expedited_stoppedcpus);
107225+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
107226
107227 all_cpus_idle:
107228 free_cpumask_var(cm);
107229@@ -3390,16 +3390,16 @@ all_cpus_idle:
107230 * than we did already did their update.
107231 */
107232 do {
107233- atomic_long_inc(&rsp->expedited_done_tries);
107234+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
107235 s = atomic_long_read(&rsp->expedited_done);
107236 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
107237 /* ensure test happens before caller kfree */
107238 smp_mb__before_atomic(); /* ^^^ */
107239- atomic_long_inc(&rsp->expedited_done_lost);
107240+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
107241 break;
107242 }
107243 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
107244- atomic_long_inc(&rsp->expedited_done_exit);
107245+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
107246
107247 put_online_cpus();
107248 }
107249@@ -3609,7 +3609,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
107250 * ACCESS_ONCE() to prevent the compiler from speculating
107251 * the increment to precede the early-exit check.
107252 */
107253- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107254+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107255 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
107256 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
107257 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
107258@@ -3665,7 +3665,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
107259
107260 /* Increment ->n_barrier_done to prevent duplicate work. */
107261 smp_mb(); /* Keep increment after above mechanism. */
107262- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107263+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
107264 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
107265 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
107266 smp_mb(); /* Keep increment before caller's subsequent code. */
107267@@ -3732,7 +3732,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
107268 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
107269 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
107270 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
107271- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
107272+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
107273 rdp->cpu = cpu;
107274 rdp->rsp = rsp;
107275 rcu_boot_init_nocb_percpu_data(rdp);
107276@@ -3763,8 +3763,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
107277 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
107278 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
107279 rcu_sysidle_init_percpu_data(rdp->dynticks);
107280- atomic_set(&rdp->dynticks->dynticks,
107281- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
107282+ atomic_set_unchecked(&rdp->dynticks->dynticks,
107283+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
107284 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
107285
107286 /*
107287diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
107288index a69d3da..51993c4 100644
107289--- a/kernel/rcu/tree.h
107290+++ b/kernel/rcu/tree.h
107291@@ -86,11 +86,11 @@ struct rcu_dynticks {
107292 long long dynticks_nesting; /* Track irq/process nesting level. */
107293 /* Process level is worth LLONG_MAX/2. */
107294 int dynticks_nmi_nesting; /* Track NMI nesting level. */
107295- atomic_t dynticks; /* Even value for idle, else odd. */
107296+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
107297 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
107298 long long dynticks_idle_nesting;
107299 /* irq/process nesting level from idle. */
107300- atomic_t dynticks_idle; /* Even value for idle, else odd. */
107301+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
107302 /* "Idle" excludes userspace execution. */
107303 unsigned long dynticks_idle_jiffies;
107304 /* End of last non-NMI non-idle period. */
107305@@ -463,17 +463,17 @@ struct rcu_state {
107306 /* _rcu_barrier(). */
107307 /* End of fields guarded by barrier_mutex. */
107308
107309- atomic_long_t expedited_start; /* Starting ticket. */
107310- atomic_long_t expedited_done; /* Done ticket. */
107311- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
107312- atomic_long_t expedited_tryfail; /* # acquisition failures. */
107313- atomic_long_t expedited_workdone1; /* # done by others #1. */
107314- atomic_long_t expedited_workdone2; /* # done by others #2. */
107315- atomic_long_t expedited_normal; /* # fallbacks to normal. */
107316- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
107317- atomic_long_t expedited_done_tries; /* # tries to update _done. */
107318- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
107319- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
107320+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
107321+ atomic_long_t expedited_done; /* Done ticket. */
107322+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
107323+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
107324+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
107325+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
107326+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
107327+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
107328+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
107329+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
107330+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
107331
107332 unsigned long jiffies_force_qs; /* Time at which to invoke */
107333 /* force_quiescent_state(). */
107334diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
107335index 8c0ec0f..99d52c5 100644
107336--- a/kernel/rcu/tree_plugin.h
107337+++ b/kernel/rcu/tree_plugin.h
107338@@ -570,7 +570,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
107339 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
107340 {
107341 return !rcu_preempted_readers_exp(rnp) &&
107342- ACCESS_ONCE(rnp->expmask) == 0;
107343+ ACCESS_ONCE_RW(rnp->expmask) == 0;
107344 }
107345
107346 /*
107347@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
107348
107349 /* Clean up and exit. */
107350 smp_mb(); /* ensure expedited GP seen before counter increment. */
107351- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
107352+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
107353 sync_rcu_preempt_exp_count + 1;
107354 unlock_mb_ret:
107355 mutex_unlock(&sync_rcu_preempt_exp_mutex);
107356@@ -1286,7 +1286,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
107357 free_cpumask_var(cm);
107358 }
107359
107360-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
107361+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
107362 .store = &rcu_cpu_kthread_task,
107363 .thread_should_run = rcu_cpu_kthread_should_run,
107364 .thread_fn = rcu_cpu_kthread,
107365@@ -1757,7 +1757,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
107366 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
107367 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
107368 cpu, ticks_value, ticks_title,
107369- atomic_read(&rdtp->dynticks) & 0xfff,
107370+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
107371 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
107372 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
107373 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
107374@@ -1902,7 +1902,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
107375 return;
107376 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
107377 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
107378- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
107379+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
107380 wake_up(&rdp_leader->nocb_wq);
107381 }
107382 }
107383@@ -1975,7 +1975,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
107384 atomic_long_add(rhcount, &rdp->nocb_q_count);
107385 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
107386 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
107387- ACCESS_ONCE(*old_rhpp) = rhp;
107388+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
107389 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
107390 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
107391
107392@@ -2164,7 +2164,7 @@ wait_again:
107393 continue; /* No CBs here, try next follower. */
107394
107395 /* Move callbacks to wait-for-GP list, which is empty. */
107396- ACCESS_ONCE(rdp->nocb_head) = NULL;
107397+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
107398 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
107399 gotcbs = true;
107400 }
107401@@ -2285,7 +2285,7 @@ static int rcu_nocb_kthread(void *arg)
107402 list = ACCESS_ONCE(rdp->nocb_follower_head);
107403 BUG_ON(!list);
107404 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
107405- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
107406+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
107407 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
107408
107409 /* Each pass through the following loop invokes a callback. */
107410@@ -2335,7 +2335,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
107411 if (!rcu_nocb_need_deferred_wakeup(rdp))
107412 return;
107413 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
107414- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
107415+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
107416 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
107417 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
107418 }
107419@@ -2448,7 +2448,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
107420 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
107421 "rcuo%c/%d", rsp->abbr, cpu);
107422 BUG_ON(IS_ERR(t));
107423- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
107424+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
107425 }
107426
107427 /*
107428@@ -2663,11 +2663,11 @@ static void rcu_sysidle_enter(int irq)
107429
107430 /* Record start of fully idle period. */
107431 j = jiffies;
107432- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
107433+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
107434 smp_mb__before_atomic();
107435- atomic_inc(&rdtp->dynticks_idle);
107436+ atomic_inc_unchecked(&rdtp->dynticks_idle);
107437 smp_mb__after_atomic();
107438- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
107439+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
107440 }
107441
107442 /*
107443@@ -2738,9 +2738,9 @@ static void rcu_sysidle_exit(int irq)
107444
107445 /* Record end of idle period. */
107446 smp_mb__before_atomic();
107447- atomic_inc(&rdtp->dynticks_idle);
107448+ atomic_inc_unchecked(&rdtp->dynticks_idle);
107449 smp_mb__after_atomic();
107450- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
107451+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
107452
107453 /*
107454 * If we are the timekeeping CPU, we are permitted to be non-idle
107455@@ -2786,7 +2786,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
107456 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
107457
107458 /* Pick up current idle and NMI-nesting counter and check. */
107459- cur = atomic_read(&rdtp->dynticks_idle);
107460+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
107461 if (cur & 0x1) {
107462 *isidle = false; /* We are not idle! */
107463 return;
107464@@ -2835,7 +2835,7 @@ static void rcu_sysidle(unsigned long j)
107465 case RCU_SYSIDLE_NOT:
107466
107467 /* First time all are idle, so note a short idle period. */
107468- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
107469+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
107470 break;
107471
107472 case RCU_SYSIDLE_SHORT:
107473@@ -2873,7 +2873,7 @@ static void rcu_sysidle_cancel(void)
107474 {
107475 smp_mb();
107476 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
107477- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
107478+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
107479 }
107480
107481 /*
107482@@ -2925,7 +2925,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
107483 smp_mb(); /* grace period precedes setting inuse. */
107484
107485 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
107486- ACCESS_ONCE(rshp->inuse) = 0;
107487+ ACCESS_ONCE_RW(rshp->inuse) = 0;
107488 }
107489
107490 /*
107491@@ -3077,7 +3077,7 @@ static void rcu_bind_gp_kthread(void)
107492 static void rcu_dynticks_task_enter(void)
107493 {
107494 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
107495- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
107496+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
107497 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
107498 }
107499
107500@@ -3085,6 +3085,6 @@ static void rcu_dynticks_task_enter(void)
107501 static void rcu_dynticks_task_exit(void)
107502 {
107503 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
107504- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
107505+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
107506 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
107507 }
107508diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
107509index f92361e..0052f88 100644
107510--- a/kernel/rcu/tree_trace.c
107511+++ b/kernel/rcu/tree_trace.c
107512@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
107513 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
107514 rdp->qs_pending);
107515 seq_printf(m, " dt=%d/%llx/%d df=%lu",
107516- atomic_read(&rdp->dynticks->dynticks),
107517+ atomic_read_unchecked(&rdp->dynticks->dynticks),
107518 rdp->dynticks->dynticks_nesting,
107519 rdp->dynticks->dynticks_nmi_nesting,
107520 rdp->dynticks_fqs);
107521@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
107522 struct rcu_state *rsp = (struct rcu_state *)m->private;
107523
107524 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",
107525- atomic_long_read(&rsp->expedited_start),
107526+ atomic_long_read_unchecked(&rsp->expedited_start),
107527 atomic_long_read(&rsp->expedited_done),
107528- atomic_long_read(&rsp->expedited_wrap),
107529- atomic_long_read(&rsp->expedited_tryfail),
107530- atomic_long_read(&rsp->expedited_workdone1),
107531- atomic_long_read(&rsp->expedited_workdone2),
107532- atomic_long_read(&rsp->expedited_normal),
107533- atomic_long_read(&rsp->expedited_stoppedcpus),
107534- atomic_long_read(&rsp->expedited_done_tries),
107535- atomic_long_read(&rsp->expedited_done_lost),
107536- atomic_long_read(&rsp->expedited_done_exit));
107537+ atomic_long_read_unchecked(&rsp->expedited_wrap),
107538+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
107539+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
107540+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
107541+ atomic_long_read_unchecked(&rsp->expedited_normal),
107542+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
107543+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
107544+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
107545+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
107546 return 0;
107547 }
107548
107549diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
107550index 1f13335..77ebb7f 100644
107551--- a/kernel/rcu/update.c
107552+++ b/kernel/rcu/update.c
107553@@ -396,10 +396,10 @@ int rcu_jiffies_till_stall_check(void)
107554 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
107555 */
107556 if (till_stall_check < 3) {
107557- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
107558+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
107559 till_stall_check = 3;
107560 } else if (till_stall_check > 300) {
107561- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
107562+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
107563 till_stall_check = 300;
107564 }
107565 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
107566@@ -555,7 +555,7 @@ static void check_holdout_task(struct task_struct *t,
107567 !ACCESS_ONCE(t->on_rq) ||
107568 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
107569 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
107570- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
107571+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
107572 list_del_init(&t->rcu_tasks_holdout_list);
107573 put_task_struct(t);
107574 return;
107575@@ -643,7 +643,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
107576 !is_idle_task(t)) {
107577 get_task_struct(t);
107578 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
107579- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
107580+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
107581 list_add(&t->rcu_tasks_holdout_list,
107582 &rcu_tasks_holdouts);
107583 }
107584@@ -740,7 +740,7 @@ static void rcu_spawn_tasks_kthread(void)
107585 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
107586 BUG_ON(IS_ERR(t));
107587 smp_mb(); /* Ensure others see full kthread. */
107588- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
107589+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
107590 mutex_unlock(&rcu_tasks_kthread_mutex);
107591 }
107592
107593diff --git a/kernel/resource.c b/kernel/resource.c
107594index 90552aa..ad13346 100644
107595--- a/kernel/resource.c
107596+++ b/kernel/resource.c
107597@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
107598
107599 static int __init ioresources_init(void)
107600 {
107601+#ifdef CONFIG_GRKERNSEC_PROC_ADD
107602+#ifdef CONFIG_GRKERNSEC_PROC_USER
107603+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
107604+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
107605+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
107606+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
107607+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
107608+#endif
107609+#else
107610 proc_create("ioports", 0, NULL, &proc_ioports_operations);
107611 proc_create("iomem", 0, NULL, &proc_iomem_operations);
107612+#endif
107613 return 0;
107614 }
107615 __initcall(ioresources_init);
107616@@ -504,13 +514,13 @@ int region_is_ram(resource_size_t start, unsigned long size)
107617 {
107618 struct resource *p;
107619 resource_size_t end = start + size - 1;
107620- int flags = IORESOURCE_MEM | IORESOURCE_BUSY;
107621+ unsigned long flags = IORESOURCE_MEM | IORESOURCE_BUSY;
107622 const char *name = "System RAM";
107623 int ret = -1;
107624
107625 read_lock(&resource_lock);
107626 for (p = iomem_resource.child; p ; p = p->sibling) {
107627- if (end < p->start)
107628+ if (p->end < start)
107629 continue;
107630
107631 if (p->start <= start && end <= p->end) {
107632@@ -521,7 +531,7 @@ int region_is_ram(resource_size_t start, unsigned long size)
107633 ret = 1;
107634 break;
107635 }
107636- if (p->end < start)
107637+ if (end < p->start)
107638 break; /* not found */
107639 }
107640 read_unlock(&resource_lock);
107641diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
107642index eae160d..c9aa22e 100644
107643--- a/kernel/sched/auto_group.c
107644+++ b/kernel/sched/auto_group.c
107645@@ -11,7 +11,7 @@
107646
107647 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
107648 static struct autogroup autogroup_default;
107649-static atomic_t autogroup_seq_nr;
107650+static atomic_unchecked_t autogroup_seq_nr;
107651
107652 void __init autogroup_init(struct task_struct *init_task)
107653 {
107654@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
107655
107656 kref_init(&ag->kref);
107657 init_rwsem(&ag->lock);
107658- ag->id = atomic_inc_return(&autogroup_seq_nr);
107659+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
107660 ag->tg = tg;
107661 #ifdef CONFIG_RT_GROUP_SCHED
107662 /*
107663diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
107664index 8d0f35d..c16360d 100644
107665--- a/kernel/sched/completion.c
107666+++ b/kernel/sched/completion.c
107667@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
107668 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
107669 * or number of jiffies left till timeout) if completed.
107670 */
107671-long __sched
107672+long __sched __intentional_overflow(-1)
107673 wait_for_completion_interruptible_timeout(struct completion *x,
107674 unsigned long timeout)
107675 {
107676@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
107677 *
107678 * Return: -ERESTARTSYS if interrupted, 0 if completed.
107679 */
107680-int __sched wait_for_completion_killable(struct completion *x)
107681+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
107682 {
107683 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
107684 if (t == -ERESTARTSYS)
107685@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
107686 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
107687 * or number of jiffies left till timeout) if completed.
107688 */
107689-long __sched
107690+long __sched __intentional_overflow(-1)
107691 wait_for_completion_killable_timeout(struct completion *x,
107692 unsigned long timeout)
107693 {
107694diff --git a/kernel/sched/core.c b/kernel/sched/core.c
107695index 1236732..df281d6 100644
107696--- a/kernel/sched/core.c
107697+++ b/kernel/sched/core.c
107698@@ -1867,7 +1867,7 @@ void set_numabalancing_state(bool enabled)
107699 int sysctl_numa_balancing(struct ctl_table *table, int write,
107700 void __user *buffer, size_t *lenp, loff_t *ppos)
107701 {
107702- struct ctl_table t;
107703+ ctl_table_no_const t;
107704 int err;
107705 int state = numabalancing_enabled;
107706
107707@@ -2317,8 +2317,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
107708 next->active_mm = oldmm;
107709 atomic_inc(&oldmm->mm_count);
107710 enter_lazy_tlb(oldmm, next);
107711- } else
107712+ } else {
107713 switch_mm(oldmm, mm, next);
107714+ populate_stack();
107715+ }
107716
107717 if (!prev->mm) {
107718 prev->active_mm = NULL;
107719@@ -3129,6 +3131,8 @@ int can_nice(const struct task_struct *p, const int nice)
107720 /* convert nice value [19,-20] to rlimit style value [1,40] */
107721 int nice_rlim = nice_to_rlimit(nice);
107722
107723+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
107724+
107725 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
107726 capable(CAP_SYS_NICE));
107727 }
107728@@ -3155,7 +3159,8 @@ SYSCALL_DEFINE1(nice, int, increment)
107729 nice = task_nice(current) + increment;
107730
107731 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
107732- if (increment < 0 && !can_nice(current, nice))
107733+ if (increment < 0 && (!can_nice(current, nice) ||
107734+ gr_handle_chroot_nice()))
107735 return -EPERM;
107736
107737 retval = security_task_setnice(current, nice);
107738@@ -3467,6 +3472,7 @@ recheck:
107739 if (policy != p->policy && !rlim_rtprio)
107740 return -EPERM;
107741
107742+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
107743 /* can't increase priority */
107744 if (attr->sched_priority > p->rt_priority &&
107745 attr->sched_priority > rlim_rtprio)
107746@@ -4950,6 +4956,7 @@ void idle_task_exit(void)
107747
107748 if (mm != &init_mm) {
107749 switch_mm(mm, &init_mm, current);
107750+ populate_stack();
107751 finish_arch_post_lock_switch();
107752 }
107753 mmdrop(mm);
107754@@ -5045,7 +5052,7 @@ static void migrate_tasks(unsigned int dead_cpu)
107755
107756 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
107757
107758-static struct ctl_table sd_ctl_dir[] = {
107759+static ctl_table_no_const sd_ctl_dir[] __read_only = {
107760 {
107761 .procname = "sched_domain",
107762 .mode = 0555,
107763@@ -5062,17 +5069,17 @@ static struct ctl_table sd_ctl_root[] = {
107764 {}
107765 };
107766
107767-static struct ctl_table *sd_alloc_ctl_entry(int n)
107768+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
107769 {
107770- struct ctl_table *entry =
107771+ ctl_table_no_const *entry =
107772 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
107773
107774 return entry;
107775 }
107776
107777-static void sd_free_ctl_entry(struct ctl_table **tablep)
107778+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
107779 {
107780- struct ctl_table *entry;
107781+ ctl_table_no_const *entry;
107782
107783 /*
107784 * In the intermediate directories, both the child directory and
107785@@ -5080,22 +5087,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
107786 * will always be set. In the lowest directory the names are
107787 * static strings and all have proc handlers.
107788 */
107789- for (entry = *tablep; entry->mode; entry++) {
107790- if (entry->child)
107791- sd_free_ctl_entry(&entry->child);
107792+ for (entry = tablep; entry->mode; entry++) {
107793+ if (entry->child) {
107794+ sd_free_ctl_entry(entry->child);
107795+ pax_open_kernel();
107796+ entry->child = NULL;
107797+ pax_close_kernel();
107798+ }
107799 if (entry->proc_handler == NULL)
107800 kfree(entry->procname);
107801 }
107802
107803- kfree(*tablep);
107804- *tablep = NULL;
107805+ kfree(tablep);
107806 }
107807
107808 static int min_load_idx = 0;
107809 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
107810
107811 static void
107812-set_table_entry(struct ctl_table *entry,
107813+set_table_entry(ctl_table_no_const *entry,
107814 const char *procname, void *data, int maxlen,
107815 umode_t mode, proc_handler *proc_handler,
107816 bool load_idx)
107817@@ -5115,7 +5125,7 @@ set_table_entry(struct ctl_table *entry,
107818 static struct ctl_table *
107819 sd_alloc_ctl_domain_table(struct sched_domain *sd)
107820 {
107821- struct ctl_table *table = sd_alloc_ctl_entry(14);
107822+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
107823
107824 if (table == NULL)
107825 return NULL;
107826@@ -5153,9 +5163,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
107827 return table;
107828 }
107829
107830-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
107831+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
107832 {
107833- struct ctl_table *entry, *table;
107834+ ctl_table_no_const *entry, *table;
107835 struct sched_domain *sd;
107836 int domain_num = 0, i;
107837 char buf[32];
107838@@ -5182,11 +5192,13 @@ static struct ctl_table_header *sd_sysctl_header;
107839 static void register_sched_domain_sysctl(void)
107840 {
107841 int i, cpu_num = num_possible_cpus();
107842- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
107843+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
107844 char buf[32];
107845
107846 WARN_ON(sd_ctl_dir[0].child);
107847+ pax_open_kernel();
107848 sd_ctl_dir[0].child = entry;
107849+ pax_close_kernel();
107850
107851 if (entry == NULL)
107852 return;
107853@@ -5209,8 +5221,12 @@ static void unregister_sched_domain_sysctl(void)
107854 if (sd_sysctl_header)
107855 unregister_sysctl_table(sd_sysctl_header);
107856 sd_sysctl_header = NULL;
107857- if (sd_ctl_dir[0].child)
107858- sd_free_ctl_entry(&sd_ctl_dir[0].child);
107859+ if (sd_ctl_dir[0].child) {
107860+ sd_free_ctl_entry(sd_ctl_dir[0].child);
107861+ pax_open_kernel();
107862+ sd_ctl_dir[0].child = NULL;
107863+ pax_close_kernel();
107864+ }
107865 }
107866 #else
107867 static void register_sched_domain_sysctl(void)
107868diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
107869index c2980e8..4737a6d 100644
107870--- a/kernel/sched/fair.c
107871+++ b/kernel/sched/fair.c
107872@@ -2107,7 +2107,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
107873
107874 static void reset_ptenuma_scan(struct task_struct *p)
107875 {
107876- ACCESS_ONCE(p->mm->numa_scan_seq)++;
107877+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
107878 p->mm->numa_scan_offset = 0;
107879 }
107880
107881@@ -7753,7 +7753,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
107882 * run_rebalance_domains is triggered when needed from the scheduler tick.
107883 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
107884 */
107885-static void run_rebalance_domains(struct softirq_action *h)
107886+static __latent_entropy void run_rebalance_domains(void)
107887 {
107888 struct rq *this_rq = this_rq();
107889 enum cpu_idle_type idle = this_rq->idle_balance ?
107890diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
107891index e0e1299..e1e896b 100644
107892--- a/kernel/sched/sched.h
107893+++ b/kernel/sched/sched.h
107894@@ -1219,7 +1219,7 @@ struct sched_class {
107895 #ifdef CONFIG_FAIR_GROUP_SCHED
107896 void (*task_move_group) (struct task_struct *p, int on_rq);
107897 #endif
107898-};
107899+} __do_const;
107900
107901 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
107902 {
107903diff --git a/kernel/signal.c b/kernel/signal.c
107904index 0206be7..6445784 100644
107905--- a/kernel/signal.c
107906+++ b/kernel/signal.c
107907@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
107908
107909 int print_fatal_signals __read_mostly;
107910
107911-static void __user *sig_handler(struct task_struct *t, int sig)
107912+static __sighandler_t sig_handler(struct task_struct *t, int sig)
107913 {
107914 return t->sighand->action[sig - 1].sa.sa_handler;
107915 }
107916
107917-static int sig_handler_ignored(void __user *handler, int sig)
107918+static int sig_handler_ignored(__sighandler_t handler, int sig)
107919 {
107920 /* Is it explicitly or implicitly ignored? */
107921 return handler == SIG_IGN ||
107922@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
107923
107924 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
107925 {
107926- void __user *handler;
107927+ __sighandler_t handler;
107928
107929 handler = sig_handler(t, sig);
107930
107931@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
107932 atomic_inc(&user->sigpending);
107933 rcu_read_unlock();
107934
107935+ if (!override_rlimit)
107936+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
107937+
107938 if (override_rlimit ||
107939 atomic_read(&user->sigpending) <=
107940 task_rlimit(t, RLIMIT_SIGPENDING)) {
107941@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
107942
107943 int unhandled_signal(struct task_struct *tsk, int sig)
107944 {
107945- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
107946+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
107947 if (is_global_init(tsk))
107948 return 1;
107949 if (handler != SIG_IGN && handler != SIG_DFL)
107950@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
107951 }
107952 }
107953
107954+ /* allow glibc communication via tgkill to other threads in our
107955+ thread group */
107956+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
107957+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
107958+ && gr_handle_signal(t, sig))
107959+ return -EPERM;
107960+
107961 return security_task_kill(t, info, sig, 0);
107962 }
107963
107964@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
107965 return send_signal(sig, info, p, 1);
107966 }
107967
107968-static int
107969+int
107970 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107971 {
107972 return send_signal(sig, info, t, 0);
107973@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107974 unsigned long int flags;
107975 int ret, blocked, ignored;
107976 struct k_sigaction *action;
107977+ int is_unhandled = 0;
107978
107979 spin_lock_irqsave(&t->sighand->siglock, flags);
107980 action = &t->sighand->action[sig-1];
107981@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
107982 }
107983 if (action->sa.sa_handler == SIG_DFL)
107984 t->signal->flags &= ~SIGNAL_UNKILLABLE;
107985+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
107986+ is_unhandled = 1;
107987 ret = specific_send_sig_info(sig, info, t);
107988 spin_unlock_irqrestore(&t->sighand->siglock, flags);
107989
107990+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
107991+ normal operation */
107992+ if (is_unhandled) {
107993+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
107994+ gr_handle_crash(t, sig);
107995+ }
107996+
107997 return ret;
107998 }
107999
108000@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
108001 ret = check_kill_permission(sig, info, p);
108002 rcu_read_unlock();
108003
108004- if (!ret && sig)
108005+ if (!ret && sig) {
108006 ret = do_send_sig_info(sig, info, p, true);
108007+ if (!ret)
108008+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
108009+ }
108010
108011 return ret;
108012 }
108013@@ -2918,7 +2941,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
108014 int error = -ESRCH;
108015
108016 rcu_read_lock();
108017- p = find_task_by_vpid(pid);
108018+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
108019+ /* allow glibc communication via tgkill to other threads in our
108020+ thread group */
108021+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
108022+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
108023+ p = find_task_by_vpid_unrestricted(pid);
108024+ else
108025+#endif
108026+ p = find_task_by_vpid(pid);
108027 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
108028 error = check_kill_permission(sig, info, p);
108029 /*
108030@@ -3247,8 +3278,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
108031 }
108032 seg = get_fs();
108033 set_fs(KERNEL_DS);
108034- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
108035- (stack_t __force __user *) &uoss,
108036+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
108037+ (stack_t __force_user *) &uoss,
108038 compat_user_stack_pointer());
108039 set_fs(seg);
108040 if (ret >= 0 && uoss_ptr) {
108041diff --git a/kernel/smpboot.c b/kernel/smpboot.c
108042index c697f73..4ef1c25 100644
108043--- a/kernel/smpboot.c
108044+++ b/kernel/smpboot.c
108045@@ -291,7 +291,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
108046 }
108047 smpboot_unpark_thread(plug_thread, cpu);
108048 }
108049- list_add(&plug_thread->list, &hotplug_threads);
108050+ pax_list_add(&plug_thread->list, &hotplug_threads);
108051 out:
108052 mutex_unlock(&smpboot_threads_lock);
108053 put_online_cpus();
108054@@ -309,7 +309,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
108055 {
108056 get_online_cpus();
108057 mutex_lock(&smpboot_threads_lock);
108058- list_del(&plug_thread->list);
108059+ pax_list_del(&plug_thread->list);
108060 smpboot_destroy_threads(plug_thread);
108061 mutex_unlock(&smpboot_threads_lock);
108062 put_online_cpus();
108063diff --git a/kernel/softirq.c b/kernel/softirq.c
108064index 479e443..66d845e1 100644
108065--- a/kernel/softirq.c
108066+++ b/kernel/softirq.c
108067@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
108068 EXPORT_SYMBOL(irq_stat);
108069 #endif
108070
108071-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
108072+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
108073
108074 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
108075
108076@@ -270,7 +270,7 @@ restart:
108077 kstat_incr_softirqs_this_cpu(vec_nr);
108078
108079 trace_softirq_entry(vec_nr);
108080- h->action(h);
108081+ h->action();
108082 trace_softirq_exit(vec_nr);
108083 if (unlikely(prev_count != preempt_count())) {
108084 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
108085@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
108086 or_softirq_pending(1UL << nr);
108087 }
108088
108089-void open_softirq(int nr, void (*action)(struct softirq_action *))
108090+void __init open_softirq(int nr, void (*action)(void))
108091 {
108092 softirq_vec[nr].action = action;
108093 }
108094@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
108095 }
108096 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
108097
108098-static void tasklet_action(struct softirq_action *a)
108099+static void tasklet_action(void)
108100 {
108101 struct tasklet_struct *list;
108102
108103@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
108104 }
108105 }
108106
108107-static void tasklet_hi_action(struct softirq_action *a)
108108+static __latent_entropy void tasklet_hi_action(void)
108109 {
108110 struct tasklet_struct *list;
108111
108112@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
108113 .notifier_call = cpu_callback
108114 };
108115
108116-static struct smp_hotplug_thread softirq_threads = {
108117+static struct smp_hotplug_thread softirq_threads __read_only = {
108118 .store = &ksoftirqd,
108119 .thread_should_run = ksoftirqd_should_run,
108120 .thread_fn = run_ksoftirqd,
108121diff --git a/kernel/sys.c b/kernel/sys.c
108122index a4e372b..766810e 100644
108123--- a/kernel/sys.c
108124+++ b/kernel/sys.c
108125@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
108126 error = -EACCES;
108127 goto out;
108128 }
108129+
108130+ if (gr_handle_chroot_setpriority(p, niceval)) {
108131+ error = -EACCES;
108132+ goto out;
108133+ }
108134+
108135 no_nice = security_task_setnice(p, niceval);
108136 if (no_nice) {
108137 error = no_nice;
108138@@ -366,6 +372,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
108139 goto error;
108140 }
108141
108142+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
108143+ goto error;
108144+
108145+ if (!gid_eq(new->gid, old->gid)) {
108146+ /* make sure we generate a learn log for what will
108147+ end up being a role transition after a full-learning
108148+ policy is generated
108149+ CAP_SETGID is required to perform a transition
108150+ we may not log a CAP_SETGID check above, e.g.
108151+ in the case where new rgid = old egid
108152+ */
108153+ gr_learn_cap(current, new, CAP_SETGID);
108154+ }
108155+
108156 if (rgid != (gid_t) -1 ||
108157 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
108158 new->sgid = new->egid;
108159@@ -401,6 +421,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
108160 old = current_cred();
108161
108162 retval = -EPERM;
108163+
108164+ if (gr_check_group_change(kgid, kgid, kgid))
108165+ goto error;
108166+
108167 if (ns_capable(old->user_ns, CAP_SETGID))
108168 new->gid = new->egid = new->sgid = new->fsgid = kgid;
108169 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
108170@@ -418,7 +442,7 @@ error:
108171 /*
108172 * change the user struct in a credentials set to match the new UID
108173 */
108174-static int set_user(struct cred *new)
108175+int set_user(struct cred *new)
108176 {
108177 struct user_struct *new_user;
108178
108179@@ -498,7 +522,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
108180 goto error;
108181 }
108182
108183+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
108184+ goto error;
108185+
108186 if (!uid_eq(new->uid, old->uid)) {
108187+ /* make sure we generate a learn log for what will
108188+ end up being a role transition after a full-learning
108189+ policy is generated
108190+ CAP_SETUID is required to perform a transition
108191+ we may not log a CAP_SETUID check above, e.g.
108192+ in the case where new ruid = old euid
108193+ */
108194+ gr_learn_cap(current, new, CAP_SETUID);
108195 retval = set_user(new);
108196 if (retval < 0)
108197 goto error;
108198@@ -548,6 +583,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
108199 old = current_cred();
108200
108201 retval = -EPERM;
108202+
108203+ if (gr_check_crash_uid(kuid))
108204+ goto error;
108205+ if (gr_check_user_change(kuid, kuid, kuid))
108206+ goto error;
108207+
108208 if (ns_capable(old->user_ns, CAP_SETUID)) {
108209 new->suid = new->uid = kuid;
108210 if (!uid_eq(kuid, old->uid)) {
108211@@ -617,6 +658,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
108212 goto error;
108213 }
108214
108215+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
108216+ goto error;
108217+
108218 if (ruid != (uid_t) -1) {
108219 new->uid = kruid;
108220 if (!uid_eq(kruid, old->uid)) {
108221@@ -701,6 +745,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
108222 goto error;
108223 }
108224
108225+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
108226+ goto error;
108227+
108228 if (rgid != (gid_t) -1)
108229 new->gid = krgid;
108230 if (egid != (gid_t) -1)
108231@@ -765,12 +812,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
108232 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
108233 ns_capable(old->user_ns, CAP_SETUID)) {
108234 if (!uid_eq(kuid, old->fsuid)) {
108235+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
108236+ goto error;
108237+
108238 new->fsuid = kuid;
108239 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
108240 goto change_okay;
108241 }
108242 }
108243
108244+error:
108245 abort_creds(new);
108246 return old_fsuid;
108247
108248@@ -803,12 +854,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
108249 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
108250 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
108251 ns_capable(old->user_ns, CAP_SETGID)) {
108252+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
108253+ goto error;
108254+
108255 if (!gid_eq(kgid, old->fsgid)) {
108256 new->fsgid = kgid;
108257 goto change_okay;
108258 }
108259 }
108260
108261+error:
108262 abort_creds(new);
108263 return old_fsgid;
108264
108265@@ -1187,19 +1242,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
108266 return -EFAULT;
108267
108268 down_read(&uts_sem);
108269- error = __copy_to_user(&name->sysname, &utsname()->sysname,
108270+ error = __copy_to_user(name->sysname, &utsname()->sysname,
108271 __OLD_UTS_LEN);
108272 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
108273- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
108274+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
108275 __OLD_UTS_LEN);
108276 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
108277- error |= __copy_to_user(&name->release, &utsname()->release,
108278+ error |= __copy_to_user(name->release, &utsname()->release,
108279 __OLD_UTS_LEN);
108280 error |= __put_user(0, name->release + __OLD_UTS_LEN);
108281- error |= __copy_to_user(&name->version, &utsname()->version,
108282+ error |= __copy_to_user(name->version, &utsname()->version,
108283 __OLD_UTS_LEN);
108284 error |= __put_user(0, name->version + __OLD_UTS_LEN);
108285- error |= __copy_to_user(&name->machine, &utsname()->machine,
108286+ error |= __copy_to_user(name->machine, &utsname()->machine,
108287 __OLD_UTS_LEN);
108288 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
108289 up_read(&uts_sem);
108290@@ -1400,6 +1455,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
108291 */
108292 new_rlim->rlim_cur = 1;
108293 }
108294+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
108295+ is changed to a lower value. Since tasks can be created by the same
108296+ user in between this limit change and an execve by this task, force
108297+ a recheck only for this task by setting PF_NPROC_EXCEEDED
108298+ */
108299+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
108300+ tsk->flags |= PF_NPROC_EXCEEDED;
108301 }
108302 if (!retval) {
108303 if (old_rlim)
108304diff --git a/kernel/sysctl.c b/kernel/sysctl.c
108305index c3eee4c..586e4a0 100644
108306--- a/kernel/sysctl.c
108307+++ b/kernel/sysctl.c
108308@@ -94,7 +94,6 @@
108309 #endif
108310
108311 #if defined(CONFIG_SYSCTL)
108312-
108313 /* External variables not in a header file. */
108314 extern int suid_dumpable;
108315 #ifdef CONFIG_COREDUMP
108316@@ -111,22 +110,24 @@ extern int sysctl_nr_open_min, sysctl_nr_open_max;
108317 #ifndef CONFIG_MMU
108318 extern int sysctl_nr_trim_pages;
108319 #endif
108320+extern int sysctl_modify_ldt;
108321
108322 /* Constants used for minimum and maximum */
108323 #ifdef CONFIG_LOCKUP_DETECTOR
108324-static int sixty = 60;
108325+static int sixty __read_only = 60;
108326 #endif
108327
108328-static int __maybe_unused neg_one = -1;
108329+static int __maybe_unused neg_one __read_only = -1;
108330
108331-static int zero;
108332-static int __maybe_unused one = 1;
108333-static int __maybe_unused two = 2;
108334-static int __maybe_unused four = 4;
108335-static unsigned long one_ul = 1;
108336-static int one_hundred = 100;
108337+static int zero __read_only = 0;
108338+static int __maybe_unused one __read_only = 1;
108339+static int __maybe_unused two __read_only = 2;
108340+static int __maybe_unused three __read_only = 3;
108341+static int __maybe_unused four __read_only = 4;
108342+static unsigned long one_ul __read_only = 1;
108343+static int one_hundred __read_only = 100;
108344 #ifdef CONFIG_PRINTK
108345-static int ten_thousand = 10000;
108346+static int ten_thousand __read_only = 10000;
108347 #endif
108348
108349 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
108350@@ -180,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
108351 void __user *buffer, size_t *lenp, loff_t *ppos);
108352 #endif
108353
108354-#ifdef CONFIG_PRINTK
108355-static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
108356+static int proc_dointvec_minmax_secure_sysadmin(struct ctl_table *table, int write,
108357 void __user *buffer, size_t *lenp, loff_t *ppos);
108358-#endif
108359
108360 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
108361 void __user *buffer, size_t *lenp, loff_t *ppos);
108362@@ -214,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
108363
108364 #endif
108365
108366+extern struct ctl_table grsecurity_table[];
108367+
108368 static struct ctl_table kern_table[];
108369 static struct ctl_table vm_table[];
108370 static struct ctl_table fs_table[];
108371@@ -228,6 +229,20 @@ extern struct ctl_table epoll_table[];
108372 int sysctl_legacy_va_layout;
108373 #endif
108374
108375+#ifdef CONFIG_PAX_SOFTMODE
108376+static struct ctl_table pax_table[] = {
108377+ {
108378+ .procname = "softmode",
108379+ .data = &pax_softmode,
108380+ .maxlen = sizeof(unsigned int),
108381+ .mode = 0600,
108382+ .proc_handler = &proc_dointvec,
108383+ },
108384+
108385+ { }
108386+};
108387+#endif
108388+
108389 /* The default sysctl tables: */
108390
108391 static struct ctl_table sysctl_base_table[] = {
108392@@ -276,6 +291,22 @@ static int max_extfrag_threshold = 1000;
108393 #endif
108394
108395 static struct ctl_table kern_table[] = {
108396+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
108397+ {
108398+ .procname = "grsecurity",
108399+ .mode = 0500,
108400+ .child = grsecurity_table,
108401+ },
108402+#endif
108403+
108404+#ifdef CONFIG_PAX_SOFTMODE
108405+ {
108406+ .procname = "pax",
108407+ .mode = 0500,
108408+ .child = pax_table,
108409+ },
108410+#endif
108411+
108412 {
108413 .procname = "sched_child_runs_first",
108414 .data = &sysctl_sched_child_runs_first,
108415@@ -637,7 +668,7 @@ static struct ctl_table kern_table[] = {
108416 .maxlen = sizeof(int),
108417 .mode = 0644,
108418 /* only handle a transition from default "0" to "1" */
108419- .proc_handler = proc_dointvec_minmax,
108420+ .proc_handler = proc_dointvec_minmax_secure,
108421 .extra1 = &one,
108422 .extra2 = &one,
108423 },
108424@@ -648,7 +679,7 @@ static struct ctl_table kern_table[] = {
108425 .data = &modprobe_path,
108426 .maxlen = KMOD_PATH_LEN,
108427 .mode = 0644,
108428- .proc_handler = proc_dostring,
108429+ .proc_handler = proc_dostring_modpriv,
108430 },
108431 {
108432 .procname = "modules_disabled",
108433@@ -656,7 +687,7 @@ static struct ctl_table kern_table[] = {
108434 .maxlen = sizeof(int),
108435 .mode = 0644,
108436 /* only handle a transition from default "0" to "1" */
108437- .proc_handler = proc_dointvec_minmax,
108438+ .proc_handler = proc_dointvec_minmax_secure,
108439 .extra1 = &one,
108440 .extra2 = &one,
108441 },
108442@@ -811,20 +842,24 @@ static struct ctl_table kern_table[] = {
108443 .data = &dmesg_restrict,
108444 .maxlen = sizeof(int),
108445 .mode = 0644,
108446- .proc_handler = proc_dointvec_minmax_sysadmin,
108447+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108448 .extra1 = &zero,
108449 .extra2 = &one,
108450 },
108451+#endif
108452 {
108453 .procname = "kptr_restrict",
108454 .data = &kptr_restrict,
108455 .maxlen = sizeof(int),
108456 .mode = 0644,
108457- .proc_handler = proc_dointvec_minmax_sysadmin,
108458+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108459+#ifdef CONFIG_GRKERNSEC_HIDESYM
108460+ .extra1 = &two,
108461+#else
108462 .extra1 = &zero,
108463+#endif
108464 .extra2 = &two,
108465 },
108466-#endif
108467 {
108468 .procname = "ngroups_max",
108469 .data = &ngroups_max,
108470@@ -962,6 +997,15 @@ static struct ctl_table kern_table[] = {
108471 .mode = 0644,
108472 .proc_handler = proc_dointvec,
108473 },
108474+ {
108475+ .procname = "modify_ldt",
108476+ .data = &sysctl_modify_ldt,
108477+ .maxlen = sizeof(int),
108478+ .mode = 0644,
108479+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108480+ .extra1 = &zero,
108481+ .extra2 = &one,
108482+ },
108483 #endif
108484 #if defined(CONFIG_MMU)
108485 {
108486@@ -1084,10 +1128,17 @@ static struct ctl_table kern_table[] = {
108487 */
108488 {
108489 .procname = "perf_event_paranoid",
108490- .data = &sysctl_perf_event_paranoid,
108491- .maxlen = sizeof(sysctl_perf_event_paranoid),
108492+ .data = &sysctl_perf_event_legitimately_concerned,
108493+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
108494 .mode = 0644,
108495- .proc_handler = proc_dointvec,
108496+ /* go ahead, be a hero */
108497+ .proc_handler = proc_dointvec_minmax_secure_sysadmin,
108498+ .extra1 = &neg_one,
108499+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
108500+ .extra2 = &three,
108501+#else
108502+ .extra2 = &two,
108503+#endif
108504 },
108505 {
108506 .procname = "perf_event_mlock_kb",
108507@@ -1369,6 +1420,13 @@ static struct ctl_table vm_table[] = {
108508 .proc_handler = proc_dointvec_minmax,
108509 .extra1 = &zero,
108510 },
108511+ {
108512+ .procname = "heap_stack_gap",
108513+ .data = &sysctl_heap_stack_gap,
108514+ .maxlen = sizeof(sysctl_heap_stack_gap),
108515+ .mode = 0644,
108516+ .proc_handler = proc_doulongvec_minmax,
108517+ },
108518 #else
108519 {
108520 .procname = "nr_trim_pages",
108521@@ -1845,6 +1903,16 @@ int proc_dostring(struct ctl_table *table, int write,
108522 (char __user *)buffer, lenp, ppos);
108523 }
108524
108525+int proc_dostring_modpriv(struct ctl_table *table, int write,
108526+ void __user *buffer, size_t *lenp, loff_t *ppos)
108527+{
108528+ if (write && !capable(CAP_SYS_MODULE))
108529+ return -EPERM;
108530+
108531+ return _proc_do_string(table->data, table->maxlen, write,
108532+ buffer, lenp, ppos);
108533+}
108534+
108535 static size_t proc_skip_spaces(char **buf)
108536 {
108537 size_t ret;
108538@@ -1950,6 +2018,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
108539 len = strlen(tmp);
108540 if (len > *size)
108541 len = *size;
108542+ if (len > sizeof(tmp))
108543+ len = sizeof(tmp);
108544 if (copy_to_user(*buf, tmp, len))
108545 return -EFAULT;
108546 *size -= len;
108547@@ -2128,6 +2198,44 @@ int proc_dointvec(struct ctl_table *table, int write,
108548 NULL,NULL);
108549 }
108550
108551+static int do_proc_dointvec_conv_secure(bool *negp, unsigned long *lvalp,
108552+ int *valp,
108553+ int write, void *data)
108554+{
108555+ if (write) {
108556+ if (*negp) {
108557+ if (*lvalp > (unsigned long) INT_MAX + 1)
108558+ return -EINVAL;
108559+ pax_open_kernel();
108560+ *valp = -*lvalp;
108561+ pax_close_kernel();
108562+ } else {
108563+ if (*lvalp > (unsigned long) INT_MAX)
108564+ return -EINVAL;
108565+ pax_open_kernel();
108566+ *valp = *lvalp;
108567+ pax_close_kernel();
108568+ }
108569+ } else {
108570+ int val = *valp;
108571+ if (val < 0) {
108572+ *negp = true;
108573+ *lvalp = (unsigned long)-val;
108574+ } else {
108575+ *negp = false;
108576+ *lvalp = (unsigned long)val;
108577+ }
108578+ }
108579+ return 0;
108580+}
108581+
108582+int proc_dointvec_secure(struct ctl_table *table, int write,
108583+ void __user *buffer, size_t *lenp, loff_t *ppos)
108584+{
108585+ return do_proc_dointvec(table,write,buffer,lenp,ppos,
108586+ do_proc_dointvec_conv_secure,NULL);
108587+}
108588+
108589 /*
108590 * Taint values can only be increased
108591 * This means we can safely use a temporary.
108592@@ -2135,7 +2243,7 @@ int proc_dointvec(struct ctl_table *table, int write,
108593 static int proc_taint(struct ctl_table *table, int write,
108594 void __user *buffer, size_t *lenp, loff_t *ppos)
108595 {
108596- struct ctl_table t;
108597+ ctl_table_no_const t;
108598 unsigned long tmptaint = get_taint();
108599 int err;
108600
108601@@ -2163,16 +2271,14 @@ static int proc_taint(struct ctl_table *table, int write,
108602 return err;
108603 }
108604
108605-#ifdef CONFIG_PRINTK
108606-static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
108607+static int proc_dointvec_minmax_secure_sysadmin(struct ctl_table *table, int write,
108608 void __user *buffer, size_t *lenp, loff_t *ppos)
108609 {
108610 if (write && !capable(CAP_SYS_ADMIN))
108611 return -EPERM;
108612
108613- return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
108614+ return proc_dointvec_minmax_secure(table, write, buffer, lenp, ppos);
108615 }
108616-#endif
108617
108618 struct do_proc_dointvec_minmax_conv_param {
108619 int *min;
108620@@ -2203,6 +2309,32 @@ static int do_proc_dointvec_minmax_conv(bool *negp, unsigned long *lvalp,
108621 return 0;
108622 }
108623
108624+static int do_proc_dointvec_minmax_conv_secure(bool *negp, unsigned long *lvalp,
108625+ int *valp,
108626+ int write, void *data)
108627+{
108628+ struct do_proc_dointvec_minmax_conv_param *param = data;
108629+ if (write) {
108630+ int val = *negp ? -*lvalp : *lvalp;
108631+ if ((param->min && *param->min > val) ||
108632+ (param->max && *param->max < val))
108633+ return -EINVAL;
108634+ pax_open_kernel();
108635+ *valp = val;
108636+ pax_close_kernel();
108637+ } else {
108638+ int val = *valp;
108639+ if (val < 0) {
108640+ *negp = true;
108641+ *lvalp = (unsigned long)-val;
108642+ } else {
108643+ *negp = false;
108644+ *lvalp = (unsigned long)val;
108645+ }
108646+ }
108647+ return 0;
108648+}
108649+
108650 /**
108651 * proc_dointvec_minmax - read a vector of integers with min/max values
108652 * @table: the sysctl table
108653@@ -2230,6 +2362,17 @@ int proc_dointvec_minmax(struct ctl_table *table, int write,
108654 do_proc_dointvec_minmax_conv, &param);
108655 }
108656
108657+int proc_dointvec_minmax_secure(struct ctl_table *table, int write,
108658+ void __user *buffer, size_t *lenp, loff_t *ppos)
108659+{
108660+ struct do_proc_dointvec_minmax_conv_param param = {
108661+ .min = (int *) table->extra1,
108662+ .max = (int *) table->extra2,
108663+ };
108664+ return do_proc_dointvec(table, write, buffer, lenp, ppos,
108665+ do_proc_dointvec_minmax_conv_secure, &param);
108666+}
108667+
108668 static void validate_coredump_safety(void)
108669 {
108670 #ifdef CONFIG_COREDUMP
108671@@ -2732,6 +2875,12 @@ int proc_dostring(struct ctl_table *table, int write,
108672 return -ENOSYS;
108673 }
108674
108675+int proc_dostring_modpriv(struct ctl_table *table, int write,
108676+ void __user *buffer, size_t *lenp, loff_t *ppos)
108677+{
108678+ return -ENOSYS;
108679+}
108680+
108681 int proc_dointvec(struct ctl_table *table, int write,
108682 void __user *buffer, size_t *lenp, loff_t *ppos)
108683 {
108684@@ -2788,5 +2937,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
108685 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
108686 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
108687 EXPORT_SYMBOL(proc_dostring);
108688+EXPORT_SYMBOL(proc_dostring_modpriv);
108689 EXPORT_SYMBOL(proc_doulongvec_minmax);
108690 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
108691diff --git a/kernel/taskstats.c b/kernel/taskstats.c
108692index 21f82c2..c1984e5 100644
108693--- a/kernel/taskstats.c
108694+++ b/kernel/taskstats.c
108695@@ -28,9 +28,12 @@
108696 #include <linux/fs.h>
108697 #include <linux/file.h>
108698 #include <linux/pid_namespace.h>
108699+#include <linux/grsecurity.h>
108700 #include <net/genetlink.h>
108701 #include <linux/atomic.h>
108702
108703+extern int gr_is_taskstats_denied(int pid);
108704+
108705 /*
108706 * Maximum length of a cpumask that can be specified in
108707 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
108708@@ -567,6 +570,9 @@ err:
108709
108710 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
108711 {
108712+ if (gr_is_taskstats_denied(current->pid))
108713+ return -EACCES;
108714+
108715 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
108716 return cmd_attr_register_cpumask(info);
108717 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
108718diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
108719index 1b001ed..55ef9e4 100644
108720--- a/kernel/time/alarmtimer.c
108721+++ b/kernel/time/alarmtimer.c
108722@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
108723 struct platform_device *pdev;
108724 int error = 0;
108725 int i;
108726- struct k_clock alarm_clock = {
108727+ static struct k_clock alarm_clock = {
108728 .clock_getres = alarm_clock_getres,
108729 .clock_get = alarm_clock_get,
108730 .timer_create = alarm_timer_create,
108731diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
108732index 93ef7190..7c85701 100644
108733--- a/kernel/time/hrtimer.c
108734+++ b/kernel/time/hrtimer.c
108735@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
108736 local_irq_restore(flags);
108737 }
108738
108739-static void run_hrtimer_softirq(struct softirq_action *h)
108740+static __latent_entropy void run_hrtimer_softirq(void)
108741 {
108742 hrtimer_peek_ahead_timers();
108743 }
108744diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
108745index 0075da7..63cc872 100644
108746--- a/kernel/time/posix-cpu-timers.c
108747+++ b/kernel/time/posix-cpu-timers.c
108748@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
108749
108750 static __init int init_posix_cpu_timers(void)
108751 {
108752- struct k_clock process = {
108753+ static struct k_clock process = {
108754 .clock_getres = process_cpu_clock_getres,
108755 .clock_get = process_cpu_clock_get,
108756 .timer_create = process_cpu_timer_create,
108757 .nsleep = process_cpu_nsleep,
108758 .nsleep_restart = process_cpu_nsleep_restart,
108759 };
108760- struct k_clock thread = {
108761+ static struct k_clock thread = {
108762 .clock_getres = thread_cpu_clock_getres,
108763 .clock_get = thread_cpu_clock_get,
108764 .timer_create = thread_cpu_timer_create,
108765diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
108766index 31ea01f..7fc61ef 100644
108767--- a/kernel/time/posix-timers.c
108768+++ b/kernel/time/posix-timers.c
108769@@ -43,6 +43,7 @@
108770 #include <linux/hash.h>
108771 #include <linux/posix-clock.h>
108772 #include <linux/posix-timers.h>
108773+#include <linux/grsecurity.h>
108774 #include <linux/syscalls.h>
108775 #include <linux/wait.h>
108776 #include <linux/workqueue.h>
108777@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
108778 * which we beg off on and pass to do_sys_settimeofday().
108779 */
108780
108781-static struct k_clock posix_clocks[MAX_CLOCKS];
108782+static struct k_clock *posix_clocks[MAX_CLOCKS];
108783
108784 /*
108785 * These ones are defined below.
108786@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
108787 */
108788 static __init int init_posix_timers(void)
108789 {
108790- struct k_clock clock_realtime = {
108791+ static struct k_clock clock_realtime = {
108792 .clock_getres = hrtimer_get_res,
108793 .clock_get = posix_clock_realtime_get,
108794 .clock_set = posix_clock_realtime_set,
108795@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
108796 .timer_get = common_timer_get,
108797 .timer_del = common_timer_del,
108798 };
108799- struct k_clock clock_monotonic = {
108800+ static struct k_clock clock_monotonic = {
108801 .clock_getres = hrtimer_get_res,
108802 .clock_get = posix_ktime_get_ts,
108803 .nsleep = common_nsleep,
108804@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
108805 .timer_get = common_timer_get,
108806 .timer_del = common_timer_del,
108807 };
108808- struct k_clock clock_monotonic_raw = {
108809+ static struct k_clock clock_monotonic_raw = {
108810 .clock_getres = hrtimer_get_res,
108811 .clock_get = posix_get_monotonic_raw,
108812 };
108813- struct k_clock clock_realtime_coarse = {
108814+ static struct k_clock clock_realtime_coarse = {
108815 .clock_getres = posix_get_coarse_res,
108816 .clock_get = posix_get_realtime_coarse,
108817 };
108818- struct k_clock clock_monotonic_coarse = {
108819+ static struct k_clock clock_monotonic_coarse = {
108820 .clock_getres = posix_get_coarse_res,
108821 .clock_get = posix_get_monotonic_coarse,
108822 };
108823- struct k_clock clock_tai = {
108824+ static struct k_clock clock_tai = {
108825 .clock_getres = hrtimer_get_res,
108826 .clock_get = posix_get_tai,
108827 .nsleep = common_nsleep,
108828@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
108829 .timer_get = common_timer_get,
108830 .timer_del = common_timer_del,
108831 };
108832- struct k_clock clock_boottime = {
108833+ static struct k_clock clock_boottime = {
108834 .clock_getres = hrtimer_get_res,
108835 .clock_get = posix_get_boottime,
108836 .nsleep = common_nsleep,
108837@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
108838 return;
108839 }
108840
108841- posix_clocks[clock_id] = *new_clock;
108842+ posix_clocks[clock_id] = new_clock;
108843 }
108844 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
108845
108846@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
108847 return (id & CLOCKFD_MASK) == CLOCKFD ?
108848 &clock_posix_dynamic : &clock_posix_cpu;
108849
108850- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
108851+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
108852 return NULL;
108853- return &posix_clocks[id];
108854+ return posix_clocks[id];
108855 }
108856
108857 static int common_timer_create(struct k_itimer *new_timer)
108858@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
108859 struct k_clock *kc = clockid_to_kclock(which_clock);
108860 struct k_itimer *new_timer;
108861 int error, new_timer_id;
108862- sigevent_t event;
108863+ sigevent_t event = { };
108864 int it_id_set = IT_ID_NOT_SET;
108865
108866 if (!kc)
108867@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
108868 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
108869 return -EFAULT;
108870
108871+ /* only the CLOCK_REALTIME clock can be set, all other clocks
108872+ have their clock_set fptr set to a nosettime dummy function
108873+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
108874+ call common_clock_set, which calls do_sys_settimeofday, which
108875+ we hook
108876+ */
108877+
108878 return kc->clock_set(which_clock, &new_tp);
108879 }
108880
108881diff --git a/kernel/time/time.c b/kernel/time/time.c
108882index 2c85b77..6530536 100644
108883--- a/kernel/time/time.c
108884+++ b/kernel/time/time.c
108885@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
108886 return error;
108887
108888 if (tz) {
108889+ /* we log in do_settimeofday called below, so don't log twice
108890+ */
108891+ if (!tv)
108892+ gr_log_timechange();
108893+
108894 sys_tz = *tz;
108895 update_vsyscall_tz();
108896 if (firsttime) {
108897diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
108898index 946acb7..1e13c0f 100644
108899--- a/kernel/time/timekeeping.c
108900+++ b/kernel/time/timekeeping.c
108901@@ -15,6 +15,7 @@
108902 #include <linux/init.h>
108903 #include <linux/mm.h>
108904 #include <linux/sched.h>
108905+#include <linux/grsecurity.h>
108906 #include <linux/syscore_ops.h>
108907 #include <linux/clocksource.h>
108908 #include <linux/jiffies.h>
108909@@ -915,6 +916,8 @@ int do_settimeofday64(const struct timespec64 *ts)
108910 if (!timespec64_valid_strict(ts))
108911 return -EINVAL;
108912
108913+ gr_log_timechange();
108914+
108915 raw_spin_lock_irqsave(&timekeeper_lock, flags);
108916 write_seqcount_begin(&tk_core.seq);
108917
108918diff --git a/kernel/time/timer.c b/kernel/time/timer.c
108919index 2ece3aa..055a295 100644
108920--- a/kernel/time/timer.c
108921+++ b/kernel/time/timer.c
108922@@ -1405,7 +1405,7 @@ void update_process_times(int user_tick)
108923 /*
108924 * This function runs timers and the timer-tq in bottom half context.
108925 */
108926-static void run_timer_softirq(struct softirq_action *h)
108927+static __latent_entropy void run_timer_softirq(void)
108928 {
108929 struct tvec_base *base = __this_cpu_read(tvec_bases);
108930
108931@@ -1468,7 +1468,7 @@ static void process_timeout(unsigned long __data)
108932 *
108933 * In all cases the return value is guaranteed to be non-negative.
108934 */
108935-signed long __sched schedule_timeout(signed long timeout)
108936+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
108937 {
108938 struct timer_list timer;
108939 unsigned long expire;
108940diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
108941index e878c2e..cf1546bb 100644
108942--- a/kernel/time/timer_list.c
108943+++ b/kernel/time/timer_list.c
108944@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
108945
108946 static void print_name_offset(struct seq_file *m, void *sym)
108947 {
108948+#ifdef CONFIG_GRKERNSEC_HIDESYM
108949+ SEQ_printf(m, "<%p>", NULL);
108950+#else
108951 char symname[KSYM_NAME_LEN];
108952
108953 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
108954 SEQ_printf(m, "<%pK>", sym);
108955 else
108956 SEQ_printf(m, "%s", symname);
108957+#endif
108958 }
108959
108960 static void
108961@@ -119,7 +123,11 @@ next_one:
108962 static void
108963 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
108964 {
108965+#ifdef CONFIG_GRKERNSEC_HIDESYM
108966+ SEQ_printf(m, " .base: %p\n", NULL);
108967+#else
108968 SEQ_printf(m, " .base: %pK\n", base);
108969+#endif
108970 SEQ_printf(m, " .index: %d\n",
108971 base->index);
108972 SEQ_printf(m, " .resolution: %Lu nsecs\n",
108973@@ -388,7 +396,11 @@ static int __init init_timer_list_procfs(void)
108974 {
108975 struct proc_dir_entry *pe;
108976
108977+#ifdef CONFIG_GRKERNSEC_PROC_ADD
108978+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
108979+#else
108980 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
108981+#endif
108982 if (!pe)
108983 return -ENOMEM;
108984 return 0;
108985diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
108986index 1fb08f2..ca4bb1e 100644
108987--- a/kernel/time/timer_stats.c
108988+++ b/kernel/time/timer_stats.c
108989@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
108990 static unsigned long nr_entries;
108991 static struct entry entries[MAX_ENTRIES];
108992
108993-static atomic_t overflow_count;
108994+static atomic_unchecked_t overflow_count;
108995
108996 /*
108997 * The entries are in a hash-table, for fast lookup:
108998@@ -140,7 +140,7 @@ static void reset_entries(void)
108999 nr_entries = 0;
109000 memset(entries, 0, sizeof(entries));
109001 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
109002- atomic_set(&overflow_count, 0);
109003+ atomic_set_unchecked(&overflow_count, 0);
109004 }
109005
109006 static struct entry *alloc_entry(void)
109007@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
109008 if (likely(entry))
109009 entry->count++;
109010 else
109011- atomic_inc(&overflow_count);
109012+ atomic_inc_unchecked(&overflow_count);
109013
109014 out_unlock:
109015 raw_spin_unlock_irqrestore(lock, flags);
109016@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
109017
109018 static void print_name_offset(struct seq_file *m, unsigned long addr)
109019 {
109020+#ifdef CONFIG_GRKERNSEC_HIDESYM
109021+ seq_printf(m, "<%p>", NULL);
109022+#else
109023 char symname[KSYM_NAME_LEN];
109024
109025 if (lookup_symbol_name(addr, symname) < 0)
109026- seq_printf(m, "<%p>", (void *)addr);
109027+ seq_printf(m, "<%pK>", (void *)addr);
109028 else
109029 seq_printf(m, "%s", symname);
109030+#endif
109031 }
109032
109033 static int tstats_show(struct seq_file *m, void *v)
109034@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
109035
109036 seq_puts(m, "Timer Stats Version: v0.3\n");
109037 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
109038- if (atomic_read(&overflow_count))
109039- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
109040+ if (atomic_read_unchecked(&overflow_count))
109041+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
109042 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
109043
109044 for (i = 0; i < nr_entries; i++) {
109045@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
109046 {
109047 struct proc_dir_entry *pe;
109048
109049+#ifdef CONFIG_GRKERNSEC_PROC_ADD
109050+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
109051+#else
109052 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
109053+#endif
109054 if (!pe)
109055 return -ENOMEM;
109056 return 0;
109057diff --git a/kernel/torture.c b/kernel/torture.c
109058index dd70993..0bf694b 100644
109059--- a/kernel/torture.c
109060+++ b/kernel/torture.c
109061@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
109062 mutex_lock(&fullstop_mutex);
109063 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
109064 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
109065- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
109066+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
109067 } else {
109068 pr_warn("Concurrent rmmod and shutdown illegal!\n");
109069 }
109070@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
109071 if (!torture_must_stop()) {
109072 if (stutter > 1) {
109073 schedule_timeout_interruptible(stutter - 1);
109074- ACCESS_ONCE(stutter_pause_test) = 2;
109075+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
109076 }
109077 schedule_timeout_interruptible(1);
109078- ACCESS_ONCE(stutter_pause_test) = 1;
109079+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
109080 }
109081 if (!torture_must_stop())
109082 schedule_timeout_interruptible(stutter);
109083- ACCESS_ONCE(stutter_pause_test) = 0;
109084+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
109085 torture_shutdown_absorb("torture_stutter");
109086 } while (!torture_must_stop());
109087 torture_kthread_stopping("torture_stutter");
109088@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
109089 schedule_timeout_uninterruptible(10);
109090 return true;
109091 }
109092- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
109093+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
109094 mutex_unlock(&fullstop_mutex);
109095 torture_shutdown_cleanup();
109096 torture_shuffle_cleanup();
109097diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
109098index 483cecf..ac46091 100644
109099--- a/kernel/trace/blktrace.c
109100+++ b/kernel/trace/blktrace.c
109101@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
109102 struct blk_trace *bt = filp->private_data;
109103 char buf[16];
109104
109105- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
109106+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
109107
109108 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
109109 }
109110@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
109111 return 1;
109112
109113 bt = buf->chan->private_data;
109114- atomic_inc(&bt->dropped);
109115+ atomic_inc_unchecked(&bt->dropped);
109116 return 0;
109117 }
109118
109119@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
109120
109121 bt->dir = dir;
109122 bt->dev = dev;
109123- atomic_set(&bt->dropped, 0);
109124+ atomic_set_unchecked(&bt->dropped, 0);
109125 INIT_LIST_HEAD(&bt->running_list);
109126
109127 ret = -EIO;
109128diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
109129index eb11011..43adc29 100644
109130--- a/kernel/trace/ftrace.c
109131+++ b/kernel/trace/ftrace.c
109132@@ -2413,12 +2413,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
109133 if (unlikely(ftrace_disabled))
109134 return 0;
109135
109136+ ret = ftrace_arch_code_modify_prepare();
109137+ FTRACE_WARN_ON(ret);
109138+ if (ret)
109139+ return 0;
109140+
109141 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
109142+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
109143 if (ret) {
109144 ftrace_bug(ret, rec);
109145- return 0;
109146 }
109147- return 1;
109148+ return ret ? 0 : 1;
109149 }
109150
109151 /*
109152@@ -4807,8 +4812,10 @@ static int ftrace_process_locs(struct module *mod,
109153 if (!count)
109154 return 0;
109155
109156+ pax_open_kernel();
109157 sort(start, count, sizeof(*start),
109158 ftrace_cmp_ips, ftrace_swap_ips);
109159+ pax_close_kernel();
109160
109161 start_pg = ftrace_allocate_pages(count);
109162 if (!start_pg)
109163@@ -5675,7 +5682,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
109164
109165 if (t->ret_stack == NULL) {
109166 atomic_set(&t->tracing_graph_pause, 0);
109167- atomic_set(&t->trace_overrun, 0);
109168+ atomic_set_unchecked(&t->trace_overrun, 0);
109169 t->curr_ret_stack = -1;
109170 /* Make sure the tasks see the -1 first: */
109171 smp_wmb();
109172@@ -5898,7 +5905,7 @@ static void
109173 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
109174 {
109175 atomic_set(&t->tracing_graph_pause, 0);
109176- atomic_set(&t->trace_overrun, 0);
109177+ atomic_set_unchecked(&t->trace_overrun, 0);
109178 t->ftrace_timestamp = 0;
109179 /* make curr_ret_stack visible before we add the ret_stack */
109180 smp_wmb();
109181diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
109182index 0315d43..2e5e9a2 100644
109183--- a/kernel/trace/ring_buffer.c
109184+++ b/kernel/trace/ring_buffer.c
109185@@ -348,9 +348,9 @@ struct buffer_data_page {
109186 */
109187 struct buffer_page {
109188 struct list_head list; /* list of buffer pages */
109189- local_t write; /* index for next write */
109190+ local_unchecked_t write; /* index for next write */
109191 unsigned read; /* index for next read */
109192- local_t entries; /* entries on this page */
109193+ local_unchecked_t entries; /* entries on this page */
109194 unsigned long real_end; /* real end of data */
109195 struct buffer_data_page *page; /* Actual data page */
109196 };
109197@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
109198 unsigned long last_overrun;
109199 local_t entries_bytes;
109200 local_t entries;
109201- local_t overrun;
109202- local_t commit_overrun;
109203- local_t dropped_events;
109204+ local_unchecked_t overrun;
109205+ local_unchecked_t commit_overrun;
109206+ local_unchecked_t dropped_events;
109207 local_t committing;
109208- local_t commits;
109209+ local_unchecked_t commits;
109210 unsigned long read;
109211 unsigned long read_bytes;
109212 u64 write_stamp;
109213@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
109214 *
109215 * We add a counter to the write field to denote this.
109216 */
109217- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
109218- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
109219+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
109220+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
109221
109222 /*
109223 * Just make sure we have seen our old_write and synchronize
109224@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
109225 * cmpxchg to only update if an interrupt did not already
109226 * do it for us. If the cmpxchg fails, we don't care.
109227 */
109228- (void)local_cmpxchg(&next_page->write, old_write, val);
109229- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
109230+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
109231+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
109232
109233 /*
109234 * No need to worry about races with clearing out the commit.
109235@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
109236
109237 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
109238 {
109239- return local_read(&bpage->entries) & RB_WRITE_MASK;
109240+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
109241 }
109242
109243 static inline unsigned long rb_page_write(struct buffer_page *bpage)
109244 {
109245- return local_read(&bpage->write) & RB_WRITE_MASK;
109246+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
109247 }
109248
109249 static int
109250@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
109251 * bytes consumed in ring buffer from here.
109252 * Increment overrun to account for the lost events.
109253 */
109254- local_add(page_entries, &cpu_buffer->overrun);
109255+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
109256 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
109257 }
109258
109259@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
109260 * it is our responsibility to update
109261 * the counters.
109262 */
109263- local_add(entries, &cpu_buffer->overrun);
109264+ local_add_unchecked(entries, &cpu_buffer->overrun);
109265 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
109266
109267 /*
109268@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109269 if (tail == BUF_PAGE_SIZE)
109270 tail_page->real_end = 0;
109271
109272- local_sub(length, &tail_page->write);
109273+ local_sub_unchecked(length, &tail_page->write);
109274 return;
109275 }
109276
109277@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109278 rb_event_set_padding(event);
109279
109280 /* Set the write back to the previous setting */
109281- local_sub(length, &tail_page->write);
109282+ local_sub_unchecked(length, &tail_page->write);
109283 return;
109284 }
109285
109286@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
109287
109288 /* Set write to end of buffer */
109289 length = (tail + length) - BUF_PAGE_SIZE;
109290- local_sub(length, &tail_page->write);
109291+ local_sub_unchecked(length, &tail_page->write);
109292 }
109293
109294 /*
109295@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109296 * about it.
109297 */
109298 if (unlikely(next_page == commit_page)) {
109299- local_inc(&cpu_buffer->commit_overrun);
109300+ local_inc_unchecked(&cpu_buffer->commit_overrun);
109301 goto out_reset;
109302 }
109303
109304@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109305 * this is easy, just stop here.
109306 */
109307 if (!(buffer->flags & RB_FL_OVERWRITE)) {
109308- local_inc(&cpu_buffer->dropped_events);
109309+ local_inc_unchecked(&cpu_buffer->dropped_events);
109310 goto out_reset;
109311 }
109312
109313@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
109314 cpu_buffer->tail_page) &&
109315 (cpu_buffer->commit_page ==
109316 cpu_buffer->reader_page))) {
109317- local_inc(&cpu_buffer->commit_overrun);
109318+ local_inc_unchecked(&cpu_buffer->commit_overrun);
109319 goto out_reset;
109320 }
109321 }
109322@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
109323 length += RB_LEN_TIME_EXTEND;
109324
109325 tail_page = cpu_buffer->tail_page;
109326- write = local_add_return(length, &tail_page->write);
109327+ write = local_add_return_unchecked(length, &tail_page->write);
109328
109329 /* set write to only the index of the write */
109330 write &= RB_WRITE_MASK;
109331@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
109332 kmemcheck_annotate_bitfield(event, bitfield);
109333 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
109334
109335- local_inc(&tail_page->entries);
109336+ local_inc_unchecked(&tail_page->entries);
109337
109338 /*
109339 * If this is the first commit on the page, then update
109340@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109341
109342 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
109343 unsigned long write_mask =
109344- local_read(&bpage->write) & ~RB_WRITE_MASK;
109345+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
109346 unsigned long event_length = rb_event_length(event);
109347 /*
109348 * This is on the tail page. It is possible that
109349@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109350 */
109351 old_index += write_mask;
109352 new_index += write_mask;
109353- index = local_cmpxchg(&bpage->write, old_index, new_index);
109354+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
109355 if (index == old_index) {
109356 /* update counters */
109357 local_sub(event_length, &cpu_buffer->entries_bytes);
109358@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
109359 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
109360 {
109361 local_inc(&cpu_buffer->committing);
109362- local_inc(&cpu_buffer->commits);
109363+ local_inc_unchecked(&cpu_buffer->commits);
109364 }
109365
109366 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109367@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109368 return;
109369
109370 again:
109371- commits = local_read(&cpu_buffer->commits);
109372+ commits = local_read_unchecked(&cpu_buffer->commits);
109373 /* synchronize with interrupts */
109374 barrier();
109375 if (local_read(&cpu_buffer->committing) == 1)
109376@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
109377 * updating of the commit page and the clearing of the
109378 * committing counter.
109379 */
109380- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
109381+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
109382 !local_read(&cpu_buffer->committing)) {
109383 local_inc(&cpu_buffer->committing);
109384 goto again;
109385@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
109386 barrier();
109387 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
109388 local_dec(&cpu_buffer->committing);
109389- local_dec(&cpu_buffer->commits);
109390+ local_dec_unchecked(&cpu_buffer->commits);
109391 return NULL;
109392 }
109393 #endif
109394@@ -2898,7 +2898,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
109395
109396 /* Do the likely case first */
109397 if (likely(bpage->page == (void *)addr)) {
109398- local_dec(&bpage->entries);
109399+ local_dec_unchecked(&bpage->entries);
109400 return;
109401 }
109402
109403@@ -2910,7 +2910,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
109404 start = bpage;
109405 do {
109406 if (bpage->page == (void *)addr) {
109407- local_dec(&bpage->entries);
109408+ local_dec_unchecked(&bpage->entries);
109409 return;
109410 }
109411 rb_inc_page(cpu_buffer, &bpage);
109412@@ -3194,7 +3194,7 @@ static inline unsigned long
109413 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
109414 {
109415 return local_read(&cpu_buffer->entries) -
109416- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
109417+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
109418 }
109419
109420 /**
109421@@ -3283,7 +3283,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
109422 return 0;
109423
109424 cpu_buffer = buffer->buffers[cpu];
109425- ret = local_read(&cpu_buffer->overrun);
109426+ ret = local_read_unchecked(&cpu_buffer->overrun);
109427
109428 return ret;
109429 }
109430@@ -3306,7 +3306,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
109431 return 0;
109432
109433 cpu_buffer = buffer->buffers[cpu];
109434- ret = local_read(&cpu_buffer->commit_overrun);
109435+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
109436
109437 return ret;
109438 }
109439@@ -3328,7 +3328,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
109440 return 0;
109441
109442 cpu_buffer = buffer->buffers[cpu];
109443- ret = local_read(&cpu_buffer->dropped_events);
109444+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
109445
109446 return ret;
109447 }
109448@@ -3391,7 +3391,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
109449 /* if you care about this being correct, lock the buffer */
109450 for_each_buffer_cpu(buffer, cpu) {
109451 cpu_buffer = buffer->buffers[cpu];
109452- overruns += local_read(&cpu_buffer->overrun);
109453+ overruns += local_read_unchecked(&cpu_buffer->overrun);
109454 }
109455
109456 return overruns;
109457@@ -3562,8 +3562,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
109458 /*
109459 * Reset the reader page to size zero.
109460 */
109461- local_set(&cpu_buffer->reader_page->write, 0);
109462- local_set(&cpu_buffer->reader_page->entries, 0);
109463+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
109464+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
109465 local_set(&cpu_buffer->reader_page->page->commit, 0);
109466 cpu_buffer->reader_page->real_end = 0;
109467
109468@@ -3597,7 +3597,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
109469 * want to compare with the last_overrun.
109470 */
109471 smp_mb();
109472- overwrite = local_read(&(cpu_buffer->overrun));
109473+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
109474
109475 /*
109476 * Here's the tricky part.
109477@@ -4169,8 +4169,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
109478
109479 cpu_buffer->head_page
109480 = list_entry(cpu_buffer->pages, struct buffer_page, list);
109481- local_set(&cpu_buffer->head_page->write, 0);
109482- local_set(&cpu_buffer->head_page->entries, 0);
109483+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
109484+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
109485 local_set(&cpu_buffer->head_page->page->commit, 0);
109486
109487 cpu_buffer->head_page->read = 0;
109488@@ -4180,18 +4180,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
109489
109490 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
109491 INIT_LIST_HEAD(&cpu_buffer->new_pages);
109492- local_set(&cpu_buffer->reader_page->write, 0);
109493- local_set(&cpu_buffer->reader_page->entries, 0);
109494+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
109495+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
109496 local_set(&cpu_buffer->reader_page->page->commit, 0);
109497 cpu_buffer->reader_page->read = 0;
109498
109499 local_set(&cpu_buffer->entries_bytes, 0);
109500- local_set(&cpu_buffer->overrun, 0);
109501- local_set(&cpu_buffer->commit_overrun, 0);
109502- local_set(&cpu_buffer->dropped_events, 0);
109503+ local_set_unchecked(&cpu_buffer->overrun, 0);
109504+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
109505+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
109506 local_set(&cpu_buffer->entries, 0);
109507 local_set(&cpu_buffer->committing, 0);
109508- local_set(&cpu_buffer->commits, 0);
109509+ local_set_unchecked(&cpu_buffer->commits, 0);
109510 cpu_buffer->read = 0;
109511 cpu_buffer->read_bytes = 0;
109512
109513@@ -4592,8 +4592,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
109514 rb_init_page(bpage);
109515 bpage = reader->page;
109516 reader->page = *data_page;
109517- local_set(&reader->write, 0);
109518- local_set(&reader->entries, 0);
109519+ local_set_unchecked(&reader->write, 0);
109520+ local_set_unchecked(&reader->entries, 0);
109521 reader->read = 0;
109522 *data_page = bpage;
109523
109524diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
109525index 0533049..85e27f0 100644
109526--- a/kernel/trace/trace.c
109527+++ b/kernel/trace/trace.c
109528@@ -3538,7 +3538,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
109529 return 0;
109530 }
109531
109532-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
109533+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
109534 {
109535 /* do nothing if flag is already set */
109536 if (!!(trace_flags & mask) == !!enabled)
109537diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
109538index 921691c..64e1da1 100644
109539--- a/kernel/trace/trace.h
109540+++ b/kernel/trace/trace.h
109541@@ -1272,7 +1272,7 @@ extern const char *__stop___tracepoint_str[];
109542 void trace_printk_init_buffers(void);
109543 void trace_printk_start_comm(void);
109544 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
109545-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
109546+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
109547
109548 /*
109549 * Normal trace_printk() and friends allocates special buffers
109550diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
109551index 57b67b1..66082a9 100644
109552--- a/kernel/trace/trace_clock.c
109553+++ b/kernel/trace/trace_clock.c
109554@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
109555 return now;
109556 }
109557
109558-static atomic64_t trace_counter;
109559+static atomic64_unchecked_t trace_counter;
109560
109561 /*
109562 * trace_clock_counter(): simply an atomic counter.
109563@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
109564 */
109565 u64 notrace trace_clock_counter(void)
109566 {
109567- return atomic64_add_return(1, &trace_counter);
109568+ return atomic64_inc_return_unchecked(&trace_counter);
109569 }
109570diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
109571index c4de47f..5f134b8 100644
109572--- a/kernel/trace/trace_events.c
109573+++ b/kernel/trace/trace_events.c
109574@@ -1887,7 +1887,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
109575 return 0;
109576 }
109577
109578-struct ftrace_module_file_ops;
109579 static void __add_event_to_tracers(struct ftrace_event_call *call);
109580
109581 /* Add an additional event_call dynamically */
109582diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
109583index a51e796..1f32ebd 100644
109584--- a/kernel/trace/trace_functions_graph.c
109585+++ b/kernel/trace/trace_functions_graph.c
109586@@ -132,7 +132,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
109587
109588 /* The return trace stack is full */
109589 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
109590- atomic_inc(&current->trace_overrun);
109591+ atomic_inc_unchecked(&current->trace_overrun);
109592 return -EBUSY;
109593 }
109594
109595@@ -229,7 +229,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
109596 *ret = current->ret_stack[index].ret;
109597 trace->func = current->ret_stack[index].func;
109598 trace->calltime = current->ret_stack[index].calltime;
109599- trace->overrun = atomic_read(&current->trace_overrun);
109600+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
109601 trace->depth = index;
109602 }
109603
109604diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
109605index 7a9ba62..2e0e4a1 100644
109606--- a/kernel/trace/trace_mmiotrace.c
109607+++ b/kernel/trace/trace_mmiotrace.c
109608@@ -24,7 +24,7 @@ struct header_iter {
109609 static struct trace_array *mmio_trace_array;
109610 static bool overrun_detected;
109611 static unsigned long prev_overruns;
109612-static atomic_t dropped_count;
109613+static atomic_unchecked_t dropped_count;
109614
109615 static void mmio_reset_data(struct trace_array *tr)
109616 {
109617@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
109618
109619 static unsigned long count_overruns(struct trace_iterator *iter)
109620 {
109621- unsigned long cnt = atomic_xchg(&dropped_count, 0);
109622+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
109623 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
109624
109625 if (over > prev_overruns)
109626@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
109627 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
109628 sizeof(*entry), 0, pc);
109629 if (!event) {
109630- atomic_inc(&dropped_count);
109631+ atomic_inc_unchecked(&dropped_count);
109632 return;
109633 }
109634 entry = ring_buffer_event_data(event);
109635@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
109636 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
109637 sizeof(*entry), 0, pc);
109638 if (!event) {
109639- atomic_inc(&dropped_count);
109640+ atomic_inc_unchecked(&dropped_count);
109641 return;
109642 }
109643 entry = ring_buffer_event_data(event);
109644diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
109645index 25a086b..a918131 100644
109646--- a/kernel/trace/trace_output.c
109647+++ b/kernel/trace/trace_output.c
109648@@ -752,14 +752,16 @@ int register_ftrace_event(struct trace_event *event)
109649 goto out;
109650 }
109651
109652+ pax_open_kernel();
109653 if (event->funcs->trace == NULL)
109654- event->funcs->trace = trace_nop_print;
109655+ *(void **)&event->funcs->trace = trace_nop_print;
109656 if (event->funcs->raw == NULL)
109657- event->funcs->raw = trace_nop_print;
109658+ *(void **)&event->funcs->raw = trace_nop_print;
109659 if (event->funcs->hex == NULL)
109660- event->funcs->hex = trace_nop_print;
109661+ *(void **)&event->funcs->hex = trace_nop_print;
109662 if (event->funcs->binary == NULL)
109663- event->funcs->binary = trace_nop_print;
109664+ *(void **)&event->funcs->binary = trace_nop_print;
109665+ pax_close_kernel();
109666
109667 key = event->type & (EVENT_HASHSIZE - 1);
109668
109669diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
109670index e694c9f..6775a38 100644
109671--- a/kernel/trace/trace_seq.c
109672+++ b/kernel/trace/trace_seq.c
109673@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
109674 return 0;
109675 }
109676
109677- seq_buf_path(&s->seq, path, "\n");
109678+ seq_buf_path(&s->seq, path, "\n\\");
109679
109680 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
109681 s->seq.len = save_len;
109682diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
109683index 3f34496..0492d95 100644
109684--- a/kernel/trace/trace_stack.c
109685+++ b/kernel/trace/trace_stack.c
109686@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
109687 return;
109688
109689 /* we do not handle interrupt stacks yet */
109690- if (!object_is_on_stack(stack))
109691+ if (!object_starts_on_stack(stack))
109692 return;
109693
109694 local_irq_save(flags);
109695diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
109696index f97f6e3..d367b48 100644
109697--- a/kernel/trace/trace_syscalls.c
109698+++ b/kernel/trace/trace_syscalls.c
109699@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
109700 int num;
109701
109702 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109703+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109704+ return -EINVAL;
109705
109706 mutex_lock(&syscall_trace_lock);
109707 if (!sys_perf_refcount_enter)
109708@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
109709 int num;
109710
109711 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109712+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109713+ return;
109714
109715 mutex_lock(&syscall_trace_lock);
109716 sys_perf_refcount_enter--;
109717@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
109718 int num;
109719
109720 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109721+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109722+ return -EINVAL;
109723
109724 mutex_lock(&syscall_trace_lock);
109725 if (!sys_perf_refcount_exit)
109726@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
109727 int num;
109728
109729 num = ((struct syscall_metadata *)call->data)->syscall_nr;
109730+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
109731+ return;
109732
109733 mutex_lock(&syscall_trace_lock);
109734 sys_perf_refcount_exit--;
109735diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
109736index 4109f83..fe1f830 100644
109737--- a/kernel/user_namespace.c
109738+++ b/kernel/user_namespace.c
109739@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
109740 !kgid_has_mapping(parent_ns, group))
109741 return -EPERM;
109742
109743+#ifdef CONFIG_GRKERNSEC
109744+ /*
109745+ * This doesn't really inspire confidence:
109746+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
109747+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
109748+ * Increases kernel attack surface in areas developers
109749+ * previously cared little about ("low importance due
109750+ * to requiring "root" capability")
109751+ * To be removed when this code receives *proper* review
109752+ */
109753+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
109754+ !capable(CAP_SETGID))
109755+ return -EPERM;
109756+#endif
109757+
109758 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
109759 if (!ns)
109760 return -ENOMEM;
109761@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
109762 if (atomic_read(&current->mm->mm_users) > 1)
109763 return -EINVAL;
109764
109765- if (current->fs->users != 1)
109766+ if (atomic_read(&current->fs->users) != 1)
109767 return -EINVAL;
109768
109769 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
109770diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
109771index c8eac43..4b5f08f 100644
109772--- a/kernel/utsname_sysctl.c
109773+++ b/kernel/utsname_sysctl.c
109774@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
109775 static int proc_do_uts_string(struct ctl_table *table, int write,
109776 void __user *buffer, size_t *lenp, loff_t *ppos)
109777 {
109778- struct ctl_table uts_table;
109779+ ctl_table_no_const uts_table;
109780 int r;
109781 memcpy(&uts_table, table, sizeof(uts_table));
109782 uts_table.data = get_uts(table, write);
109783diff --git a/kernel/watchdog.c b/kernel/watchdog.c
109784index 581a68a..7ff6a89 100644
109785--- a/kernel/watchdog.c
109786+++ b/kernel/watchdog.c
109787@@ -648,7 +648,7 @@ void watchdog_nmi_enable_all(void) {}
109788 void watchdog_nmi_disable_all(void) {}
109789 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
109790
109791-static struct smp_hotplug_thread watchdog_threads = {
109792+static struct smp_hotplug_thread watchdog_threads __read_only = {
109793 .store = &softlockup_watchdog,
109794 .thread_should_run = watchdog_should_run,
109795 .thread_fn = watchdog,
109796diff --git a/kernel/workqueue.c b/kernel/workqueue.c
109797index 586ad91..5f8844a 100644
109798--- a/kernel/workqueue.c
109799+++ b/kernel/workqueue.c
109800@@ -4428,7 +4428,7 @@ static void rebind_workers(struct worker_pool *pool)
109801 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
109802 worker_flags |= WORKER_REBOUND;
109803 worker_flags &= ~WORKER_UNBOUND;
109804- ACCESS_ONCE(worker->flags) = worker_flags;
109805+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
109806 }
109807
109808 spin_unlock_irq(&pool->lock);
109809diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
109810index ba2b0c8..a571efc 100644
109811--- a/lib/Kconfig.debug
109812+++ b/lib/Kconfig.debug
109813@@ -936,7 +936,7 @@ config DEBUG_MUTEXES
109814
109815 config DEBUG_WW_MUTEX_SLOWPATH
109816 bool "Wait/wound mutex debugging: Slowpath testing"
109817- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109818+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109819 select DEBUG_LOCK_ALLOC
109820 select DEBUG_SPINLOCK
109821 select DEBUG_MUTEXES
109822@@ -953,7 +953,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
109823
109824 config DEBUG_LOCK_ALLOC
109825 bool "Lock debugging: detect incorrect freeing of live locks"
109826- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109827+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109828 select DEBUG_SPINLOCK
109829 select DEBUG_MUTEXES
109830 select LOCKDEP
109831@@ -967,7 +967,7 @@ config DEBUG_LOCK_ALLOC
109832
109833 config PROVE_LOCKING
109834 bool "Lock debugging: prove locking correctness"
109835- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109836+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109837 select LOCKDEP
109838 select DEBUG_SPINLOCK
109839 select DEBUG_MUTEXES
109840@@ -1018,7 +1018,7 @@ config LOCKDEP
109841
109842 config LOCK_STAT
109843 bool "Lock usage statistics"
109844- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
109845+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
109846 select LOCKDEP
109847 select DEBUG_SPINLOCK
109848 select DEBUG_MUTEXES
109849@@ -1496,6 +1496,7 @@ config LATENCYTOP
109850 depends on DEBUG_KERNEL
109851 depends on STACKTRACE_SUPPORT
109852 depends on PROC_FS
109853+ depends on !GRKERNSEC_HIDESYM
109854 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
109855 select KALLSYMS
109856 select KALLSYMS_ALL
109857@@ -1512,7 +1513,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
109858 config DEBUG_STRICT_USER_COPY_CHECKS
109859 bool "Strict user copy size checks"
109860 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
109861- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
109862+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
109863 help
109864 Enabling this option turns a certain set of sanity checks for user
109865 copy operations into compile time failures.
109866@@ -1643,7 +1644,7 @@ endmenu # runtime tests
109867
109868 config PROVIDE_OHCI1394_DMA_INIT
109869 bool "Remote debugging over FireWire early on boot"
109870- depends on PCI && X86
109871+ depends on PCI && X86 && !GRKERNSEC
109872 help
109873 If you want to debug problems which hang or crash the kernel early
109874 on boot and the crashing machine has a FireWire port, you can use
109875diff --git a/lib/Makefile b/lib/Makefile
109876index 6c37933..d48e7ca 100644
109877--- a/lib/Makefile
109878+++ b/lib/Makefile
109879@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
109880 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
109881 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
109882 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
109883-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
109884+obj-y += list_debug.o
109885 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
109886
109887 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
109888diff --git a/lib/average.c b/lib/average.c
109889index 114d1be..ab0350c 100644
109890--- a/lib/average.c
109891+++ b/lib/average.c
109892@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
109893 {
109894 unsigned long internal = ACCESS_ONCE(avg->internal);
109895
109896- ACCESS_ONCE(avg->internal) = internal ?
109897+ ACCESS_ONCE_RW(avg->internal) = internal ?
109898 (((internal << avg->weight) - internal) +
109899 (val << avg->factor)) >> avg->weight :
109900 (val << avg->factor);
109901diff --git a/lib/bitmap.c b/lib/bitmap.c
109902index 40162f8..b55c7c7 100644
109903--- a/lib/bitmap.c
109904+++ b/lib/bitmap.c
109905@@ -234,7 +234,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
109906 }
109907 EXPORT_SYMBOL(__bitmap_subset);
109908
109909-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
109910+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
109911 {
109912 unsigned int k, lim = bits/BITS_PER_LONG;
109913 int w = 0;
109914@@ -361,7 +361,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
109915 {
109916 int c, old_c, totaldigits, ndigits, nchunks, nbits;
109917 u32 chunk;
109918- const char __user __force *ubuf = (const char __user __force *)buf;
109919+ const char __user *ubuf = (const char __force_user *)buf;
109920
109921 bitmap_zero(maskp, nmaskbits);
109922
109923@@ -446,7 +446,7 @@ int bitmap_parse_user(const char __user *ubuf,
109924 {
109925 if (!access_ok(VERIFY_READ, ubuf, ulen))
109926 return -EFAULT;
109927- return __bitmap_parse((const char __force *)ubuf,
109928+ return __bitmap_parse((const char __force_kernel *)ubuf,
109929 ulen, 1, maskp, nmaskbits);
109930
109931 }
109932@@ -505,7 +505,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
109933 {
109934 unsigned a, b;
109935 int c, old_c, totaldigits;
109936- const char __user __force *ubuf = (const char __user __force *)buf;
109937+ const char __user *ubuf = (const char __force_user *)buf;
109938 int at_start, in_range;
109939
109940 totaldigits = c = 0;
109941@@ -601,7 +601,7 @@ int bitmap_parselist_user(const char __user *ubuf,
109942 {
109943 if (!access_ok(VERIFY_READ, ubuf, ulen))
109944 return -EFAULT;
109945- return __bitmap_parselist((const char __force *)ubuf,
109946+ return __bitmap_parselist((const char __force_kernel *)ubuf,
109947 ulen, 1, maskp, nmaskbits);
109948 }
109949 EXPORT_SYMBOL(bitmap_parselist_user);
109950diff --git a/lib/bug.c b/lib/bug.c
109951index 0c3bd95..5a615a1 100644
109952--- a/lib/bug.c
109953+++ b/lib/bug.c
109954@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
109955 return BUG_TRAP_TYPE_NONE;
109956
109957 bug = find_bug(bugaddr);
109958+ if (!bug)
109959+ return BUG_TRAP_TYPE_NONE;
109960
109961 file = NULL;
109962 line = 0;
109963diff --git a/lib/debugobjects.c b/lib/debugobjects.c
109964index 547f7f9..a6d4ba0 100644
109965--- a/lib/debugobjects.c
109966+++ b/lib/debugobjects.c
109967@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
109968 if (limit > 4)
109969 return;
109970
109971- is_on_stack = object_is_on_stack(addr);
109972+ is_on_stack = object_starts_on_stack(addr);
109973 if (is_on_stack == onstack)
109974 return;
109975
109976diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
109977index 6dd0335..1e9c239 100644
109978--- a/lib/decompress_bunzip2.c
109979+++ b/lib/decompress_bunzip2.c
109980@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
109981
109982 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
109983 uncompressed data. Allocate intermediate buffer for block. */
109984- bd->dbufSize = 100000*(i-BZh0);
109985+ i -= BZh0;
109986+ bd->dbufSize = 100000 * i;
109987
109988 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
109989 if (!bd->dbuf)
109990diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
109991index 0be83af..4605e93 100644
109992--- a/lib/decompress_unlzma.c
109993+++ b/lib/decompress_unlzma.c
109994@@ -39,10 +39,10 @@
109995
109996 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
109997
109998-static long long INIT read_int(unsigned char *ptr, int size)
109999+static unsigned long long INIT read_int(unsigned char *ptr, int size)
110000 {
110001 int i;
110002- long long ret = 0;
110003+ unsigned long long ret = 0;
110004
110005 for (i = 0; i < size; i++)
110006 ret = (ret << 8) | ptr[size-i-1];
110007diff --git a/lib/div64.c b/lib/div64.c
110008index 19ea7ed..20cac21 100644
110009--- a/lib/div64.c
110010+++ b/lib/div64.c
110011@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
110012 EXPORT_SYMBOL(__div64_32);
110013
110014 #ifndef div_s64_rem
110015-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
110016+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
110017 {
110018 u64 quotient;
110019
110020@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
110021 * 'http://www.hackersdelight.org/hdcodetxt/divDouble.c.txt'
110022 */
110023 #ifndef div64_u64
110024-u64 div64_u64(u64 dividend, u64 divisor)
110025+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
110026 {
110027 u32 high = divisor >> 32;
110028 u64 quot;
110029diff --git a/lib/dma-debug.c b/lib/dma-debug.c
110030index dace71f..13da37b 100644
110031--- a/lib/dma-debug.c
110032+++ b/lib/dma-debug.c
110033@@ -982,7 +982,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
110034
110035 void dma_debug_add_bus(struct bus_type *bus)
110036 {
110037- struct notifier_block *nb;
110038+ notifier_block_no_const *nb;
110039
110040 if (dma_debug_disabled())
110041 return;
110042@@ -1164,7 +1164,7 @@ static void check_unmap(struct dma_debug_entry *ref)
110043
110044 static void check_for_stack(struct device *dev, void *addr)
110045 {
110046- if (object_is_on_stack(addr))
110047+ if (object_starts_on_stack(addr))
110048 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
110049 "stack [addr=%p]\n", addr);
110050 }
110051diff --git a/lib/inflate.c b/lib/inflate.c
110052index 013a761..c28f3fc 100644
110053--- a/lib/inflate.c
110054+++ b/lib/inflate.c
110055@@ -269,7 +269,7 @@ static void free(void *where)
110056 malloc_ptr = free_mem_ptr;
110057 }
110058 #else
110059-#define malloc(a) kmalloc(a, GFP_KERNEL)
110060+#define malloc(a) kmalloc((a), GFP_KERNEL)
110061 #define free(a) kfree(a)
110062 #endif
110063
110064diff --git a/lib/ioremap.c b/lib/ioremap.c
110065index 86c8911..f5bfc34 100644
110066--- a/lib/ioremap.c
110067+++ b/lib/ioremap.c
110068@@ -75,7 +75,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
110069 unsigned long next;
110070
110071 phys_addr -= addr;
110072- pmd = pmd_alloc(&init_mm, pud, addr);
110073+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
110074 if (!pmd)
110075 return -ENOMEM;
110076 do {
110077@@ -101,7 +101,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
110078 unsigned long next;
110079
110080 phys_addr -= addr;
110081- pud = pud_alloc(&init_mm, pgd, addr);
110082+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
110083 if (!pud)
110084 return -ENOMEM;
110085 do {
110086diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
110087index bd2bea9..6b3c95e 100644
110088--- a/lib/is_single_threaded.c
110089+++ b/lib/is_single_threaded.c
110090@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
110091 struct task_struct *p, *t;
110092 bool ret;
110093
110094+ if (!mm)
110095+ return true;
110096+
110097 if (atomic_read(&task->signal->live) != 1)
110098 return false;
110099
110100diff --git a/lib/kobject.c b/lib/kobject.c
110101index 3b841b9..7c215aa 100644
110102--- a/lib/kobject.c
110103+++ b/lib/kobject.c
110104@@ -340,8 +340,9 @@ error:
110105 }
110106 EXPORT_SYMBOL(kobject_init);
110107
110108-static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
110109- const char *fmt, va_list vargs)
110110+static __printf(3, 0) int kobject_add_varg(struct kobject *kobj,
110111+ struct kobject *parent,
110112+ const char *fmt, va_list vargs)
110113 {
110114 int retval;
110115
110116@@ -936,9 +937,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
110117
110118
110119 static DEFINE_SPINLOCK(kobj_ns_type_lock);
110120-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
110121+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
110122
110123-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
110124+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
110125 {
110126 enum kobj_ns_type type = ops->type;
110127 int error;
110128diff --git a/lib/list_debug.c b/lib/list_debug.c
110129index c24c2f7..f0296f4 100644
110130--- a/lib/list_debug.c
110131+++ b/lib/list_debug.c
110132@@ -11,7 +11,9 @@
110133 #include <linux/bug.h>
110134 #include <linux/kernel.h>
110135 #include <linux/rculist.h>
110136+#include <linux/mm.h>
110137
110138+#ifdef CONFIG_DEBUG_LIST
110139 /*
110140 * Insert a new entry between two known consecutive entries.
110141 *
110142@@ -19,21 +21,40 @@
110143 * the prev/next entries already!
110144 */
110145
110146+static bool __list_add_debug(struct list_head *new,
110147+ struct list_head *prev,
110148+ struct list_head *next)
110149+{
110150+ if (unlikely(next->prev != prev)) {
110151+ printk(KERN_ERR "list_add corruption. next->prev should be "
110152+ "prev (%p), but was %p. (next=%p).\n",
110153+ prev, next->prev, next);
110154+ BUG();
110155+ return false;
110156+ }
110157+ if (unlikely(prev->next != next)) {
110158+ printk(KERN_ERR "list_add corruption. prev->next should be "
110159+ "next (%p), but was %p. (prev=%p).\n",
110160+ next, prev->next, prev);
110161+ BUG();
110162+ return false;
110163+ }
110164+ if (unlikely(new == prev || new == next)) {
110165+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
110166+ new, prev, next);
110167+ BUG();
110168+ return false;
110169+ }
110170+ return true;
110171+}
110172+
110173 void __list_add(struct list_head *new,
110174- struct list_head *prev,
110175- struct list_head *next)
110176+ struct list_head *prev,
110177+ struct list_head *next)
110178 {
110179- WARN(next->prev != prev,
110180- "list_add corruption. next->prev should be "
110181- "prev (%p), but was %p. (next=%p).\n",
110182- prev, next->prev, next);
110183- WARN(prev->next != next,
110184- "list_add corruption. prev->next should be "
110185- "next (%p), but was %p. (prev=%p).\n",
110186- next, prev->next, prev);
110187- WARN(new == prev || new == next,
110188- "list_add double add: new=%p, prev=%p, next=%p.\n",
110189- new, prev, next);
110190+ if (!__list_add_debug(new, prev, next))
110191+ return;
110192+
110193 next->prev = new;
110194 new->next = next;
110195 new->prev = prev;
110196@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
110197 }
110198 EXPORT_SYMBOL(__list_add);
110199
110200-void __list_del_entry(struct list_head *entry)
110201+static bool __list_del_entry_debug(struct list_head *entry)
110202 {
110203 struct list_head *prev, *next;
110204
110205 prev = entry->prev;
110206 next = entry->next;
110207
110208- if (WARN(next == LIST_POISON1,
110209- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
110210- entry, LIST_POISON1) ||
110211- WARN(prev == LIST_POISON2,
110212- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
110213- entry, LIST_POISON2) ||
110214- WARN(prev->next != entry,
110215- "list_del corruption. prev->next should be %p, "
110216- "but was %p\n", entry, prev->next) ||
110217- WARN(next->prev != entry,
110218- "list_del corruption. next->prev should be %p, "
110219- "but was %p\n", entry, next->prev))
110220+ if (unlikely(next == LIST_POISON1)) {
110221+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
110222+ entry, LIST_POISON1);
110223+ BUG();
110224+ return false;
110225+ }
110226+ if (unlikely(prev == LIST_POISON2)) {
110227+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
110228+ entry, LIST_POISON2);
110229+ BUG();
110230+ return false;
110231+ }
110232+ if (unlikely(entry->prev->next != entry)) {
110233+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
110234+ "but was %p\n", entry, prev->next);
110235+ BUG();
110236+ return false;
110237+ }
110238+ if (unlikely(entry->next->prev != entry)) {
110239+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
110240+ "but was %p\n", entry, next->prev);
110241+ BUG();
110242+ return false;
110243+ }
110244+ return true;
110245+}
110246+
110247+void __list_del_entry(struct list_head *entry)
110248+{
110249+ if (!__list_del_entry_debug(entry))
110250 return;
110251
110252- __list_del(prev, next);
110253+ __list_del(entry->prev, entry->next);
110254 }
110255 EXPORT_SYMBOL(__list_del_entry);
110256
110257@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
110258 void __list_add_rcu(struct list_head *new,
110259 struct list_head *prev, struct list_head *next)
110260 {
110261- WARN(next->prev != prev,
110262- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
110263- prev, next->prev, next);
110264- WARN(prev->next != next,
110265- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
110266- next, prev->next, prev);
110267+ if (!__list_add_debug(new, prev, next))
110268+ return;
110269+
110270 new->next = next;
110271 new->prev = prev;
110272 rcu_assign_pointer(list_next_rcu(prev), new);
110273 next->prev = new;
110274 }
110275 EXPORT_SYMBOL(__list_add_rcu);
110276+#endif
110277+
110278+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
110279+{
110280+#ifdef CONFIG_DEBUG_LIST
110281+ if (!__list_add_debug(new, prev, next))
110282+ return;
110283+#endif
110284+
110285+ pax_open_kernel();
110286+ next->prev = new;
110287+ new->next = next;
110288+ new->prev = prev;
110289+ prev->next = new;
110290+ pax_close_kernel();
110291+}
110292+EXPORT_SYMBOL(__pax_list_add);
110293+
110294+void pax_list_del(struct list_head *entry)
110295+{
110296+#ifdef CONFIG_DEBUG_LIST
110297+ if (!__list_del_entry_debug(entry))
110298+ return;
110299+#endif
110300+
110301+ pax_open_kernel();
110302+ __list_del(entry->prev, entry->next);
110303+ entry->next = LIST_POISON1;
110304+ entry->prev = LIST_POISON2;
110305+ pax_close_kernel();
110306+}
110307+EXPORT_SYMBOL(pax_list_del);
110308+
110309+void pax_list_del_init(struct list_head *entry)
110310+{
110311+ pax_open_kernel();
110312+ __list_del(entry->prev, entry->next);
110313+ INIT_LIST_HEAD(entry);
110314+ pax_close_kernel();
110315+}
110316+EXPORT_SYMBOL(pax_list_del_init);
110317+
110318+void __pax_list_add_rcu(struct list_head *new,
110319+ struct list_head *prev, struct list_head *next)
110320+{
110321+#ifdef CONFIG_DEBUG_LIST
110322+ if (!__list_add_debug(new, prev, next))
110323+ return;
110324+#endif
110325+
110326+ pax_open_kernel();
110327+ new->next = next;
110328+ new->prev = prev;
110329+ rcu_assign_pointer(list_next_rcu(prev), new);
110330+ next->prev = new;
110331+ pax_close_kernel();
110332+}
110333+EXPORT_SYMBOL(__pax_list_add_rcu);
110334+
110335+void pax_list_del_rcu(struct list_head *entry)
110336+{
110337+#ifdef CONFIG_DEBUG_LIST
110338+ if (!__list_del_entry_debug(entry))
110339+ return;
110340+#endif
110341+
110342+ pax_open_kernel();
110343+ __list_del(entry->prev, entry->next);
110344+ entry->next = LIST_POISON1;
110345+ entry->prev = LIST_POISON2;
110346+ pax_close_kernel();
110347+}
110348+EXPORT_SYMBOL(pax_list_del_rcu);
110349diff --git a/lib/lockref.c b/lib/lockref.c
110350index 494994b..65caf94 100644
110351--- a/lib/lockref.c
110352+++ b/lib/lockref.c
110353@@ -48,13 +48,13 @@
110354 void lockref_get(struct lockref *lockref)
110355 {
110356 CMPXCHG_LOOP(
110357- new.count++;
110358+ __lockref_inc(&new);
110359 ,
110360 return;
110361 );
110362
110363 spin_lock(&lockref->lock);
110364- lockref->count++;
110365+ __lockref_inc(lockref);
110366 spin_unlock(&lockref->lock);
110367 }
110368 EXPORT_SYMBOL(lockref_get);
110369@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
110370 int retval;
110371
110372 CMPXCHG_LOOP(
110373- new.count++;
110374- if (old.count <= 0)
110375+ __lockref_inc(&new);
110376+ if (__lockref_read(&old) <= 0)
110377 return 0;
110378 ,
110379 return 1;
110380@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
110381
110382 spin_lock(&lockref->lock);
110383 retval = 0;
110384- if (lockref->count > 0) {
110385- lockref->count++;
110386+ if (__lockref_read(lockref) > 0) {
110387+ __lockref_inc(lockref);
110388 retval = 1;
110389 }
110390 spin_unlock(&lockref->lock);
110391@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
110392 int lockref_get_or_lock(struct lockref *lockref)
110393 {
110394 CMPXCHG_LOOP(
110395- new.count++;
110396- if (old.count <= 0)
110397+ __lockref_inc(&new);
110398+ if (__lockref_read(&old) <= 0)
110399 break;
110400 ,
110401 return 1;
110402 );
110403
110404 spin_lock(&lockref->lock);
110405- if (lockref->count <= 0)
110406+ if (__lockref_read(lockref) <= 0)
110407 return 0;
110408- lockref->count++;
110409+ __lockref_inc(lockref);
110410 spin_unlock(&lockref->lock);
110411 return 1;
110412 }
110413@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
110414 int lockref_put_return(struct lockref *lockref)
110415 {
110416 CMPXCHG_LOOP(
110417- new.count--;
110418- if (old.count <= 0)
110419+ __lockref_dec(&new);
110420+ if (__lockref_read(&old) <= 0)
110421 return -1;
110422 ,
110423- return new.count;
110424+ return __lockref_read(&new);
110425 );
110426 return -1;
110427 }
110428@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
110429 int lockref_put_or_lock(struct lockref *lockref)
110430 {
110431 CMPXCHG_LOOP(
110432- new.count--;
110433- if (old.count <= 1)
110434+ __lockref_dec(&new);
110435+ if (__lockref_read(&old) <= 1)
110436 break;
110437 ,
110438 return 1;
110439 );
110440
110441 spin_lock(&lockref->lock);
110442- if (lockref->count <= 1)
110443+ if (__lockref_read(lockref) <= 1)
110444 return 0;
110445- lockref->count--;
110446+ __lockref_dec(lockref);
110447 spin_unlock(&lockref->lock);
110448 return 1;
110449 }
110450@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
110451 void lockref_mark_dead(struct lockref *lockref)
110452 {
110453 assert_spin_locked(&lockref->lock);
110454- lockref->count = -128;
110455+ __lockref_set(lockref, -128);
110456 }
110457 EXPORT_SYMBOL(lockref_mark_dead);
110458
110459@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
110460 int retval;
110461
110462 CMPXCHG_LOOP(
110463- new.count++;
110464- if (old.count < 0)
110465+ __lockref_inc(&new);
110466+ if (__lockref_read(&old) < 0)
110467 return 0;
110468 ,
110469 return 1;
110470@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
110471
110472 spin_lock(&lockref->lock);
110473 retval = 0;
110474- if (lockref->count >= 0) {
110475- lockref->count++;
110476+ if (__lockref_read(lockref) >= 0) {
110477+ __lockref_inc(lockref);
110478 retval = 1;
110479 }
110480 spin_unlock(&lockref->lock);
110481diff --git a/lib/nlattr.c b/lib/nlattr.c
110482index f5907d2..36072be 100644
110483--- a/lib/nlattr.c
110484+++ b/lib/nlattr.c
110485@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
110486 {
110487 int minlen = min_t(int, count, nla_len(src));
110488
110489+ BUG_ON(minlen < 0);
110490+
110491 memcpy(dest, nla_data(src), minlen);
110492 if (count > minlen)
110493 memset(dest + minlen, 0, count - minlen);
110494diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
110495index 6111bcb..02e816b 100644
110496--- a/lib/percpu-refcount.c
110497+++ b/lib/percpu-refcount.c
110498@@ -31,7 +31,7 @@
110499 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
110500 */
110501
110502-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
110503+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
110504
110505 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
110506
110507diff --git a/lib/radix-tree.c b/lib/radix-tree.c
110508index 3d2aa27..a472f20 100644
110509--- a/lib/radix-tree.c
110510+++ b/lib/radix-tree.c
110511@@ -67,7 +67,7 @@ struct radix_tree_preload {
110512 int nr;
110513 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
110514 };
110515-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
110516+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
110517
110518 static inline void *ptr_to_indirect(void *ptr)
110519 {
110520diff --git a/lib/random32.c b/lib/random32.c
110521index 0bee183..526f12f 100644
110522--- a/lib/random32.c
110523+++ b/lib/random32.c
110524@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
110525 }
110526 #endif
110527
110528-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
110529+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
110530
110531 /**
110532 * prandom_u32_state - seeded pseudo-random number generator.
110533diff --git a/lib/rbtree.c b/lib/rbtree.c
110534index c16c81a..4dcbda1 100644
110535--- a/lib/rbtree.c
110536+++ b/lib/rbtree.c
110537@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
110538 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
110539
110540 static const struct rb_augment_callbacks dummy_callbacks = {
110541- dummy_propagate, dummy_copy, dummy_rotate
110542+ .propagate = dummy_propagate,
110543+ .copy = dummy_copy,
110544+ .rotate = dummy_rotate
110545 };
110546
110547 void rb_insert_color(struct rb_node *node, struct rb_root *root)
110548diff --git a/lib/show_mem.c b/lib/show_mem.c
110549index adc98e18..0ce83c2 100644
110550--- a/lib/show_mem.c
110551+++ b/lib/show_mem.c
110552@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
110553 quicklist_total_size());
110554 #endif
110555 #ifdef CONFIG_MEMORY_FAILURE
110556- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
110557+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
110558 #endif
110559 }
110560diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
110561index e0af6ff..fcc9f15 100644
110562--- a/lib/strncpy_from_user.c
110563+++ b/lib/strncpy_from_user.c
110564@@ -22,7 +22,7 @@
110565 */
110566 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
110567 {
110568- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110569+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110570 long res = 0;
110571
110572 /*
110573diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
110574index fe9a325..85cd8aa 100644
110575--- a/lib/strnlen_user.c
110576+++ b/lib/strnlen_user.c
110577@@ -26,7 +26,7 @@
110578 */
110579 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
110580 {
110581- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110582+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
110583 long align, res = 0;
110584 unsigned long c;
110585
110586diff --git a/lib/swiotlb.c b/lib/swiotlb.c
110587index 3c365ab..75b43df 100644
110588--- a/lib/swiotlb.c
110589+++ b/lib/swiotlb.c
110590@@ -683,7 +683,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
110591
110592 void
110593 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
110594- dma_addr_t dev_addr)
110595+ dma_addr_t dev_addr, struct dma_attrs *attrs)
110596 {
110597 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
110598
110599diff --git a/lib/test-hexdump.c b/lib/test-hexdump.c
110600index c227cc4..5241df3 100644
110601--- a/lib/test-hexdump.c
110602+++ b/lib/test-hexdump.c
110603@@ -25,19 +25,19 @@ static const char * const test_data_1_le[] __initconst = {
110604 "4c", "d1", "19", "99", "43", "b1", "af", "0c",
110605 };
110606
110607-static const char *test_data_2_le[] __initdata = {
110608+static const char * const test_data_2_le[] __initconst = {
110609 "32be", "7bdb", "180a", "b293",
110610 "ba70", "24c4", "837d", "9b34",
110611 "9ca6", "ad31", "0f9c", "e9ac",
110612 "d14c", "9919", "b143", "0caf",
110613 };
110614
110615-static const char *test_data_4_le[] __initdata = {
110616+static const char * const test_data_4_le[] __initconst = {
110617 "7bdb32be", "b293180a", "24c4ba70", "9b34837d",
110618 "ad319ca6", "e9ac0f9c", "9919d14c", "0cafb143",
110619 };
110620
110621-static const char *test_data_8_le[] __initdata = {
110622+static const char * const test_data_8_le[] __initconst = {
110623 "b293180a7bdb32be", "9b34837d24c4ba70",
110624 "e9ac0f9cad319ca6", "0cafb1439919d14c",
110625 };
110626diff --git a/lib/usercopy.c b/lib/usercopy.c
110627index 4f5b1dd..7cab418 100644
110628--- a/lib/usercopy.c
110629+++ b/lib/usercopy.c
110630@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
110631 WARN(1, "Buffer overflow detected!\n");
110632 }
110633 EXPORT_SYMBOL(copy_from_user_overflow);
110634+
110635+void copy_to_user_overflow(void)
110636+{
110637+ WARN(1, "Buffer overflow detected!\n");
110638+}
110639+EXPORT_SYMBOL(copy_to_user_overflow);
110640diff --git a/lib/vsprintf.c b/lib/vsprintf.c
110641index da39c60..ac91239 100644
110642--- a/lib/vsprintf.c
110643+++ b/lib/vsprintf.c
110644@@ -16,6 +16,9 @@
110645 * - scnprintf and vscnprintf
110646 */
110647
110648+#ifdef CONFIG_GRKERNSEC_HIDESYM
110649+#define __INCLUDED_BY_HIDESYM 1
110650+#endif
110651 #include <stdarg.h>
110652 #include <linux/clk-provider.h>
110653 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
110654@@ -628,7 +631,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
110655 #ifdef CONFIG_KALLSYMS
110656 if (*fmt == 'B')
110657 sprint_backtrace(sym, value);
110658- else if (*fmt != 'f' && *fmt != 's')
110659+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
110660 sprint_symbol(sym, value);
110661 else
110662 sprint_symbol_no_offset(sym, value);
110663@@ -1360,7 +1363,11 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec,
110664 }
110665 }
110666
110667-int kptr_restrict __read_mostly;
110668+#ifdef CONFIG_GRKERNSEC_HIDESYM
110669+int kptr_restrict __read_only = 2;
110670+#else
110671+int kptr_restrict __read_only;
110672+#endif
110673
110674 /*
110675 * Show a '%p' thing. A kernel extension is that the '%p' is followed
110676@@ -1371,8 +1378,10 @@ int kptr_restrict __read_mostly;
110677 *
110678 * - 'F' For symbolic function descriptor pointers with offset
110679 * - 'f' For simple symbolic function names without offset
110680+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
110681 * - 'S' For symbolic direct pointers with offset
110682 * - 's' For symbolic direct pointers without offset
110683+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
110684 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
110685 * - 'B' For backtraced symbolic direct pointers with offset
110686 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
110687@@ -1460,12 +1469,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110688
110689 if (!ptr && *fmt != 'K') {
110690 /*
110691- * Print (null) with the same width as a pointer so it makes
110692+ * Print (nil) with the same width as a pointer so it makes
110693 * tabular output look nice.
110694 */
110695 if (spec.field_width == -1)
110696 spec.field_width = default_width;
110697- return string(buf, end, "(null)", spec);
110698+ return string(buf, end, "(nil)", spec);
110699 }
110700
110701 switch (*fmt) {
110702@@ -1475,6 +1484,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110703 /* Fallthrough */
110704 case 'S':
110705 case 's':
110706+#ifdef CONFIG_GRKERNSEC_HIDESYM
110707+ break;
110708+#else
110709+ return symbol_string(buf, end, ptr, spec, fmt);
110710+#endif
110711+ case 'X':
110712+ ptr = dereference_function_descriptor(ptr);
110713+ case 'A':
110714 case 'B':
110715 return symbol_string(buf, end, ptr, spec, fmt);
110716 case 'R':
110717@@ -1539,6 +1556,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110718 va_end(va);
110719 return buf;
110720 }
110721+ case 'P':
110722+ break;
110723 case 'K':
110724 /*
110725 * %pK cannot be used in IRQ context because its test
110726@@ -1598,6 +1617,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
110727 ((const struct file *)ptr)->f_path.dentry,
110728 spec, fmt);
110729 }
110730+
110731+#ifdef CONFIG_GRKERNSEC_HIDESYM
110732+ /* 'P' = approved pointers to copy to userland,
110733+ as in the /proc/kallsyms case, as we make it display nothing
110734+ for non-root users, and the real contents for root users
110735+ 'X' = approved simple symbols
110736+ Also ignore 'K' pointers, since we force their NULLing for non-root users
110737+ above
110738+ */
110739+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
110740+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
110741+ dump_stack();
110742+ ptr = NULL;
110743+ }
110744+#endif
110745+
110746 spec.flags |= SMALL;
110747 if (spec.field_width == -1) {
110748 spec.field_width = default_width;
110749@@ -2296,11 +2331,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
110750 typeof(type) value; \
110751 if (sizeof(type) == 8) { \
110752 args = PTR_ALIGN(args, sizeof(u32)); \
110753- *(u32 *)&value = *(u32 *)args; \
110754- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
110755+ *(u32 *)&value = *(const u32 *)args; \
110756+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
110757 } else { \
110758 args = PTR_ALIGN(args, sizeof(type)); \
110759- value = *(typeof(type) *)args; \
110760+ value = *(const typeof(type) *)args; \
110761 } \
110762 args += sizeof(type); \
110763 value; \
110764@@ -2363,7 +2398,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
110765 case FORMAT_TYPE_STR: {
110766 const char *str_arg = args;
110767 args += strlen(str_arg) + 1;
110768- str = string(str, end, (char *)str_arg, spec);
110769+ str = string(str, end, str_arg, spec);
110770 break;
110771 }
110772
110773diff --git a/localversion-grsec b/localversion-grsec
110774new file mode 100644
110775index 0000000..7cd6065
110776--- /dev/null
110777+++ b/localversion-grsec
110778@@ -0,0 +1 @@
110779+-grsec
110780diff --git a/mm/Kconfig b/mm/Kconfig
110781index 390214d..f96e3b8 100644
110782--- a/mm/Kconfig
110783+++ b/mm/Kconfig
110784@@ -342,10 +342,11 @@ config KSM
110785 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
110786
110787 config DEFAULT_MMAP_MIN_ADDR
110788- int "Low address space to protect from user allocation"
110789+ int "Low address space to protect from user allocation"
110790 depends on MMU
110791- default 4096
110792- help
110793+ default 32768 if ALPHA || ARM || PARISC || SPARC32
110794+ default 65536
110795+ help
110796 This is the portion of low virtual memory which should be protected
110797 from userspace allocation. Keeping a user from writing to low pages
110798 can help reduce the impact of kernel NULL pointer bugs.
110799@@ -376,7 +377,7 @@ config MEMORY_FAILURE
110800
110801 config HWPOISON_INJECT
110802 tristate "HWPoison pages injector"
110803- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
110804+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
110805 select PROC_PAGE_MONITOR
110806
110807 config NOMMU_INITIAL_TRIM_EXCESS
110808diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
110809index 957d3da..1d34e20 100644
110810--- a/mm/Kconfig.debug
110811+++ b/mm/Kconfig.debug
110812@@ -10,6 +10,7 @@ config PAGE_EXTENSION
110813 config DEBUG_PAGEALLOC
110814 bool "Debug page memory allocations"
110815 depends on DEBUG_KERNEL
110816+ depends on !PAX_MEMORY_SANITIZE
110817 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
110818 depends on !KMEMCHECK
110819 select PAGE_EXTENSION
110820diff --git a/mm/backing-dev.c b/mm/backing-dev.c
110821index 000e7b3..aad2605 100644
110822--- a/mm/backing-dev.c
110823+++ b/mm/backing-dev.c
110824@@ -12,7 +12,7 @@
110825 #include <linux/device.h>
110826 #include <trace/events/writeback.h>
110827
110828-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
110829+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
110830
110831 struct backing_dev_info noop_backing_dev_info = {
110832 .name = "noop",
110833@@ -458,7 +458,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
110834 return err;
110835
110836 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
110837- atomic_long_inc_return(&bdi_seq));
110838+ atomic_long_inc_return_unchecked(&bdi_seq));
110839 if (err) {
110840 bdi_destroy(bdi);
110841 return err;
110842diff --git a/mm/cma_debug.c b/mm/cma_debug.c
110843index 7621ee3..f8e4b60 100644
110844--- a/mm/cma_debug.c
110845+++ b/mm/cma_debug.c
110846@@ -39,7 +39,7 @@ static int cma_used_get(void *data, u64 *val)
110847
110848 mutex_lock(&cma->lock);
110849 /* pages counter is smaller than sizeof(int) */
110850- used = bitmap_weight(cma->bitmap, (int)cma->count);
110851+ used = bitmap_weight(cma->bitmap, (int)cma_bitmap_maxno(cma));
110852 mutex_unlock(&cma->lock);
110853 *val = (u64)used << cma->order_per_bit;
110854
110855@@ -52,13 +52,14 @@ static int cma_maxchunk_get(void *data, u64 *val)
110856 struct cma *cma = data;
110857 unsigned long maxchunk = 0;
110858 unsigned long start, end = 0;
110859+ unsigned long bitmap_maxno = cma_bitmap_maxno(cma);
110860
110861 mutex_lock(&cma->lock);
110862 for (;;) {
110863- start = find_next_zero_bit(cma->bitmap, cma->count, end);
110864+ start = find_next_zero_bit(cma->bitmap, bitmap_maxno, end);
110865 if (start >= cma->count)
110866 break;
110867- end = find_next_bit(cma->bitmap, cma->count, start);
110868+ end = find_next_bit(cma->bitmap, bitmap_maxno, start);
110869 maxchunk = max(end - start, maxchunk);
110870 }
110871 mutex_unlock(&cma->lock);
110872@@ -170,10 +171,10 @@ static void cma_debugfs_add_one(struct cma *cma, int idx)
110873
110874 tmp = debugfs_create_dir(name, cma_debugfs_root);
110875
110876- debugfs_create_file("alloc", S_IWUSR, cma_debugfs_root, cma,
110877+ debugfs_create_file("alloc", S_IWUSR, tmp, cma,
110878 &cma_alloc_fops);
110879
110880- debugfs_create_file("free", S_IWUSR, cma_debugfs_root, cma,
110881+ debugfs_create_file("free", S_IWUSR, tmp, cma,
110882 &cma_free_fops);
110883
110884 debugfs_create_file("base_pfn", S_IRUGO, tmp,
110885diff --git a/mm/filemap.c b/mm/filemap.c
110886index 6bf5e42..1e631ee 100644
110887--- a/mm/filemap.c
110888+++ b/mm/filemap.c
110889@@ -2095,7 +2095,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
110890 struct address_space *mapping = file->f_mapping;
110891
110892 if (!mapping->a_ops->readpage)
110893- return -ENOEXEC;
110894+ return -ENODEV;
110895 file_accessed(file);
110896 vma->vm_ops = &generic_file_vm_ops;
110897 return 0;
110898@@ -2276,6 +2276,7 @@ inline ssize_t generic_write_checks(struct kiocb *iocb, struct iov_iter *from)
110899 pos = iocb->ki_pos;
110900
110901 if (limit != RLIM_INFINITY) {
110902+ gr_learn_resource(current, RLIMIT_FSIZE, iocb->ki_pos, 0);
110903 if (iocb->ki_pos >= limit) {
110904 send_sig(SIGXFSZ, current, 0);
110905 return -EFBIG;
110906diff --git a/mm/gup.c b/mm/gup.c
110907index 6297f6b..7652403 100644
110908--- a/mm/gup.c
110909+++ b/mm/gup.c
110910@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
110911 unsigned int fault_flags = 0;
110912 int ret;
110913
110914- /* For mm_populate(), just skip the stack guard page. */
110915- if ((*flags & FOLL_POPULATE) &&
110916- (stack_guard_page_start(vma, address) ||
110917- stack_guard_page_end(vma, address + PAGE_SIZE)))
110918- return -ENOENT;
110919 if (*flags & FOLL_WRITE)
110920 fault_flags |= FAULT_FLAG_WRITE;
110921 if (nonblocking)
110922@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
110923 if (!(gup_flags & FOLL_FORCE))
110924 gup_flags |= FOLL_NUMA;
110925
110926- do {
110927+ while (nr_pages) {
110928 struct page *page;
110929 unsigned int foll_flags = gup_flags;
110930 unsigned int page_increm;
110931
110932 /* first iteration or cross vma bound */
110933 if (!vma || start >= vma->vm_end) {
110934- vma = find_extend_vma(mm, start);
110935+ vma = find_vma(mm, start);
110936 if (!vma && in_gate_area(mm, start)) {
110937 int ret;
110938 ret = get_gate_page(mm, start & PAGE_MASK,
110939@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
110940 goto next_page;
110941 }
110942
110943- if (!vma || check_vma_flags(vma, gup_flags))
110944+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
110945 return i ? : -EFAULT;
110946 if (is_vm_hugetlb_page(vma)) {
110947 i = follow_hugetlb_page(mm, vma, pages, vmas,
110948@@ -509,7 +504,7 @@ next_page:
110949 i += page_increm;
110950 start += page_increm * PAGE_SIZE;
110951 nr_pages -= page_increm;
110952- } while (nr_pages);
110953+ }
110954 return i;
110955 }
110956 EXPORT_SYMBOL(__get_user_pages);
110957diff --git a/mm/highmem.c b/mm/highmem.c
110958index 123bcd3..0de52ba 100644
110959--- a/mm/highmem.c
110960+++ b/mm/highmem.c
110961@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
110962 * So no dangers, even with speculative execution.
110963 */
110964 page = pte_page(pkmap_page_table[i]);
110965+ pax_open_kernel();
110966 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
110967-
110968+ pax_close_kernel();
110969 set_page_address(page, NULL);
110970 need_flush = 1;
110971 }
110972@@ -259,9 +260,11 @@ start:
110973 }
110974 }
110975 vaddr = PKMAP_ADDR(last_pkmap_nr);
110976+
110977+ pax_open_kernel();
110978 set_pte_at(&init_mm, vaddr,
110979 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
110980-
110981+ pax_close_kernel();
110982 pkmap_count[last_pkmap_nr] = 1;
110983 set_page_address(page, (void *)vaddr);
110984
110985diff --git a/mm/hugetlb.c b/mm/hugetlb.c
110986index 8c4c1f9..7019e3d 100644
110987--- a/mm/hugetlb.c
110988+++ b/mm/hugetlb.c
110989@@ -2365,6 +2365,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
110990 struct ctl_table *table, int write,
110991 void __user *buffer, size_t *length, loff_t *ppos)
110992 {
110993+ ctl_table_no_const t;
110994 struct hstate *h = &default_hstate;
110995 unsigned long tmp = h->max_huge_pages;
110996 int ret;
110997@@ -2372,9 +2373,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
110998 if (!hugepages_supported())
110999 return -ENOTSUPP;
111000
111001- table->data = &tmp;
111002- table->maxlen = sizeof(unsigned long);
111003- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
111004+ t = *table;
111005+ t.data = &tmp;
111006+ t.maxlen = sizeof(unsigned long);
111007+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
111008 if (ret)
111009 goto out;
111010
111011@@ -2409,6 +2411,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
111012 struct hstate *h = &default_hstate;
111013 unsigned long tmp;
111014 int ret;
111015+ ctl_table_no_const hugetlb_table;
111016
111017 if (!hugepages_supported())
111018 return -ENOTSUPP;
111019@@ -2418,9 +2421,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
111020 if (write && hstate_is_gigantic(h))
111021 return -EINVAL;
111022
111023- table->data = &tmp;
111024- table->maxlen = sizeof(unsigned long);
111025- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
111026+ hugetlb_table = *table;
111027+ hugetlb_table.data = &tmp;
111028+ hugetlb_table.maxlen = sizeof(unsigned long);
111029+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
111030 if (ret)
111031 goto out;
111032
111033@@ -2910,6 +2914,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
111034 i_mmap_unlock_write(mapping);
111035 }
111036
111037+#ifdef CONFIG_PAX_SEGMEXEC
111038+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
111039+{
111040+ struct mm_struct *mm = vma->vm_mm;
111041+ struct vm_area_struct *vma_m;
111042+ unsigned long address_m;
111043+ pte_t *ptep_m;
111044+
111045+ vma_m = pax_find_mirror_vma(vma);
111046+ if (!vma_m)
111047+ return;
111048+
111049+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111050+ address_m = address + SEGMEXEC_TASK_SIZE;
111051+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
111052+ get_page(page_m);
111053+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
111054+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
111055+}
111056+#endif
111057+
111058 /*
111059 * Hugetlb_cow() should be called with page lock of the original hugepage held.
111060 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
111061@@ -3023,6 +3048,11 @@ retry_avoidcopy:
111062 make_huge_pte(vma, new_page, 1));
111063 page_remove_rmap(old_page);
111064 hugepage_add_new_anon_rmap(new_page, vma, address);
111065+
111066+#ifdef CONFIG_PAX_SEGMEXEC
111067+ pax_mirror_huge_pte(vma, address, new_page);
111068+#endif
111069+
111070 /* Make the old page be freed below */
111071 new_page = old_page;
111072 }
111073@@ -3184,6 +3214,10 @@ retry:
111074 && (vma->vm_flags & VM_SHARED)));
111075 set_huge_pte_at(mm, address, ptep, new_pte);
111076
111077+#ifdef CONFIG_PAX_SEGMEXEC
111078+ pax_mirror_huge_pte(vma, address, page);
111079+#endif
111080+
111081 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
111082 /* Optimization, do the COW without a second fault */
111083 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
111084@@ -3251,6 +3285,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111085 struct address_space *mapping;
111086 int need_wait_lock = 0;
111087
111088+#ifdef CONFIG_PAX_SEGMEXEC
111089+ struct vm_area_struct *vma_m;
111090+#endif
111091+
111092 address &= huge_page_mask(h);
111093
111094 ptep = huge_pte_offset(mm, address);
111095@@ -3264,6 +3302,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111096 VM_FAULT_SET_HINDEX(hstate_index(h));
111097 }
111098
111099+#ifdef CONFIG_PAX_SEGMEXEC
111100+ vma_m = pax_find_mirror_vma(vma);
111101+ if (vma_m) {
111102+ unsigned long address_m;
111103+
111104+ if (vma->vm_start > vma_m->vm_start) {
111105+ address_m = address;
111106+ address -= SEGMEXEC_TASK_SIZE;
111107+ vma = vma_m;
111108+ h = hstate_vma(vma);
111109+ } else
111110+ address_m = address + SEGMEXEC_TASK_SIZE;
111111+
111112+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
111113+ return VM_FAULT_OOM;
111114+ address_m &= HPAGE_MASK;
111115+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
111116+ }
111117+#endif
111118+
111119 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
111120 if (!ptep)
111121 return VM_FAULT_OOM;
111122diff --git a/mm/internal.h b/mm/internal.h
111123index a25e359..e2c96e9 100644
111124--- a/mm/internal.h
111125+++ b/mm/internal.h
111126@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
111127
111128 extern int __isolate_free_page(struct page *page, unsigned int order);
111129 extern void __free_pages_bootmem(struct page *page, unsigned int order);
111130+extern void free_compound_page(struct page *page);
111131 extern void prep_compound_page(struct page *page, unsigned long order);
111132 #ifdef CONFIG_MEMORY_FAILURE
111133 extern bool is_free_buddy_page(struct page *page);
111134@@ -413,7 +414,7 @@ extern u32 hwpoison_filter_enable;
111135
111136 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
111137 unsigned long, unsigned long,
111138- unsigned long, unsigned long);
111139+ unsigned long, unsigned long) __intentional_overflow(-1);
111140
111141 extern void set_pageblock_order(void);
111142 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
111143diff --git a/mm/kmemleak.c b/mm/kmemleak.c
111144index 3716cdb..25b97dc 100644
111145--- a/mm/kmemleak.c
111146+++ b/mm/kmemleak.c
111147@@ -368,7 +368,7 @@ static void print_unreferenced(struct seq_file *seq,
111148
111149 for (i = 0; i < object->trace_len; i++) {
111150 void *ptr = (void *)object->trace[i];
111151- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
111152+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
111153 }
111154 }
111155
111156@@ -1926,7 +1926,7 @@ static int __init kmemleak_late_init(void)
111157 return -ENOMEM;
111158 }
111159
111160- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
111161+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
111162 &kmemleak_fops);
111163 if (!dentry)
111164 pr_warning("Failed to create the debugfs kmemleak file\n");
111165diff --git a/mm/maccess.c b/mm/maccess.c
111166index d53adf9..03a24bf 100644
111167--- a/mm/maccess.c
111168+++ b/mm/maccess.c
111169@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
111170 set_fs(KERNEL_DS);
111171 pagefault_disable();
111172 ret = __copy_from_user_inatomic(dst,
111173- (__force const void __user *)src, size);
111174+ (const void __force_user *)src, size);
111175 pagefault_enable();
111176 set_fs(old_fs);
111177
111178@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
111179
111180 set_fs(KERNEL_DS);
111181 pagefault_disable();
111182- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
111183+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
111184 pagefault_enable();
111185 set_fs(old_fs);
111186
111187diff --git a/mm/madvise.c b/mm/madvise.c
111188index d551475..8fdd7f3 100644
111189--- a/mm/madvise.c
111190+++ b/mm/madvise.c
111191@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
111192 pgoff_t pgoff;
111193 unsigned long new_flags = vma->vm_flags;
111194
111195+#ifdef CONFIG_PAX_SEGMEXEC
111196+ struct vm_area_struct *vma_m;
111197+#endif
111198+
111199 switch (behavior) {
111200 case MADV_NORMAL:
111201 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
111202@@ -126,6 +130,13 @@ success:
111203 /*
111204 * vm_flags is protected by the mmap_sem held in write mode.
111205 */
111206+
111207+#ifdef CONFIG_PAX_SEGMEXEC
111208+ vma_m = pax_find_mirror_vma(vma);
111209+ if (vma_m)
111210+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
111211+#endif
111212+
111213 vma->vm_flags = new_flags;
111214
111215 out:
111216@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
111217 struct vm_area_struct **prev,
111218 unsigned long start, unsigned long end)
111219 {
111220+
111221+#ifdef CONFIG_PAX_SEGMEXEC
111222+ struct vm_area_struct *vma_m;
111223+#endif
111224+
111225 *prev = vma;
111226 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
111227 return -EINVAL;
111228
111229 zap_page_range(vma, start, end - start, NULL);
111230+
111231+#ifdef CONFIG_PAX_SEGMEXEC
111232+ vma_m = pax_find_mirror_vma(vma);
111233+ if (vma_m) {
111234+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
111235+ return -EINVAL;
111236+
111237+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
111238+ }
111239+#endif
111240+
111241 return 0;
111242 }
111243
111244@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
111245 if (end < start)
111246 return error;
111247
111248+#ifdef CONFIG_PAX_SEGMEXEC
111249+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
111250+ if (end > SEGMEXEC_TASK_SIZE)
111251+ return error;
111252+ } else
111253+#endif
111254+
111255+ if (end > TASK_SIZE)
111256+ return error;
111257+
111258 error = 0;
111259 if (end == start)
111260 return error;
111261diff --git a/mm/memory-failure.c b/mm/memory-failure.c
111262index 501820c..9612bcf 100644
111263--- a/mm/memory-failure.c
111264+++ b/mm/memory-failure.c
111265@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
111266
111267 int sysctl_memory_failure_recovery __read_mostly = 1;
111268
111269-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
111270+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
111271
111272 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
111273
111274@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
111275 pfn, t->comm, t->pid);
111276 si.si_signo = SIGBUS;
111277 si.si_errno = 0;
111278- si.si_addr = (void *)addr;
111279+ si.si_addr = (void __user *)addr;
111280 #ifdef __ARCH_SI_TRAPNO
111281 si.si_trapno = trapno;
111282 #endif
111283@@ -825,7 +825,7 @@ static struct page_state {
111284 unsigned long res;
111285 enum action_page_type type;
111286 int (*action)(struct page *p, unsigned long pfn);
111287-} error_states[] = {
111288+} __do_const error_states[] = {
111289 { reserved, reserved, MSG_KERNEL, me_kernel },
111290 /*
111291 * free pages are specially detected outside this table:
111292@@ -1133,7 +1133,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111293 nr_pages = 1 << compound_order(hpage);
111294 else /* normal page or thp */
111295 nr_pages = 1;
111296- atomic_long_add(nr_pages, &num_poisoned_pages);
111297+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
111298
111299 /*
111300 * We need/can do nothing about count=0 pages.
111301@@ -1162,7 +1162,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111302 if (PageHWPoison(hpage)) {
111303 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
111304 || (p != hpage && TestSetPageHWPoison(hpage))) {
111305- atomic_long_sub(nr_pages, &num_poisoned_pages);
111306+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111307 unlock_page(hpage);
111308 return 0;
111309 }
111310@@ -1231,14 +1231,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
111311 */
111312 if (!PageHWPoison(p)) {
111313 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
111314- atomic_long_sub(nr_pages, &num_poisoned_pages);
111315+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111316 put_page(hpage);
111317 res = 0;
111318 goto out;
111319 }
111320 if (hwpoison_filter(p)) {
111321 if (TestClearPageHWPoison(p))
111322- atomic_long_sub(nr_pages, &num_poisoned_pages);
111323+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111324 unlock_page(hpage);
111325 put_page(hpage);
111326 return 0;
111327@@ -1467,7 +1467,7 @@ int unpoison_memory(unsigned long pfn)
111328 return 0;
111329 }
111330 if (TestClearPageHWPoison(p))
111331- atomic_long_dec(&num_poisoned_pages);
111332+ atomic_long_dec_unchecked(&num_poisoned_pages);
111333 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
111334 return 0;
111335 }
111336@@ -1481,7 +1481,7 @@ int unpoison_memory(unsigned long pfn)
111337 */
111338 if (TestClearPageHWPoison(page)) {
111339 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
111340- atomic_long_sub(nr_pages, &num_poisoned_pages);
111341+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
111342 freeit = 1;
111343 if (PageHuge(page))
111344 clear_page_hwpoison_huge_page(page);
111345@@ -1616,11 +1616,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
111346 if (PageHuge(page)) {
111347 set_page_hwpoison_huge_page(hpage);
111348 dequeue_hwpoisoned_huge_page(hpage);
111349- atomic_long_add(1 << compound_order(hpage),
111350+ atomic_long_add_unchecked(1 << compound_order(hpage),
111351 &num_poisoned_pages);
111352 } else {
111353 SetPageHWPoison(page);
111354- atomic_long_inc(&num_poisoned_pages);
111355+ atomic_long_inc_unchecked(&num_poisoned_pages);
111356 }
111357 }
111358 return ret;
111359@@ -1659,7 +1659,7 @@ static int __soft_offline_page(struct page *page, int flags)
111360 put_page(page);
111361 pr_info("soft_offline: %#lx: invalidated\n", pfn);
111362 SetPageHWPoison(page);
111363- atomic_long_inc(&num_poisoned_pages);
111364+ atomic_long_inc_unchecked(&num_poisoned_pages);
111365 return 0;
111366 }
111367
111368@@ -1708,7 +1708,7 @@ static int __soft_offline_page(struct page *page, int flags)
111369 if (!is_free_buddy_page(page))
111370 pr_info("soft offline: %#lx: page leaked\n",
111371 pfn);
111372- atomic_long_inc(&num_poisoned_pages);
111373+ atomic_long_inc_unchecked(&num_poisoned_pages);
111374 }
111375 } else {
111376 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
111377@@ -1778,11 +1778,11 @@ int soft_offline_page(struct page *page, int flags)
111378 if (PageHuge(page)) {
111379 set_page_hwpoison_huge_page(hpage);
111380 if (!dequeue_hwpoisoned_huge_page(hpage))
111381- atomic_long_add(1 << compound_order(hpage),
111382+ atomic_long_add_unchecked(1 << compound_order(hpage),
111383 &num_poisoned_pages);
111384 } else {
111385 if (!TestSetPageHWPoison(page))
111386- atomic_long_inc(&num_poisoned_pages);
111387+ atomic_long_inc_unchecked(&num_poisoned_pages);
111388 }
111389 }
111390 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
111391diff --git a/mm/memory.c b/mm/memory.c
111392index 2a9e098..37435af 100644
111393--- a/mm/memory.c
111394+++ b/mm/memory.c
111395@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
111396 free_pte_range(tlb, pmd, addr);
111397 } while (pmd++, addr = next, addr != end);
111398
111399+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
111400 start &= PUD_MASK;
111401 if (start < floor)
111402 return;
111403@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
111404 pud_clear(pud);
111405 pmd_free_tlb(tlb, pmd, start);
111406 mm_dec_nr_pmds(tlb->mm);
111407+#endif
111408 }
111409
111410 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111411@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111412 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
111413 } while (pud++, addr = next, addr != end);
111414
111415+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
111416 start &= PGDIR_MASK;
111417 if (start < floor)
111418 return;
111419@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
111420 pud = pud_offset(pgd, start);
111421 pgd_clear(pgd);
111422 pud_free_tlb(tlb, pud, start);
111423+#endif
111424+
111425 }
111426
111427 /*
111428@@ -690,7 +695,7 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
111429 /*
111430 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
111431 */
111432- pr_alert("file:%pD fault:%pf mmap:%pf readpage:%pf\n",
111433+ pr_alert("file:%pD fault:%pX mmap:%pX readpage:%pX\n",
111434 vma->vm_file,
111435 vma->vm_ops ? vma->vm_ops->fault : NULL,
111436 vma->vm_file ? vma->vm_file->f_op->mmap : NULL,
111437@@ -1463,6 +1468,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
111438 page_add_file_rmap(page);
111439 set_pte_at(mm, addr, pte, mk_pte(page, prot));
111440
111441+#ifdef CONFIG_PAX_SEGMEXEC
111442+ pax_mirror_file_pte(vma, addr, page, ptl);
111443+#endif
111444+
111445 retval = 0;
111446 pte_unmap_unlock(pte, ptl);
111447 return retval;
111448@@ -1507,9 +1516,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
111449 if (!page_count(page))
111450 return -EINVAL;
111451 if (!(vma->vm_flags & VM_MIXEDMAP)) {
111452+
111453+#ifdef CONFIG_PAX_SEGMEXEC
111454+ struct vm_area_struct *vma_m;
111455+#endif
111456+
111457 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
111458 BUG_ON(vma->vm_flags & VM_PFNMAP);
111459 vma->vm_flags |= VM_MIXEDMAP;
111460+
111461+#ifdef CONFIG_PAX_SEGMEXEC
111462+ vma_m = pax_find_mirror_vma(vma);
111463+ if (vma_m)
111464+ vma_m->vm_flags |= VM_MIXEDMAP;
111465+#endif
111466+
111467 }
111468 return insert_page(vma, addr, page, vma->vm_page_prot);
111469 }
111470@@ -1592,6 +1613,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
111471 unsigned long pfn)
111472 {
111473 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
111474+ BUG_ON(vma->vm_mirror);
111475
111476 if (addr < vma->vm_start || addr >= vma->vm_end)
111477 return -EFAULT;
111478@@ -1839,7 +1861,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
111479
111480 BUG_ON(pud_huge(*pud));
111481
111482- pmd = pmd_alloc(mm, pud, addr);
111483+ pmd = (mm == &init_mm) ?
111484+ pmd_alloc_kernel(mm, pud, addr) :
111485+ pmd_alloc(mm, pud, addr);
111486 if (!pmd)
111487 return -ENOMEM;
111488 do {
111489@@ -1859,7 +1883,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
111490 unsigned long next;
111491 int err;
111492
111493- pud = pud_alloc(mm, pgd, addr);
111494+ pud = (mm == &init_mm) ?
111495+ pud_alloc_kernel(mm, pgd, addr) :
111496+ pud_alloc(mm, pgd, addr);
111497 if (!pud)
111498 return -ENOMEM;
111499 do {
111500@@ -2040,6 +2066,196 @@ static inline int wp_page_reuse(struct mm_struct *mm,
111501 return VM_FAULT_WRITE;
111502 }
111503
111504+#ifdef CONFIG_PAX_SEGMEXEC
111505+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
111506+{
111507+ struct mm_struct *mm = vma->vm_mm;
111508+ spinlock_t *ptl;
111509+ pte_t *pte, entry;
111510+
111511+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
111512+ entry = *pte;
111513+ if (pte_none(entry))
111514+ ;
111515+ else if (!pte_present(entry)) {
111516+ swp_entry_t swapentry;
111517+
111518+ swapentry = pte_to_swp_entry(entry);
111519+ if (!non_swap_entry(swapentry))
111520+ dec_mm_counter_fast(mm, MM_SWAPENTS);
111521+ else if (is_migration_entry(swapentry)) {
111522+ if (PageAnon(migration_entry_to_page(swapentry)))
111523+ dec_mm_counter_fast(mm, MM_ANONPAGES);
111524+ else
111525+ dec_mm_counter_fast(mm, MM_FILEPAGES);
111526+ }
111527+ free_swap_and_cache(swapentry);
111528+ pte_clear_not_present_full(mm, address, pte, 0);
111529+ } else {
111530+ struct page *page;
111531+
111532+ flush_cache_page(vma, address, pte_pfn(entry));
111533+ entry = ptep_clear_flush(vma, address, pte);
111534+ BUG_ON(pte_dirty(entry));
111535+ page = vm_normal_page(vma, address, entry);
111536+ if (page) {
111537+ update_hiwater_rss(mm);
111538+ if (PageAnon(page))
111539+ dec_mm_counter_fast(mm, MM_ANONPAGES);
111540+ else
111541+ dec_mm_counter_fast(mm, MM_FILEPAGES);
111542+ page_remove_rmap(page);
111543+ page_cache_release(page);
111544+ }
111545+ }
111546+ pte_unmap_unlock(pte, ptl);
111547+}
111548+
111549+/* PaX: if vma is mirrored, synchronize the mirror's PTE
111550+ *
111551+ * the ptl of the lower mapped page is held on entry and is not released on exit
111552+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
111553+ */
111554+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
111555+{
111556+ struct mm_struct *mm = vma->vm_mm;
111557+ unsigned long address_m;
111558+ spinlock_t *ptl_m;
111559+ struct vm_area_struct *vma_m;
111560+ pmd_t *pmd_m;
111561+ pte_t *pte_m, entry_m;
111562+
111563+ BUG_ON(!page_m || !PageAnon(page_m));
111564+
111565+ vma_m = pax_find_mirror_vma(vma);
111566+ if (!vma_m)
111567+ return;
111568+
111569+ BUG_ON(!PageLocked(page_m));
111570+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111571+ address_m = address + SEGMEXEC_TASK_SIZE;
111572+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111573+ pte_m = pte_offset_map(pmd_m, address_m);
111574+ ptl_m = pte_lockptr(mm, pmd_m);
111575+ if (ptl != ptl_m) {
111576+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111577+ if (!pte_none(*pte_m))
111578+ goto out;
111579+ }
111580+
111581+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
111582+ page_cache_get(page_m);
111583+ page_add_anon_rmap(page_m, vma_m, address_m);
111584+ inc_mm_counter_fast(mm, MM_ANONPAGES);
111585+ set_pte_at(mm, address_m, pte_m, entry_m);
111586+ update_mmu_cache(vma_m, address_m, pte_m);
111587+out:
111588+ if (ptl != ptl_m)
111589+ spin_unlock(ptl_m);
111590+ pte_unmap(pte_m);
111591+ unlock_page(page_m);
111592+}
111593+
111594+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
111595+{
111596+ struct mm_struct *mm = vma->vm_mm;
111597+ unsigned long address_m;
111598+ spinlock_t *ptl_m;
111599+ struct vm_area_struct *vma_m;
111600+ pmd_t *pmd_m;
111601+ pte_t *pte_m, entry_m;
111602+
111603+ BUG_ON(!page_m || PageAnon(page_m));
111604+
111605+ vma_m = pax_find_mirror_vma(vma);
111606+ if (!vma_m)
111607+ return;
111608+
111609+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111610+ address_m = address + SEGMEXEC_TASK_SIZE;
111611+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111612+ pte_m = pte_offset_map(pmd_m, address_m);
111613+ ptl_m = pte_lockptr(mm, pmd_m);
111614+ if (ptl != ptl_m) {
111615+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111616+ if (!pte_none(*pte_m))
111617+ goto out;
111618+ }
111619+
111620+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
111621+ page_cache_get(page_m);
111622+ page_add_file_rmap(page_m);
111623+ inc_mm_counter_fast(mm, MM_FILEPAGES);
111624+ set_pte_at(mm, address_m, pte_m, entry_m);
111625+ update_mmu_cache(vma_m, address_m, pte_m);
111626+out:
111627+ if (ptl != ptl_m)
111628+ spin_unlock(ptl_m);
111629+ pte_unmap(pte_m);
111630+}
111631+
111632+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
111633+{
111634+ struct mm_struct *mm = vma->vm_mm;
111635+ unsigned long address_m;
111636+ spinlock_t *ptl_m;
111637+ struct vm_area_struct *vma_m;
111638+ pmd_t *pmd_m;
111639+ pte_t *pte_m, entry_m;
111640+
111641+ vma_m = pax_find_mirror_vma(vma);
111642+ if (!vma_m)
111643+ return;
111644+
111645+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
111646+ address_m = address + SEGMEXEC_TASK_SIZE;
111647+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
111648+ pte_m = pte_offset_map(pmd_m, address_m);
111649+ ptl_m = pte_lockptr(mm, pmd_m);
111650+ if (ptl != ptl_m) {
111651+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
111652+ if (!pte_none(*pte_m))
111653+ goto out;
111654+ }
111655+
111656+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
111657+ set_pte_at(mm, address_m, pte_m, entry_m);
111658+out:
111659+ if (ptl != ptl_m)
111660+ spin_unlock(ptl_m);
111661+ pte_unmap(pte_m);
111662+}
111663+
111664+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
111665+{
111666+ struct page *page_m;
111667+ pte_t entry;
111668+
111669+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
111670+ goto out;
111671+
111672+ entry = *pte;
111673+ page_m = vm_normal_page(vma, address, entry);
111674+ if (!page_m)
111675+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
111676+ else if (PageAnon(page_m)) {
111677+ if (pax_find_mirror_vma(vma)) {
111678+ pte_unmap_unlock(pte, ptl);
111679+ lock_page(page_m);
111680+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
111681+ if (pte_same(entry, *pte))
111682+ pax_mirror_anon_pte(vma, address, page_m, ptl);
111683+ else
111684+ unlock_page(page_m);
111685+ }
111686+ } else
111687+ pax_mirror_file_pte(vma, address, page_m, ptl);
111688+
111689+out:
111690+ pte_unmap_unlock(pte, ptl);
111691+}
111692+#endif
111693+
111694 /*
111695 * Handle the case of a page which we actually need to copy to a new page.
111696 *
111697@@ -2093,6 +2309,12 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
111698 */
111699 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
111700 if (likely(pte_same(*page_table, orig_pte))) {
111701+
111702+#ifdef CONFIG_PAX_SEGMEXEC
111703+ if (pax_find_mirror_vma(vma))
111704+ BUG_ON(!trylock_page(new_page));
111705+#endif
111706+
111707 if (old_page) {
111708 if (!PageAnon(old_page)) {
111709 dec_mm_counter_fast(mm, MM_FILEPAGES);
111710@@ -2147,6 +2369,10 @@ static int wp_page_copy(struct mm_struct *mm, struct vm_area_struct *vma,
111711 page_remove_rmap(old_page);
111712 }
111713
111714+#ifdef CONFIG_PAX_SEGMEXEC
111715+ pax_mirror_anon_pte(vma, address, new_page, ptl);
111716+#endif
111717+
111718 /* Free the old page.. */
111719 new_page = old_page;
111720 page_copied = 1;
111721@@ -2578,6 +2804,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
111722 swap_free(entry);
111723 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
111724 try_to_free_swap(page);
111725+
111726+#ifdef CONFIG_PAX_SEGMEXEC
111727+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
111728+#endif
111729+
111730 unlock_page(page);
111731 if (page != swapcache) {
111732 /*
111733@@ -2601,6 +2832,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
111734
111735 /* No need to invalidate - it was non-present before */
111736 update_mmu_cache(vma, address, page_table);
111737+
111738+#ifdef CONFIG_PAX_SEGMEXEC
111739+ pax_mirror_anon_pte(vma, address, page, ptl);
111740+#endif
111741+
111742 unlock:
111743 pte_unmap_unlock(page_table, ptl);
111744 out:
111745@@ -2620,40 +2856,6 @@ out_release:
111746 }
111747
111748 /*
111749- * This is like a special single-page "expand_{down|up}wards()",
111750- * except we must first make sure that 'address{-|+}PAGE_SIZE'
111751- * doesn't hit another vma.
111752- */
111753-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
111754-{
111755- address &= PAGE_MASK;
111756- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
111757- struct vm_area_struct *prev = vma->vm_prev;
111758-
111759- /*
111760- * Is there a mapping abutting this one below?
111761- *
111762- * That's only ok if it's the same stack mapping
111763- * that has gotten split..
111764- */
111765- if (prev && prev->vm_end == address)
111766- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
111767-
111768- return expand_downwards(vma, address - PAGE_SIZE);
111769- }
111770- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
111771- struct vm_area_struct *next = vma->vm_next;
111772-
111773- /* As VM_GROWSDOWN but s/below/above/ */
111774- if (next && next->vm_start == address + PAGE_SIZE)
111775- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
111776-
111777- return expand_upwards(vma, address + PAGE_SIZE);
111778- }
111779- return 0;
111780-}
111781-
111782-/*
111783 * We enter with non-exclusive mmap_sem (to exclude vma changes,
111784 * but allow concurrent faults), and pte mapped but not yet locked.
111785 * We return with mmap_sem still held, but pte unmapped and unlocked.
111786@@ -2663,31 +2865,29 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
111787 unsigned int flags)
111788 {
111789 struct mem_cgroup *memcg;
111790- struct page *page;
111791+ struct page *page = NULL;
111792 spinlock_t *ptl;
111793 pte_t entry;
111794
111795- pte_unmap(page_table);
111796-
111797 /* File mapping without ->vm_ops ? */
111798- if (vma->vm_flags & VM_SHARED)
111799+ if (vma->vm_flags & VM_SHARED) {
111800+ pte_unmap(page_table);
111801 return VM_FAULT_SIGBUS;
111802+ }
111803
111804- /* Check if we need to add a guard page to the stack */
111805- if (check_stack_guard_page(vma, address) < 0)
111806- return VM_FAULT_SIGSEGV;
111807-
111808- /* Use the zero-page for reads */
111809 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
111810 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
111811 vma->vm_page_prot));
111812- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
111813+ ptl = pte_lockptr(mm, pmd);
111814+ spin_lock(ptl);
111815 if (!pte_none(*page_table))
111816 goto unlock;
111817 goto setpte;
111818 }
111819
111820 /* Allocate our own private page. */
111821+ pte_unmap(page_table);
111822+
111823 if (unlikely(anon_vma_prepare(vma)))
111824 goto oom;
111825 page = alloc_zeroed_user_highpage_movable(vma, address);
111826@@ -2711,6 +2911,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
111827 if (!pte_none(*page_table))
111828 goto release;
111829
111830+#ifdef CONFIG_PAX_SEGMEXEC
111831+ if (pax_find_mirror_vma(vma))
111832+ BUG_ON(!trylock_page(page));
111833+#endif
111834+
111835 inc_mm_counter_fast(mm, MM_ANONPAGES);
111836 page_add_new_anon_rmap(page, vma, address);
111837 mem_cgroup_commit_charge(page, memcg, false);
111838@@ -2720,6 +2925,12 @@ setpte:
111839
111840 /* No need to invalidate - it was non-present before */
111841 update_mmu_cache(vma, address, page_table);
111842+
111843+#ifdef CONFIG_PAX_SEGMEXEC
111844+ if (page)
111845+ pax_mirror_anon_pte(vma, address, page, ptl);
111846+#endif
111847+
111848 unlock:
111849 pte_unmap_unlock(page_table, ptl);
111850 return 0;
111851@@ -2952,6 +3163,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111852 return ret;
111853 }
111854 do_set_pte(vma, address, fault_page, pte, false, false);
111855+
111856+#ifdef CONFIG_PAX_SEGMEXEC
111857+ pax_mirror_file_pte(vma, address, fault_page, ptl);
111858+#endif
111859+
111860 unlock_page(fault_page);
111861 unlock_out:
111862 pte_unmap_unlock(pte, ptl);
111863@@ -3003,7 +3219,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111864 }
111865 goto uncharge_out;
111866 }
111867+
111868+#ifdef CONFIG_PAX_SEGMEXEC
111869+ if (pax_find_mirror_vma(vma))
111870+ BUG_ON(!trylock_page(new_page));
111871+#endif
111872+
111873 do_set_pte(vma, address, new_page, pte, true, true);
111874+
111875+#ifdef CONFIG_PAX_SEGMEXEC
111876+ pax_mirror_anon_pte(vma, address, new_page, ptl);
111877+#endif
111878+
111879 mem_cgroup_commit_charge(new_page, memcg, false);
111880 lru_cache_add_active_or_unevictable(new_page, vma);
111881 pte_unmap_unlock(pte, ptl);
111882@@ -3061,6 +3288,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111883 return ret;
111884 }
111885 do_set_pte(vma, address, fault_page, pte, true, false);
111886+
111887+#ifdef CONFIG_PAX_SEGMEXEC
111888+ pax_mirror_file_pte(vma, address, fault_page, ptl);
111889+#endif
111890+
111891 pte_unmap_unlock(pte, ptl);
111892
111893 if (set_page_dirty(fault_page))
111894@@ -3286,6 +3518,12 @@ static int handle_pte_fault(struct mm_struct *mm,
111895 if (flags & FAULT_FLAG_WRITE)
111896 flush_tlb_fix_spurious_fault(vma, address);
111897 }
111898+
111899+#ifdef CONFIG_PAX_SEGMEXEC
111900+ pax_mirror_pte(vma, address, pte, pmd, ptl);
111901+ return 0;
111902+#endif
111903+
111904 unlock:
111905 pte_unmap_unlock(pte, ptl);
111906 return 0;
111907@@ -3305,9 +3543,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
111908 pmd_t *pmd;
111909 pte_t *pte;
111910
111911+#ifdef CONFIG_PAX_SEGMEXEC
111912+ struct vm_area_struct *vma_m;
111913+#endif
111914+
111915 if (unlikely(is_vm_hugetlb_page(vma)))
111916 return hugetlb_fault(mm, vma, address, flags);
111917
111918+#ifdef CONFIG_PAX_SEGMEXEC
111919+ vma_m = pax_find_mirror_vma(vma);
111920+ if (vma_m) {
111921+ unsigned long address_m;
111922+ pgd_t *pgd_m;
111923+ pud_t *pud_m;
111924+ pmd_t *pmd_m;
111925+
111926+ if (vma->vm_start > vma_m->vm_start) {
111927+ address_m = address;
111928+ address -= SEGMEXEC_TASK_SIZE;
111929+ vma = vma_m;
111930+ } else
111931+ address_m = address + SEGMEXEC_TASK_SIZE;
111932+
111933+ pgd_m = pgd_offset(mm, address_m);
111934+ pud_m = pud_alloc(mm, pgd_m, address_m);
111935+ if (!pud_m)
111936+ return VM_FAULT_OOM;
111937+ pmd_m = pmd_alloc(mm, pud_m, address_m);
111938+ if (!pmd_m)
111939+ return VM_FAULT_OOM;
111940+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
111941+ return VM_FAULT_OOM;
111942+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
111943+ }
111944+#endif
111945+
111946 pgd = pgd_offset(mm, address);
111947 pud = pud_alloc(mm, pgd, address);
111948 if (!pud)
111949@@ -3442,6 +3712,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
111950 spin_unlock(&mm->page_table_lock);
111951 return 0;
111952 }
111953+
111954+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
111955+{
111956+ pud_t *new = pud_alloc_one(mm, address);
111957+ if (!new)
111958+ return -ENOMEM;
111959+
111960+ smp_wmb(); /* See comment in __pte_alloc */
111961+
111962+ spin_lock(&mm->page_table_lock);
111963+ if (pgd_present(*pgd)) /* Another has populated it */
111964+ pud_free(mm, new);
111965+ else
111966+ pgd_populate_kernel(mm, pgd, new);
111967+ spin_unlock(&mm->page_table_lock);
111968+ return 0;
111969+}
111970 #endif /* __PAGETABLE_PUD_FOLDED */
111971
111972 #ifndef __PAGETABLE_PMD_FOLDED
111973@@ -3474,6 +3761,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
111974 spin_unlock(&mm->page_table_lock);
111975 return 0;
111976 }
111977+
111978+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
111979+{
111980+ pmd_t *new = pmd_alloc_one(mm, address);
111981+ if (!new)
111982+ return -ENOMEM;
111983+
111984+ smp_wmb(); /* See comment in __pte_alloc */
111985+
111986+ spin_lock(&mm->page_table_lock);
111987+#ifndef __ARCH_HAS_4LEVEL_HACK
111988+ if (!pud_present(*pud)) {
111989+ mm_inc_nr_pmds(mm);
111990+ pud_populate_kernel(mm, pud, new);
111991+ } else /* Another has populated it */
111992+ pmd_free(mm, new);
111993+#else
111994+ if (!pgd_present(*pud)) {
111995+ mm_inc_nr_pmds(mm);
111996+ pgd_populate_kernel(mm, pud, new);
111997+ } else /* Another has populated it */
111998+ pmd_free(mm, new);
111999+#endif /* __ARCH_HAS_4LEVEL_HACK */
112000+ spin_unlock(&mm->page_table_lock);
112001+ return 0;
112002+}
112003 #endif /* __PAGETABLE_PMD_FOLDED */
112004
112005 static int __follow_pte(struct mm_struct *mm, unsigned long address,
112006@@ -3583,8 +3896,8 @@ out:
112007 return ret;
112008 }
112009
112010-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
112011- void *buf, int len, int write)
112012+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
112013+ void *buf, size_t len, int write)
112014 {
112015 resource_size_t phys_addr;
112016 unsigned long prot = 0;
112017@@ -3610,8 +3923,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
112018 * Access another process' address space as given in mm. If non-NULL, use the
112019 * given task for page fault accounting.
112020 */
112021-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
112022- unsigned long addr, void *buf, int len, int write)
112023+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
112024+ unsigned long addr, void *buf, size_t len, int write)
112025 {
112026 struct vm_area_struct *vma;
112027 void *old_buf = buf;
112028@@ -3619,7 +3932,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
112029 down_read(&mm->mmap_sem);
112030 /* ignore errors, just check how much was successfully transferred */
112031 while (len) {
112032- int bytes, ret, offset;
112033+ ssize_t bytes, ret, offset;
112034 void *maddr;
112035 struct page *page = NULL;
112036
112037@@ -3680,8 +3993,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
112038 *
112039 * The caller must hold a reference on @mm.
112040 */
112041-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
112042- void *buf, int len, int write)
112043+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
112044+ void *buf, size_t len, int write)
112045 {
112046 return __access_remote_vm(NULL, mm, addr, buf, len, write);
112047 }
112048@@ -3691,11 +4004,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
112049 * Source/target buffer must be kernel space,
112050 * Do not walk the page table directly, use get_user_pages
112051 */
112052-int access_process_vm(struct task_struct *tsk, unsigned long addr,
112053- void *buf, int len, int write)
112054+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
112055+ void *buf, size_t len, int write)
112056 {
112057 struct mm_struct *mm;
112058- int ret;
112059+ ssize_t ret;
112060
112061 mm = get_task_mm(tsk);
112062 if (!mm)
112063diff --git a/mm/mempolicy.c b/mm/mempolicy.c
112064index 99d4c1d..a577817 100644
112065--- a/mm/mempolicy.c
112066+++ b/mm/mempolicy.c
112067@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
112068 unsigned long vmstart;
112069 unsigned long vmend;
112070
112071+#ifdef CONFIG_PAX_SEGMEXEC
112072+ struct vm_area_struct *vma_m;
112073+#endif
112074+
112075 vma = find_vma(mm, start);
112076 if (!vma || vma->vm_start > start)
112077 return -EFAULT;
112078@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
112079 err = vma_replace_policy(vma, new_pol);
112080 if (err)
112081 goto out;
112082+
112083+#ifdef CONFIG_PAX_SEGMEXEC
112084+ vma_m = pax_find_mirror_vma(vma);
112085+ if (vma_m) {
112086+ err = vma_replace_policy(vma_m, new_pol);
112087+ if (err)
112088+ goto out;
112089+ }
112090+#endif
112091+
112092 }
112093
112094 out:
112095@@ -1161,6 +1175,17 @@ static long do_mbind(unsigned long start, unsigned long len,
112096
112097 if (end < start)
112098 return -EINVAL;
112099+
112100+#ifdef CONFIG_PAX_SEGMEXEC
112101+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
112102+ if (end > SEGMEXEC_TASK_SIZE)
112103+ return -EINVAL;
112104+ } else
112105+#endif
112106+
112107+ if (end > TASK_SIZE)
112108+ return -EINVAL;
112109+
112110 if (end == start)
112111 return 0;
112112
112113@@ -1386,8 +1411,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
112114 */
112115 tcred = __task_cred(task);
112116 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
112117- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
112118- !capable(CAP_SYS_NICE)) {
112119+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
112120 rcu_read_unlock();
112121 err = -EPERM;
112122 goto out_put;
112123@@ -1418,6 +1442,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
112124 goto out;
112125 }
112126
112127+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
112128+ if (mm != current->mm &&
112129+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
112130+ mmput(mm);
112131+ err = -EPERM;
112132+ goto out;
112133+ }
112134+#endif
112135+
112136 err = do_migrate_pages(mm, old, new,
112137 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
112138
112139diff --git a/mm/migrate.c b/mm/migrate.c
112140index f53838f..a26fa94 100644
112141--- a/mm/migrate.c
112142+++ b/mm/migrate.c
112143@@ -1484,8 +1484,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
112144 */
112145 tcred = __task_cred(task);
112146 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
112147- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
112148- !capable(CAP_SYS_NICE)) {
112149+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
112150 rcu_read_unlock();
112151 err = -EPERM;
112152 goto out;
112153diff --git a/mm/mlock.c b/mm/mlock.c
112154index 6fd2cf1..cbae765 100644
112155--- a/mm/mlock.c
112156+++ b/mm/mlock.c
112157@@ -14,6 +14,7 @@
112158 #include <linux/pagevec.h>
112159 #include <linux/mempolicy.h>
112160 #include <linux/syscalls.h>
112161+#include <linux/security.h>
112162 #include <linux/sched.h>
112163 #include <linux/export.h>
112164 #include <linux/rmap.h>
112165@@ -557,7 +558,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
112166 {
112167 unsigned long nstart, end, tmp;
112168 struct vm_area_struct * vma, * prev;
112169- int error;
112170+ int error = 0;
112171
112172 VM_BUG_ON(start & ~PAGE_MASK);
112173 VM_BUG_ON(len != PAGE_ALIGN(len));
112174@@ -566,6 +567,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
112175 return -EINVAL;
112176 if (end == start)
112177 return 0;
112178+ if (end > TASK_SIZE)
112179+ return -EINVAL;
112180+
112181 vma = find_vma(current->mm, start);
112182 if (!vma || vma->vm_start > start)
112183 return -ENOMEM;
112184@@ -577,6 +581,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
112185 for (nstart = start ; ; ) {
112186 vm_flags_t newflags;
112187
112188+#ifdef CONFIG_PAX_SEGMEXEC
112189+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
112190+ break;
112191+#endif
112192+
112193 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
112194
112195 newflags = vma->vm_flags & ~VM_LOCKED;
112196@@ -627,6 +636,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
112197 locked += current->mm->locked_vm;
112198
112199 /* check against resource limits */
112200+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
112201 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
112202 error = do_mlock(start, len, 1);
112203
112204@@ -668,6 +678,11 @@ static int do_mlockall(int flags)
112205 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
112206 vm_flags_t newflags;
112207
112208+#ifdef CONFIG_PAX_SEGMEXEC
112209+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
112210+ break;
112211+#endif
112212+
112213 newflags = vma->vm_flags & ~VM_LOCKED;
112214 if (flags & MCL_CURRENT)
112215 newflags |= VM_LOCKED;
112216@@ -699,8 +714,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
112217 lock_limit >>= PAGE_SHIFT;
112218
112219 ret = -ENOMEM;
112220+
112221+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
112222+
112223 down_write(&current->mm->mmap_sem);
112224-
112225 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
112226 capable(CAP_IPC_LOCK))
112227 ret = do_mlockall(flags);
112228diff --git a/mm/mm_init.c b/mm/mm_init.c
112229index 5f420f7..dd42fb1b 100644
112230--- a/mm/mm_init.c
112231+++ b/mm/mm_init.c
112232@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
112233 return NOTIFY_OK;
112234 }
112235
112236-static struct notifier_block compute_batch_nb __meminitdata = {
112237+static struct notifier_block compute_batch_nb __meminitconst = {
112238 .notifier_call = mm_compute_batch_notifier,
112239 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
112240 };
112241diff --git a/mm/mmap.c b/mm/mmap.c
112242index bb50cac..6d50a9f 100644
112243--- a/mm/mmap.c
112244+++ b/mm/mmap.c
112245@@ -41,6 +41,7 @@
112246 #include <linux/notifier.h>
112247 #include <linux/memory.h>
112248 #include <linux/printk.h>
112249+#include <linux/random.h>
112250
112251 #include <asm/uaccess.h>
112252 #include <asm/cacheflush.h>
112253@@ -57,6 +58,16 @@
112254 #define arch_rebalance_pgtables(addr, len) (addr)
112255 #endif
112256
112257+static inline void verify_mm_writelocked(struct mm_struct *mm)
112258+{
112259+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
112260+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
112261+ up_read(&mm->mmap_sem);
112262+ BUG();
112263+ }
112264+#endif
112265+}
112266+
112267 static void unmap_region(struct mm_struct *mm,
112268 struct vm_area_struct *vma, struct vm_area_struct *prev,
112269 unsigned long start, unsigned long end);
112270@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
112271 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
112272 *
112273 */
112274-pgprot_t protection_map[16] = {
112275+pgprot_t protection_map[16] __read_only = {
112276 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
112277 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
112278 };
112279
112280-pgprot_t vm_get_page_prot(unsigned long vm_flags)
112281+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
112282 {
112283- return __pgprot(pgprot_val(protection_map[vm_flags &
112284+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
112285 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
112286 pgprot_val(arch_vm_get_page_prot(vm_flags)));
112287+
112288+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112289+ if (!(__supported_pte_mask & _PAGE_NX) &&
112290+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
112291+ (vm_flags & (VM_READ | VM_WRITE)))
112292+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
112293+#endif
112294+
112295+ return prot;
112296 }
112297 EXPORT_SYMBOL(vm_get_page_prot);
112298
112299@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
112300 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
112301 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
112302 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
112303+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
112304 /*
112305 * Make sure vm_committed_as in one cacheline and not cacheline shared with
112306 * other variables. It can be updated by several CPUs frequently.
112307@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
112308 struct vm_area_struct *next = vma->vm_next;
112309
112310 might_sleep();
112311+ BUG_ON(vma->vm_mirror);
112312 if (vma->vm_ops && vma->vm_ops->close)
112313 vma->vm_ops->close(vma);
112314 if (vma->vm_file)
112315@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
112316
112317 SYSCALL_DEFINE1(brk, unsigned long, brk)
112318 {
112319+ unsigned long rlim;
112320 unsigned long retval;
112321 unsigned long newbrk, oldbrk;
112322 struct mm_struct *mm = current->mm;
112323@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
112324 * segment grow beyond its set limit the in case where the limit is
112325 * not page aligned -Ram Gupta
112326 */
112327- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
112328+ rlim = rlimit(RLIMIT_DATA);
112329+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
112330+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
112331+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
112332+ rlim = 4096 * PAGE_SIZE;
112333+#endif
112334+ if (check_data_rlimit(rlim, brk, mm->start_brk,
112335 mm->end_data, mm->start_data))
112336 goto out;
112337
112338@@ -967,6 +996,12 @@ static int
112339 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
112340 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
112341 {
112342+
112343+#ifdef CONFIG_PAX_SEGMEXEC
112344+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
112345+ return 0;
112346+#endif
112347+
112348 if (is_mergeable_vma(vma, file, vm_flags) &&
112349 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
112350 if (vma->vm_pgoff == vm_pgoff)
112351@@ -986,6 +1021,12 @@ static int
112352 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
112353 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
112354 {
112355+
112356+#ifdef CONFIG_PAX_SEGMEXEC
112357+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
112358+ return 0;
112359+#endif
112360+
112361 if (is_mergeable_vma(vma, file, vm_flags) &&
112362 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
112363 pgoff_t vm_pglen;
112364@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112365 struct vm_area_struct *area, *next;
112366 int err;
112367
112368+#ifdef CONFIG_PAX_SEGMEXEC
112369+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
112370+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
112371+
112372+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
112373+#endif
112374+
112375 /*
112376 * We later require that vma->vm_flags == vm_flags,
112377 * so this tests vma->vm_flags & VM_SPECIAL, too.
112378@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112379 if (next && next->vm_end == end) /* cases 6, 7, 8 */
112380 next = next->vm_next;
112381
112382+#ifdef CONFIG_PAX_SEGMEXEC
112383+ if (prev)
112384+ prev_m = pax_find_mirror_vma(prev);
112385+ if (area)
112386+ area_m = pax_find_mirror_vma(area);
112387+ if (next)
112388+ next_m = pax_find_mirror_vma(next);
112389+#endif
112390+
112391 /*
112392 * Can it merge with the predecessor?
112393 */
112394@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112395 /* cases 1, 6 */
112396 err = vma_adjust(prev, prev->vm_start,
112397 next->vm_end, prev->vm_pgoff, NULL);
112398- } else /* cases 2, 5, 7 */
112399+
112400+#ifdef CONFIG_PAX_SEGMEXEC
112401+ if (!err && prev_m)
112402+ err = vma_adjust(prev_m, prev_m->vm_start,
112403+ next_m->vm_end, prev_m->vm_pgoff, NULL);
112404+#endif
112405+
112406+ } else { /* cases 2, 5, 7 */
112407 err = vma_adjust(prev, prev->vm_start,
112408 end, prev->vm_pgoff, NULL);
112409+
112410+#ifdef CONFIG_PAX_SEGMEXEC
112411+ if (!err && prev_m)
112412+ err = vma_adjust(prev_m, prev_m->vm_start,
112413+ end_m, prev_m->vm_pgoff, NULL);
112414+#endif
112415+
112416+ }
112417 if (err)
112418 return NULL;
112419 khugepaged_enter_vma_merge(prev, vm_flags);
112420@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
112421 mpol_equal(policy, vma_policy(next)) &&
112422 can_vma_merge_before(next, vm_flags,
112423 anon_vma, file, pgoff+pglen)) {
112424- if (prev && addr < prev->vm_end) /* case 4 */
112425+ if (prev && addr < prev->vm_end) { /* case 4 */
112426 err = vma_adjust(prev, prev->vm_start,
112427 addr, prev->vm_pgoff, NULL);
112428- else /* cases 3, 8 */
112429+
112430+#ifdef CONFIG_PAX_SEGMEXEC
112431+ if (!err && prev_m)
112432+ err = vma_adjust(prev_m, prev_m->vm_start,
112433+ addr_m, prev_m->vm_pgoff, NULL);
112434+#endif
112435+
112436+ } else { /* cases 3, 8 */
112437 err = vma_adjust(area, addr, next->vm_end,
112438 next->vm_pgoff - pglen, NULL);
112439+
112440+#ifdef CONFIG_PAX_SEGMEXEC
112441+ if (!err && area_m)
112442+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
112443+ next_m->vm_pgoff - pglen, NULL);
112444+#endif
112445+
112446+ }
112447 if (err)
112448 return NULL;
112449 khugepaged_enter_vma_merge(area, vm_flags);
112450@@ -1199,8 +1286,10 @@ none:
112451 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
112452 struct file *file, long pages)
112453 {
112454- const unsigned long stack_flags
112455- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
112456+
112457+#ifdef CONFIG_PAX_RANDMMAP
112458+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
112459+#endif
112460
112461 mm->total_vm += pages;
112462
112463@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
112464 mm->shared_vm += pages;
112465 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
112466 mm->exec_vm += pages;
112467- } else if (flags & stack_flags)
112468+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
112469 mm->stack_vm += pages;
112470 }
112471 #endif /* CONFIG_PROC_FS */
112472@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
112473 locked += mm->locked_vm;
112474 lock_limit = rlimit(RLIMIT_MEMLOCK);
112475 lock_limit >>= PAGE_SHIFT;
112476+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
112477 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
112478 return -EAGAIN;
112479 }
112480@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112481 * (the exception is when the underlying filesystem is noexec
112482 * mounted, in which case we dont add PROT_EXEC.)
112483 */
112484- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
112485+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
112486 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
112487 prot |= PROT_EXEC;
112488
112489@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112490 /* Obtain the address to map to. we verify (or select) it and ensure
112491 * that it represents a valid section of the address space.
112492 */
112493- addr = get_unmapped_area(file, addr, len, pgoff, flags);
112494+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
112495 if (addr & ~PAGE_MASK)
112496 return addr;
112497
112498@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112499 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
112500 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
112501
112502+#ifdef CONFIG_PAX_MPROTECT
112503+ if (mm->pax_flags & MF_PAX_MPROTECT) {
112504+
112505+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
112506+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
112507+ mm->binfmt->handle_mmap)
112508+ mm->binfmt->handle_mmap(file);
112509+#endif
112510+
112511+#ifndef CONFIG_PAX_MPROTECT_COMPAT
112512+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
112513+ gr_log_rwxmmap(file);
112514+
112515+#ifdef CONFIG_PAX_EMUPLT
112516+ vm_flags &= ~VM_EXEC;
112517+#else
112518+ return -EPERM;
112519+#endif
112520+
112521+ }
112522+
112523+ if (!(vm_flags & VM_EXEC))
112524+ vm_flags &= ~VM_MAYEXEC;
112525+#else
112526+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
112527+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
112528+#endif
112529+ else
112530+ vm_flags &= ~VM_MAYWRITE;
112531+ }
112532+#endif
112533+
112534+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112535+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
112536+ vm_flags &= ~VM_PAGEEXEC;
112537+#endif
112538+
112539 if (flags & MAP_LOCKED)
112540 if (!can_do_mlock())
112541 return -EPERM;
112542@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
112543 vm_flags |= VM_NORESERVE;
112544 }
112545
112546+ if (!gr_acl_handle_mmap(file, prot))
112547+ return -EACCES;
112548+
112549 addr = mmap_region(file, addr, len, vm_flags, pgoff);
112550 if (!IS_ERR_VALUE(addr) &&
112551 ((vm_flags & VM_LOCKED) ||
112552@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
112553 vm_flags_t vm_flags = vma->vm_flags;
112554
112555 /* If it was private or non-writable, the write bit is already clear */
112556- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
112557+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
112558 return 0;
112559
112560 /* The backer wishes to know when pages are first written to? */
112561@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112562 struct rb_node **rb_link, *rb_parent;
112563 unsigned long charged = 0;
112564
112565+#ifdef CONFIG_PAX_SEGMEXEC
112566+ struct vm_area_struct *vma_m = NULL;
112567+#endif
112568+
112569+ /*
112570+ * mm->mmap_sem is required to protect against another thread
112571+ * changing the mappings in case we sleep.
112572+ */
112573+ verify_mm_writelocked(mm);
112574+
112575 /* Check against address space limit. */
112576+
112577+#ifdef CONFIG_PAX_RANDMMAP
112578+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
112579+#endif
112580+
112581 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
112582 unsigned long nr_pages;
112583
112584@@ -1555,6 +1700,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112585 &rb_parent)) {
112586 if (do_munmap(mm, addr, len))
112587 return -ENOMEM;
112588+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
112589 }
112590
112591 /*
112592@@ -1586,6 +1732,16 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112593 goto unacct_error;
112594 }
112595
112596+#ifdef CONFIG_PAX_SEGMEXEC
112597+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
112598+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
112599+ if (!vma_m) {
112600+ error = -ENOMEM;
112601+ goto free_vma;
112602+ }
112603+ }
112604+#endif
112605+
112606 vma->vm_mm = mm;
112607 vma->vm_start = addr;
112608 vma->vm_end = addr + len;
112609@@ -1616,6 +1772,13 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112610 if (error)
112611 goto unmap_and_free_vma;
112612
112613+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
112614+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
112615+ vma->vm_flags |= VM_PAGEEXEC;
112616+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
112617+ }
112618+#endif
112619+
112620 /* Can addr have changed??
112621 *
112622 * Answer: Yes, several device drivers can do it in their
112623@@ -1634,6 +1797,12 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
112624 }
112625
112626 vma_link(mm, vma, prev, rb_link, rb_parent);
112627+
112628+#ifdef CONFIG_PAX_SEGMEXEC
112629+ if (vma_m)
112630+ BUG_ON(pax_mirror_vma(vma_m, vma));
112631+#endif
112632+
112633 /* Once vma denies write, undo our temporary denial count */
112634 if (file) {
112635 if (vm_flags & VM_SHARED)
112636@@ -1646,6 +1815,7 @@ out:
112637 perf_event_mmap(vma);
112638
112639 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
112640+ track_exec_limit(mm, addr, addr + len, vm_flags);
112641 if (vm_flags & VM_LOCKED) {
112642 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
112643 vma == get_gate_vma(current->mm)))
112644@@ -1683,6 +1853,12 @@ allow_write_and_free_vma:
112645 if (vm_flags & VM_DENYWRITE)
112646 allow_write_access(file);
112647 free_vma:
112648+
112649+#ifdef CONFIG_PAX_SEGMEXEC
112650+ if (vma_m)
112651+ kmem_cache_free(vm_area_cachep, vma_m);
112652+#endif
112653+
112654 kmem_cache_free(vm_area_cachep, vma);
112655 unacct_error:
112656 if (charged)
112657@@ -1690,7 +1866,63 @@ unacct_error:
112658 return error;
112659 }
112660
112661-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
112662+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
112663+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
112664+{
112665+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
112666+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
112667+
112668+ return 0;
112669+}
112670+#endif
112671+
112672+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
112673+{
112674+ if (!vma) {
112675+#ifdef CONFIG_STACK_GROWSUP
112676+ if (addr > sysctl_heap_stack_gap)
112677+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
112678+ else
112679+ vma = find_vma(current->mm, 0);
112680+ if (vma && (vma->vm_flags & VM_GROWSUP))
112681+ return false;
112682+#endif
112683+ return true;
112684+ }
112685+
112686+ if (addr + len > vma->vm_start)
112687+ return false;
112688+
112689+ if (vma->vm_flags & VM_GROWSDOWN)
112690+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
112691+#ifdef CONFIG_STACK_GROWSUP
112692+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
112693+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
112694+#endif
112695+ else if (offset)
112696+ return offset <= vma->vm_start - addr - len;
112697+
112698+ return true;
112699+}
112700+
112701+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
112702+{
112703+ if (vma->vm_start < len)
112704+ return -ENOMEM;
112705+
112706+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
112707+ if (offset <= vma->vm_start - len)
112708+ return vma->vm_start - len - offset;
112709+ else
112710+ return -ENOMEM;
112711+ }
112712+
112713+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
112714+ return vma->vm_start - len - sysctl_heap_stack_gap;
112715+ return -ENOMEM;
112716+}
112717+
112718+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
112719 {
112720 /*
112721 * We implement the search by looking for an rbtree node that
112722@@ -1738,11 +1970,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
112723 }
112724 }
112725
112726- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
112727+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
112728 check_current:
112729 /* Check if current node has a suitable gap */
112730 if (gap_start > high_limit)
112731 return -ENOMEM;
112732+
112733+ if (gap_end - gap_start > info->threadstack_offset)
112734+ gap_start += info->threadstack_offset;
112735+ else
112736+ gap_start = gap_end;
112737+
112738+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
112739+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112740+ gap_start += sysctl_heap_stack_gap;
112741+ else
112742+ gap_start = gap_end;
112743+ }
112744+ if (vma->vm_flags & VM_GROWSDOWN) {
112745+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112746+ gap_end -= sysctl_heap_stack_gap;
112747+ else
112748+ gap_end = gap_start;
112749+ }
112750 if (gap_end >= low_limit && gap_end - gap_start >= length)
112751 goto found;
112752
112753@@ -1792,7 +2042,7 @@ found:
112754 return gap_start;
112755 }
112756
112757-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
112758+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
112759 {
112760 struct mm_struct *mm = current->mm;
112761 struct vm_area_struct *vma;
112762@@ -1846,6 +2096,24 @@ check_current:
112763 gap_end = vma->vm_start;
112764 if (gap_end < low_limit)
112765 return -ENOMEM;
112766+
112767+ if (gap_end - gap_start > info->threadstack_offset)
112768+ gap_end -= info->threadstack_offset;
112769+ else
112770+ gap_end = gap_start;
112771+
112772+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
112773+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112774+ gap_start += sysctl_heap_stack_gap;
112775+ else
112776+ gap_start = gap_end;
112777+ }
112778+ if (vma->vm_flags & VM_GROWSDOWN) {
112779+ if (gap_end - gap_start > sysctl_heap_stack_gap)
112780+ gap_end -= sysctl_heap_stack_gap;
112781+ else
112782+ gap_end = gap_start;
112783+ }
112784 if (gap_start <= high_limit && gap_end - gap_start >= length)
112785 goto found;
112786
112787@@ -1909,6 +2177,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112788 struct mm_struct *mm = current->mm;
112789 struct vm_area_struct *vma;
112790 struct vm_unmapped_area_info info;
112791+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
112792
112793 if (len > TASK_SIZE - mmap_min_addr)
112794 return -ENOMEM;
112795@@ -1916,11 +2185,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112796 if (flags & MAP_FIXED)
112797 return addr;
112798
112799+#ifdef CONFIG_PAX_RANDMMAP
112800+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
112801+#endif
112802+
112803 if (addr) {
112804 addr = PAGE_ALIGN(addr);
112805 vma = find_vma(mm, addr);
112806 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
112807- (!vma || addr + len <= vma->vm_start))
112808+ check_heap_stack_gap(vma, addr, len, offset))
112809 return addr;
112810 }
112811
112812@@ -1929,6 +2202,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
112813 info.low_limit = mm->mmap_base;
112814 info.high_limit = TASK_SIZE;
112815 info.align_mask = 0;
112816+ info.threadstack_offset = offset;
112817 return vm_unmapped_area(&info);
112818 }
112819 #endif
112820@@ -1947,6 +2221,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112821 struct mm_struct *mm = current->mm;
112822 unsigned long addr = addr0;
112823 struct vm_unmapped_area_info info;
112824+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
112825
112826 /* requested length too big for entire address space */
112827 if (len > TASK_SIZE - mmap_min_addr)
112828@@ -1955,12 +2230,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112829 if (flags & MAP_FIXED)
112830 return addr;
112831
112832+#ifdef CONFIG_PAX_RANDMMAP
112833+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
112834+#endif
112835+
112836 /* requesting a specific address */
112837 if (addr) {
112838 addr = PAGE_ALIGN(addr);
112839 vma = find_vma(mm, addr);
112840 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
112841- (!vma || addr + len <= vma->vm_start))
112842+ check_heap_stack_gap(vma, addr, len, offset))
112843 return addr;
112844 }
112845
112846@@ -1969,6 +2248,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112847 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
112848 info.high_limit = mm->mmap_base;
112849 info.align_mask = 0;
112850+ info.threadstack_offset = offset;
112851 addr = vm_unmapped_area(&info);
112852
112853 /*
112854@@ -1981,6 +2261,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
112855 VM_BUG_ON(addr != -ENOMEM);
112856 info.flags = 0;
112857 info.low_limit = TASK_UNMAPPED_BASE;
112858+
112859+#ifdef CONFIG_PAX_RANDMMAP
112860+ if (mm->pax_flags & MF_PAX_RANDMMAP)
112861+ info.low_limit += mm->delta_mmap;
112862+#endif
112863+
112864 info.high_limit = TASK_SIZE;
112865 addr = vm_unmapped_area(&info);
112866 }
112867@@ -2081,6 +2367,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
112868 return vma;
112869 }
112870
112871+#ifdef CONFIG_PAX_SEGMEXEC
112872+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
112873+{
112874+ struct vm_area_struct *vma_m;
112875+
112876+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
112877+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
112878+ BUG_ON(vma->vm_mirror);
112879+ return NULL;
112880+ }
112881+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
112882+ vma_m = vma->vm_mirror;
112883+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
112884+ BUG_ON(vma->vm_file != vma_m->vm_file);
112885+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
112886+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
112887+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
112888+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
112889+ return vma_m;
112890+}
112891+#endif
112892+
112893 /*
112894 * Verify that the stack growth is acceptable and
112895 * update accounting. This is shared with both the
112896@@ -2098,8 +2406,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112897
112898 /* Stack limit test */
112899 actual_size = size;
112900- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
112901- actual_size -= PAGE_SIZE;
112902+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
112903 if (actual_size > READ_ONCE(rlim[RLIMIT_STACK].rlim_cur))
112904 return -ENOMEM;
112905
112906@@ -2110,6 +2417,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112907 locked = mm->locked_vm + grow;
112908 limit = READ_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
112909 limit >>= PAGE_SHIFT;
112910+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
112911 if (locked > limit && !capable(CAP_IPC_LOCK))
112912 return -ENOMEM;
112913 }
112914@@ -2139,37 +2447,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
112915 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
112916 * vma is the last one with address > vma->vm_end. Have to extend vma.
112917 */
112918+#ifndef CONFIG_IA64
112919+static
112920+#endif
112921 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
112922 {
112923 int error;
112924+ bool locknext;
112925
112926 if (!(vma->vm_flags & VM_GROWSUP))
112927 return -EFAULT;
112928
112929+ /* Also guard against wrapping around to address 0. */
112930+ if (address < PAGE_ALIGN(address+1))
112931+ address = PAGE_ALIGN(address+1);
112932+ else
112933+ return -ENOMEM;
112934+
112935 /*
112936 * We must make sure the anon_vma is allocated
112937 * so that the anon_vma locking is not a noop.
112938 */
112939 if (unlikely(anon_vma_prepare(vma)))
112940 return -ENOMEM;
112941+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
112942+ if (locknext && anon_vma_prepare(vma->vm_next))
112943+ return -ENOMEM;
112944 vma_lock_anon_vma(vma);
112945+ if (locknext)
112946+ vma_lock_anon_vma(vma->vm_next);
112947
112948 /*
112949 * vma->vm_start/vm_end cannot change under us because the caller
112950 * is required to hold the mmap_sem in read mode. We need the
112951- * anon_vma lock to serialize against concurrent expand_stacks.
112952- * Also guard against wrapping around to address 0.
112953+ * anon_vma locks to serialize against concurrent expand_stacks
112954+ * and expand_upwards.
112955 */
112956- if (address < PAGE_ALIGN(address+4))
112957- address = PAGE_ALIGN(address+4);
112958- else {
112959- vma_unlock_anon_vma(vma);
112960- return -ENOMEM;
112961- }
112962 error = 0;
112963
112964 /* Somebody else might have raced and expanded it already */
112965- if (address > vma->vm_end) {
112966+ 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)
112967+ error = -ENOMEM;
112968+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
112969 unsigned long size, grow;
112970
112971 size = address - vma->vm_start;
112972@@ -2204,6 +2523,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
112973 }
112974 }
112975 }
112976+ if (locknext)
112977+ vma_unlock_anon_vma(vma->vm_next);
112978 vma_unlock_anon_vma(vma);
112979 khugepaged_enter_vma_merge(vma, vma->vm_flags);
112980 validate_mm(vma->vm_mm);
112981@@ -2218,6 +2539,8 @@ int expand_downwards(struct vm_area_struct *vma,
112982 unsigned long address)
112983 {
112984 int error;
112985+ bool lockprev = false;
112986+ struct vm_area_struct *prev;
112987
112988 /*
112989 * We must make sure the anon_vma is allocated
112990@@ -2231,6 +2554,15 @@ int expand_downwards(struct vm_area_struct *vma,
112991 if (error)
112992 return error;
112993
112994+ prev = vma->vm_prev;
112995+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
112996+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
112997+#endif
112998+ if (lockprev && anon_vma_prepare(prev))
112999+ return -ENOMEM;
113000+ if (lockprev)
113001+ vma_lock_anon_vma(prev);
113002+
113003 vma_lock_anon_vma(vma);
113004
113005 /*
113006@@ -2240,9 +2572,17 @@ int expand_downwards(struct vm_area_struct *vma,
113007 */
113008
113009 /* Somebody else might have raced and expanded it already */
113010- if (address < vma->vm_start) {
113011+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
113012+ error = -ENOMEM;
113013+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
113014 unsigned long size, grow;
113015
113016+#ifdef CONFIG_PAX_SEGMEXEC
113017+ struct vm_area_struct *vma_m;
113018+
113019+ vma_m = pax_find_mirror_vma(vma);
113020+#endif
113021+
113022 size = vma->vm_end - address;
113023 grow = (vma->vm_start - address) >> PAGE_SHIFT;
113024
113025@@ -2267,13 +2607,27 @@ int expand_downwards(struct vm_area_struct *vma,
113026 vma->vm_pgoff -= grow;
113027 anon_vma_interval_tree_post_update_vma(vma);
113028 vma_gap_update(vma);
113029+
113030+#ifdef CONFIG_PAX_SEGMEXEC
113031+ if (vma_m) {
113032+ anon_vma_interval_tree_pre_update_vma(vma_m);
113033+ vma_m->vm_start -= grow << PAGE_SHIFT;
113034+ vma_m->vm_pgoff -= grow;
113035+ anon_vma_interval_tree_post_update_vma(vma_m);
113036+ vma_gap_update(vma_m);
113037+ }
113038+#endif
113039+
113040 spin_unlock(&vma->vm_mm->page_table_lock);
113041
113042+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
113043 perf_event_mmap(vma);
113044 }
113045 }
113046 }
113047 vma_unlock_anon_vma(vma);
113048+ if (lockprev)
113049+ vma_unlock_anon_vma(prev);
113050 khugepaged_enter_vma_merge(vma, vma->vm_flags);
113051 validate_mm(vma->vm_mm);
113052 return error;
113053@@ -2373,6 +2727,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
113054 do {
113055 long nrpages = vma_pages(vma);
113056
113057+#ifdef CONFIG_PAX_SEGMEXEC
113058+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
113059+ vma = remove_vma(vma);
113060+ continue;
113061+ }
113062+#endif
113063+
113064 if (vma->vm_flags & VM_ACCOUNT)
113065 nr_accounted += nrpages;
113066 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
113067@@ -2417,6 +2778,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
113068 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
113069 vma->vm_prev = NULL;
113070 do {
113071+
113072+#ifdef CONFIG_PAX_SEGMEXEC
113073+ if (vma->vm_mirror) {
113074+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
113075+ vma->vm_mirror->vm_mirror = NULL;
113076+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
113077+ vma->vm_mirror = NULL;
113078+ }
113079+#endif
113080+
113081 vma_rb_erase(vma, &mm->mm_rb);
113082 mm->map_count--;
113083 tail_vma = vma;
113084@@ -2444,14 +2815,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113085 struct vm_area_struct *new;
113086 int err = -ENOMEM;
113087
113088+#ifdef CONFIG_PAX_SEGMEXEC
113089+ struct vm_area_struct *vma_m, *new_m = NULL;
113090+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
113091+#endif
113092+
113093 if (is_vm_hugetlb_page(vma) && (addr &
113094 ~(huge_page_mask(hstate_vma(vma)))))
113095 return -EINVAL;
113096
113097+#ifdef CONFIG_PAX_SEGMEXEC
113098+ vma_m = pax_find_mirror_vma(vma);
113099+#endif
113100+
113101 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
113102 if (!new)
113103 goto out_err;
113104
113105+#ifdef CONFIG_PAX_SEGMEXEC
113106+ if (vma_m) {
113107+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
113108+ if (!new_m) {
113109+ kmem_cache_free(vm_area_cachep, new);
113110+ goto out_err;
113111+ }
113112+ }
113113+#endif
113114+
113115 /* most fields are the same, copy all, and then fixup */
113116 *new = *vma;
113117
113118@@ -2464,6 +2854,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113119 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
113120 }
113121
113122+#ifdef CONFIG_PAX_SEGMEXEC
113123+ if (vma_m) {
113124+ *new_m = *vma_m;
113125+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
113126+ new_m->vm_mirror = new;
113127+ new->vm_mirror = new_m;
113128+
113129+ if (new_below)
113130+ new_m->vm_end = addr_m;
113131+ else {
113132+ new_m->vm_start = addr_m;
113133+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
113134+ }
113135+ }
113136+#endif
113137+
113138 err = vma_dup_policy(vma, new);
113139 if (err)
113140 goto out_free_vma;
113141@@ -2484,6 +2890,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113142 else
113143 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
113144
113145+#ifdef CONFIG_PAX_SEGMEXEC
113146+ if (!err && vma_m) {
113147+ struct mempolicy *pol = vma_policy(new);
113148+
113149+ if (anon_vma_clone(new_m, vma_m))
113150+ goto out_free_mpol;
113151+
113152+ mpol_get(pol);
113153+ set_vma_policy(new_m, pol);
113154+
113155+ if (new_m->vm_file)
113156+ get_file(new_m->vm_file);
113157+
113158+ if (new_m->vm_ops && new_m->vm_ops->open)
113159+ new_m->vm_ops->open(new_m);
113160+
113161+ if (new_below)
113162+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
113163+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
113164+ else
113165+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
113166+
113167+ if (err) {
113168+ if (new_m->vm_ops && new_m->vm_ops->close)
113169+ new_m->vm_ops->close(new_m);
113170+ if (new_m->vm_file)
113171+ fput(new_m->vm_file);
113172+ mpol_put(pol);
113173+ }
113174+ }
113175+#endif
113176+
113177 /* Success. */
113178 if (!err)
113179 return 0;
113180@@ -2493,10 +2931,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113181 new->vm_ops->close(new);
113182 if (new->vm_file)
113183 fput(new->vm_file);
113184- unlink_anon_vmas(new);
113185 out_free_mpol:
113186 mpol_put(vma_policy(new));
113187 out_free_vma:
113188+
113189+#ifdef CONFIG_PAX_SEGMEXEC
113190+ if (new_m) {
113191+ unlink_anon_vmas(new_m);
113192+ kmem_cache_free(vm_area_cachep, new_m);
113193+ }
113194+#endif
113195+
113196+ unlink_anon_vmas(new);
113197 kmem_cache_free(vm_area_cachep, new);
113198 out_err:
113199 return err;
113200@@ -2509,6 +2955,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113201 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113202 unsigned long addr, int new_below)
113203 {
113204+
113205+#ifdef CONFIG_PAX_SEGMEXEC
113206+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
113207+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
113208+ if (mm->map_count >= sysctl_max_map_count-1)
113209+ return -ENOMEM;
113210+ } else
113211+#endif
113212+
113213 if (mm->map_count >= sysctl_max_map_count)
113214 return -ENOMEM;
113215
113216@@ -2520,11 +2975,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113217 * work. This now handles partial unmappings.
113218 * Jeremy Fitzhardinge <jeremy@goop.org>
113219 */
113220+#ifdef CONFIG_PAX_SEGMEXEC
113221 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113222 {
113223+ int ret = __do_munmap(mm, start, len);
113224+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
113225+ return ret;
113226+
113227+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
113228+}
113229+
113230+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113231+#else
113232+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113233+#endif
113234+{
113235 unsigned long end;
113236 struct vm_area_struct *vma, *prev, *last;
113237
113238+ /*
113239+ * mm->mmap_sem is required to protect against another thread
113240+ * changing the mappings in case we sleep.
113241+ */
113242+ verify_mm_writelocked(mm);
113243+
113244 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
113245 return -EINVAL;
113246
113247@@ -2602,6 +3076,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
113248 /* Fix up all other VM information */
113249 remove_vma_list(mm, vma);
113250
113251+ track_exec_limit(mm, start, end, 0UL);
113252+
113253 return 0;
113254 }
113255
113256@@ -2610,6 +3086,13 @@ int vm_munmap(unsigned long start, size_t len)
113257 int ret;
113258 struct mm_struct *mm = current->mm;
113259
113260+
113261+#ifdef CONFIG_PAX_SEGMEXEC
113262+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
113263+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
113264+ return -EINVAL;
113265+#endif
113266+
113267 down_write(&mm->mmap_sem);
113268 ret = do_munmap(mm, start, len);
113269 up_write(&mm->mmap_sem);
113270@@ -2656,6 +3139,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
113271 down_write(&mm->mmap_sem);
113272 vma = find_vma(mm, start);
113273
113274+#ifdef CONFIG_PAX_SEGMEXEC
113275+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
113276+ goto out;
113277+#endif
113278+
113279 if (!vma || !(vma->vm_flags & VM_SHARED))
113280 goto out;
113281
113282@@ -2692,16 +3180,6 @@ out:
113283 return ret;
113284 }
113285
113286-static inline void verify_mm_writelocked(struct mm_struct *mm)
113287-{
113288-#ifdef CONFIG_DEBUG_VM
113289- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
113290- WARN_ON(1);
113291- up_read(&mm->mmap_sem);
113292- }
113293-#endif
113294-}
113295-
113296 /*
113297 * this is really a simplified "do_mmap". it only handles
113298 * anonymous maps. eventually we may be able to do some
113299@@ -2715,6 +3193,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113300 struct rb_node **rb_link, *rb_parent;
113301 pgoff_t pgoff = addr >> PAGE_SHIFT;
113302 int error;
113303+ unsigned long charged;
113304
113305 len = PAGE_ALIGN(len);
113306 if (!len)
113307@@ -2722,10 +3201,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113308
113309 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
113310
113311+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
113312+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
113313+ flags &= ~VM_EXEC;
113314+
113315+#ifdef CONFIG_PAX_MPROTECT
113316+ if (mm->pax_flags & MF_PAX_MPROTECT)
113317+ flags &= ~VM_MAYEXEC;
113318+#endif
113319+
113320+ }
113321+#endif
113322+
113323 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
113324 if (error & ~PAGE_MASK)
113325 return error;
113326
113327+ charged = len >> PAGE_SHIFT;
113328+
113329 error = mlock_future_check(mm, mm->def_flags, len);
113330 if (error)
113331 return error;
113332@@ -2743,16 +3236,17 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113333 &rb_parent)) {
113334 if (do_munmap(mm, addr, len))
113335 return -ENOMEM;
113336+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
113337 }
113338
113339 /* Check against address space limits *after* clearing old maps... */
113340- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
113341+ if (!may_expand_vm(mm, charged))
113342 return -ENOMEM;
113343
113344 if (mm->map_count > sysctl_max_map_count)
113345 return -ENOMEM;
113346
113347- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
113348+ if (security_vm_enough_memory_mm(mm, charged))
113349 return -ENOMEM;
113350
113351 /* Can we just expand an old private anonymous mapping? */
113352@@ -2766,7 +3260,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113353 */
113354 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113355 if (!vma) {
113356- vm_unacct_memory(len >> PAGE_SHIFT);
113357+ vm_unacct_memory(charged);
113358 return -ENOMEM;
113359 }
113360
113361@@ -2780,10 +3274,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
113362 vma_link(mm, vma, prev, rb_link, rb_parent);
113363 out:
113364 perf_event_mmap(vma);
113365- mm->total_vm += len >> PAGE_SHIFT;
113366+ mm->total_vm += charged;
113367 if (flags & VM_LOCKED)
113368- mm->locked_vm += (len >> PAGE_SHIFT);
113369+ mm->locked_vm += charged;
113370 vma->vm_flags |= VM_SOFTDIRTY;
113371+ track_exec_limit(mm, addr, addr + len, flags);
113372 return addr;
113373 }
113374
113375@@ -2845,6 +3340,7 @@ void exit_mmap(struct mm_struct *mm)
113376 while (vma) {
113377 if (vma->vm_flags & VM_ACCOUNT)
113378 nr_accounted += vma_pages(vma);
113379+ vma->vm_mirror = NULL;
113380 vma = remove_vma(vma);
113381 }
113382 vm_unacct_memory(nr_accounted);
113383@@ -2859,6 +3355,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
113384 struct vm_area_struct *prev;
113385 struct rb_node **rb_link, *rb_parent;
113386
113387+#ifdef CONFIG_PAX_SEGMEXEC
113388+ struct vm_area_struct *vma_m = NULL;
113389+#endif
113390+
113391+ if (security_mmap_addr(vma->vm_start))
113392+ return -EPERM;
113393+
113394 /*
113395 * The vm_pgoff of a purely anonymous vma should be irrelevant
113396 * until its first write fault, when page's anon_vma and index
113397@@ -2882,7 +3385,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
113398 security_vm_enough_memory_mm(mm, vma_pages(vma)))
113399 return -ENOMEM;
113400
113401+#ifdef CONFIG_PAX_SEGMEXEC
113402+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
113403+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113404+ if (!vma_m)
113405+ return -ENOMEM;
113406+ }
113407+#endif
113408+
113409 vma_link(mm, vma, prev, rb_link, rb_parent);
113410+
113411+#ifdef CONFIG_PAX_SEGMEXEC
113412+ if (vma_m)
113413+ BUG_ON(pax_mirror_vma(vma_m, vma));
113414+#endif
113415+
113416 return 0;
113417 }
113418
113419@@ -2901,6 +3418,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
113420 struct rb_node **rb_link, *rb_parent;
113421 bool faulted_in_anon_vma = true;
113422
113423+ BUG_ON(vma->vm_mirror);
113424+
113425 /*
113426 * If anonymous vma has not yet been faulted, update new pgoff
113427 * to match new location, to increase its chance of merging.
113428@@ -2965,6 +3484,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
113429 return NULL;
113430 }
113431
113432+#ifdef CONFIG_PAX_SEGMEXEC
113433+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
113434+{
113435+ struct vm_area_struct *prev_m;
113436+ struct rb_node **rb_link_m, *rb_parent_m;
113437+ struct mempolicy *pol_m;
113438+
113439+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
113440+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
113441+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
113442+ *vma_m = *vma;
113443+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
113444+ if (anon_vma_clone(vma_m, vma))
113445+ return -ENOMEM;
113446+ pol_m = vma_policy(vma_m);
113447+ mpol_get(pol_m);
113448+ set_vma_policy(vma_m, pol_m);
113449+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
113450+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
113451+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
113452+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
113453+ if (vma_m->vm_file)
113454+ get_file(vma_m->vm_file);
113455+ if (vma_m->vm_ops && vma_m->vm_ops->open)
113456+ vma_m->vm_ops->open(vma_m);
113457+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
113458+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
113459+ vma_m->vm_mirror = vma;
113460+ vma->vm_mirror = vma_m;
113461+ return 0;
113462+}
113463+#endif
113464+
113465 /*
113466 * Return true if the calling process may expand its vm space by the passed
113467 * number of pages
113468@@ -2976,6 +3528,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
113469
113470 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
113471
113472+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
113473 if (cur + npages > lim)
113474 return 0;
113475 return 1;
113476@@ -3058,6 +3611,22 @@ static struct vm_area_struct *__install_special_mapping(
113477 vma->vm_start = addr;
113478 vma->vm_end = addr + len;
113479
113480+#ifdef CONFIG_PAX_MPROTECT
113481+ if (mm->pax_flags & MF_PAX_MPROTECT) {
113482+#ifndef CONFIG_PAX_MPROTECT_COMPAT
113483+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
113484+ return ERR_PTR(-EPERM);
113485+ if (!(vm_flags & VM_EXEC))
113486+ vm_flags &= ~VM_MAYEXEC;
113487+#else
113488+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
113489+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
113490+#endif
113491+ else
113492+ vm_flags &= ~VM_MAYWRITE;
113493+ }
113494+#endif
113495+
113496 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
113497 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
113498
113499diff --git a/mm/mprotect.c b/mm/mprotect.c
113500index 8858483..72f2464 100644
113501--- a/mm/mprotect.c
113502+++ b/mm/mprotect.c
113503@@ -24,10 +24,18 @@
113504 #include <linux/migrate.h>
113505 #include <linux/perf_event.h>
113506 #include <linux/ksm.h>
113507+#include <linux/sched/sysctl.h>
113508+
113509+#ifdef CONFIG_PAX_MPROTECT
113510+#include <linux/elf.h>
113511+#include <linux/binfmts.h>
113512+#endif
113513+
113514 #include <asm/uaccess.h>
113515 #include <asm/pgtable.h>
113516 #include <asm/cacheflush.h>
113517 #include <asm/tlbflush.h>
113518+#include <asm/mmu_context.h>
113519
113520 /*
113521 * For a prot_numa update we only hold mmap_sem for read so there is a
113522@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
113523 return pages;
113524 }
113525
113526+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
113527+/* called while holding the mmap semaphor for writing except stack expansion */
113528+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
113529+{
113530+ unsigned long oldlimit, newlimit = 0UL;
113531+
113532+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
113533+ return;
113534+
113535+ spin_lock(&mm->page_table_lock);
113536+ oldlimit = mm->context.user_cs_limit;
113537+ if ((prot & VM_EXEC) && oldlimit < end)
113538+ /* USER_CS limit moved up */
113539+ newlimit = end;
113540+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
113541+ /* USER_CS limit moved down */
113542+ newlimit = start;
113543+
113544+ if (newlimit) {
113545+ mm->context.user_cs_limit = newlimit;
113546+
113547+#ifdef CONFIG_SMP
113548+ wmb();
113549+ cpumask_clear(&mm->context.cpu_user_cs_mask);
113550+ cpumask_set_cpu(smp_processor_id(), &mm->context.cpu_user_cs_mask);
113551+#endif
113552+
113553+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
113554+ }
113555+ spin_unlock(&mm->page_table_lock);
113556+ if (newlimit == end) {
113557+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
113558+
113559+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
113560+ if (is_vm_hugetlb_page(vma))
113561+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
113562+ else
113563+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
113564+ }
113565+}
113566+#endif
113567+
113568 int
113569 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113570 unsigned long start, unsigned long end, unsigned long newflags)
113571@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113572 int error;
113573 int dirty_accountable = 0;
113574
113575+#ifdef CONFIG_PAX_SEGMEXEC
113576+ struct vm_area_struct *vma_m = NULL;
113577+ unsigned long start_m, end_m;
113578+
113579+ start_m = start + SEGMEXEC_TASK_SIZE;
113580+ end_m = end + SEGMEXEC_TASK_SIZE;
113581+#endif
113582+
113583 if (newflags == oldflags) {
113584 *pprev = vma;
113585 return 0;
113586 }
113587
113588+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
113589+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
113590+
113591+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
113592+ return -ENOMEM;
113593+
113594+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
113595+ return -ENOMEM;
113596+ }
113597+
113598 /*
113599 * If we make a private mapping writable we increase our commit;
113600 * but (without finer accounting) cannot reduce our commit if we
113601@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
113602 }
113603 }
113604
113605+#ifdef CONFIG_PAX_SEGMEXEC
113606+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
113607+ if (start != vma->vm_start) {
113608+ error = split_vma(mm, vma, start, 1);
113609+ if (error)
113610+ goto fail;
113611+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
113612+ *pprev = (*pprev)->vm_next;
113613+ }
113614+
113615+ if (end != vma->vm_end) {
113616+ error = split_vma(mm, vma, end, 0);
113617+ if (error)
113618+ goto fail;
113619+ }
113620+
113621+ if (pax_find_mirror_vma(vma)) {
113622+ error = __do_munmap(mm, start_m, end_m - start_m);
113623+ if (error)
113624+ goto fail;
113625+ } else {
113626+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
113627+ if (!vma_m) {
113628+ error = -ENOMEM;
113629+ goto fail;
113630+ }
113631+ vma->vm_flags = newflags;
113632+ error = pax_mirror_vma(vma_m, vma);
113633+ if (error) {
113634+ vma->vm_flags = oldflags;
113635+ goto fail;
113636+ }
113637+ }
113638+ }
113639+#endif
113640+
113641 /*
113642 * First try to merge with previous and/or next vma.
113643 */
113644@@ -315,7 +419,19 @@ success:
113645 * vm_flags and vm_page_prot are protected by the mmap_sem
113646 * held in write mode.
113647 */
113648+
113649+#ifdef CONFIG_PAX_SEGMEXEC
113650+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
113651+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
113652+#endif
113653+
113654 vma->vm_flags = newflags;
113655+
113656+#ifdef CONFIG_PAX_MPROTECT
113657+ if (mm->binfmt && mm->binfmt->handle_mprotect)
113658+ mm->binfmt->handle_mprotect(vma, newflags);
113659+#endif
113660+
113661 dirty_accountable = vma_wants_writenotify(vma);
113662 vma_set_page_prot(vma);
113663
113664@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113665 end = start + len;
113666 if (end <= start)
113667 return -ENOMEM;
113668+
113669+#ifdef CONFIG_PAX_SEGMEXEC
113670+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
113671+ if (end > SEGMEXEC_TASK_SIZE)
113672+ return -EINVAL;
113673+ } else
113674+#endif
113675+
113676+ if (end > TASK_SIZE)
113677+ return -EINVAL;
113678+
113679 if (!arch_validate_prot(prot))
113680 return -EINVAL;
113681
113682@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113683 /*
113684 * Does the application expect PROT_READ to imply PROT_EXEC:
113685 */
113686- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
113687+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
113688 prot |= PROT_EXEC;
113689
113690 vm_flags = calc_vm_prot_bits(prot);
113691@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113692 if (start > vma->vm_start)
113693 prev = vma;
113694
113695+#ifdef CONFIG_PAX_MPROTECT
113696+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
113697+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
113698+#endif
113699+
113700 for (nstart = start ; ; ) {
113701 unsigned long newflags;
113702
113703@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113704
113705 /* newflags >> 4 shift VM_MAY% in place of VM_% */
113706 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
113707+ if (prot & (PROT_WRITE | PROT_EXEC))
113708+ gr_log_rwxmprotect(vma);
113709+
113710+ error = -EACCES;
113711+ goto out;
113712+ }
113713+
113714+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
113715 error = -EACCES;
113716 goto out;
113717 }
113718@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
113719 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
113720 if (error)
113721 goto out;
113722+
113723+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
113724+
113725 nstart = tmp;
113726
113727 if (nstart < prev->vm_end)
113728diff --git a/mm/mremap.c b/mm/mremap.c
113729index 034e2d3..81deca5 100644
113730--- a/mm/mremap.c
113731+++ b/mm/mremap.c
113732@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
113733 continue;
113734 pte = ptep_get_and_clear(mm, old_addr, old_pte);
113735 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
113736+
113737+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
113738+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
113739+ pte = pte_exprotect(pte);
113740+#endif
113741+
113742 pte = move_soft_dirty_pte(pte);
113743 set_pte_at(mm, new_addr, new_pte, pte);
113744 }
113745@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
113746 if (is_vm_hugetlb_page(vma))
113747 return ERR_PTR(-EINVAL);
113748
113749+#ifdef CONFIG_PAX_SEGMEXEC
113750+ if (pax_find_mirror_vma(vma))
113751+ return ERR_PTR(-EINVAL);
113752+#endif
113753+
113754 /* We can't remap across vm area boundaries */
113755 if (old_len > vma->vm_end - addr)
113756 return ERR_PTR(-EFAULT);
113757@@ -396,20 +407,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
113758 unsigned long ret = -EINVAL;
113759 unsigned long charged = 0;
113760 unsigned long map_flags;
113761+ unsigned long pax_task_size = TASK_SIZE;
113762
113763 if (new_addr & ~PAGE_MASK)
113764 goto out;
113765
113766- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
113767+#ifdef CONFIG_PAX_SEGMEXEC
113768+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
113769+ pax_task_size = SEGMEXEC_TASK_SIZE;
113770+#endif
113771+
113772+ pax_task_size -= PAGE_SIZE;
113773+
113774+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
113775 goto out;
113776
113777 /* Check if the location we're moving into overlaps the
113778 * old location at all, and fail if it does.
113779 */
113780- if ((new_addr <= addr) && (new_addr+new_len) > addr)
113781- goto out;
113782-
113783- if ((addr <= new_addr) && (addr+old_len) > new_addr)
113784+ if (addr + old_len > new_addr && new_addr + new_len > addr)
113785 goto out;
113786
113787 ret = do_munmap(mm, new_addr, new_len);
113788@@ -478,6 +494,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113789 unsigned long ret = -EINVAL;
113790 unsigned long charged = 0;
113791 bool locked = false;
113792+ unsigned long pax_task_size = TASK_SIZE;
113793
113794 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
113795 return ret;
113796@@ -499,6 +516,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113797 if (!new_len)
113798 return ret;
113799
113800+#ifdef CONFIG_PAX_SEGMEXEC
113801+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
113802+ pax_task_size = SEGMEXEC_TASK_SIZE;
113803+#endif
113804+
113805+ pax_task_size -= PAGE_SIZE;
113806+
113807+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
113808+ old_len > pax_task_size || addr > pax_task_size-old_len)
113809+ return ret;
113810+
113811 down_write(&current->mm->mmap_sem);
113812
113813 if (flags & MREMAP_FIXED) {
113814@@ -549,6 +577,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113815 new_addr = addr;
113816 }
113817 ret = addr;
113818+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
113819 goto out;
113820 }
113821 }
113822@@ -572,7 +601,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
113823 goto out;
113824 }
113825
113826+ map_flags = vma->vm_flags;
113827 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
113828+ if (!(ret & ~PAGE_MASK)) {
113829+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
113830+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
113831+ }
113832 }
113833 out:
113834 if (ret & ~PAGE_MASK)
113835diff --git a/mm/nommu.c b/mm/nommu.c
113836index e544508..b56ce7a 100644
113837--- a/mm/nommu.c
113838+++ b/mm/nommu.c
113839@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
113840 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
113841 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
113842 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
113843-int heap_stack_gap = 0;
113844
113845 atomic_long_t mmap_pages_allocated;
113846
113847@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
113848 EXPORT_SYMBOL(find_vma);
113849
113850 /*
113851- * find a VMA
113852- * - we don't extend stack VMAs under NOMMU conditions
113853- */
113854-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
113855-{
113856- return find_vma(mm, addr);
113857-}
113858-
113859-/*
113860 * expand a stack to a given address
113861 * - not supported under NOMMU conditions
113862 */
113863@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
113864
113865 /* most fields are the same, copy all, and then fixup */
113866 *new = *vma;
113867+ INIT_LIST_HEAD(&new->anon_vma_chain);
113868 *region = *vma->vm_region;
113869 new->vm_region = region;
113870
113871@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
113872 }
113873 EXPORT_SYMBOL(filemap_map_pages);
113874
113875-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113876- unsigned long addr, void *buf, int len, int write)
113877+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113878+ unsigned long addr, void *buf, size_t len, int write)
113879 {
113880 struct vm_area_struct *vma;
113881
113882@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
113883 *
113884 * The caller must hold a reference on @mm.
113885 */
113886-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
113887- void *buf, int len, int write)
113888+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
113889+ void *buf, size_t len, int write)
113890 {
113891 return __access_remote_vm(NULL, mm, addr, buf, len, write);
113892 }
113893@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
113894 * Access another process' address space.
113895 * - source/target buffer must be kernel space
113896 */
113897-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
113898+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
113899 {
113900 struct mm_struct *mm;
113901
113902diff --git a/mm/page-writeback.c b/mm/page-writeback.c
113903index eb59f7e..b23a2a8 100644
113904--- a/mm/page-writeback.c
113905+++ b/mm/page-writeback.c
113906@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
113907 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
113908 * - the bdi dirty thresh drops quickly due to change of JBOD workload
113909 */
113910-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
113911+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
113912 unsigned long thresh,
113913 unsigned long bg_thresh,
113914 unsigned long dirty,
113915diff --git a/mm/page_alloc.c b/mm/page_alloc.c
113916index ebffa0e..a5ae7f7 100644
113917--- a/mm/page_alloc.c
113918+++ b/mm/page_alloc.c
113919@@ -61,6 +61,7 @@
113920 #include <linux/hugetlb.h>
113921 #include <linux/sched/rt.h>
113922 #include <linux/page_owner.h>
113923+#include <linux/random.h>
113924
113925 #include <asm/sections.h>
113926 #include <asm/tlbflush.h>
113927@@ -357,7 +358,7 @@ out:
113928 * This usage means that zero-order pages may not be compound.
113929 */
113930
113931-static void free_compound_page(struct page *page)
113932+void free_compound_page(struct page *page)
113933 {
113934 __free_pages_ok(page, compound_order(page));
113935 }
113936@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
113937 __mod_zone_freepage_state(zone, (1 << order), migratetype);
113938 }
113939 #else
113940-struct page_ext_operations debug_guardpage_ops = { NULL, };
113941+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
113942 static inline void set_page_guard(struct zone *zone, struct page *page,
113943 unsigned int order, int migratetype) {}
113944 static inline void clear_page_guard(struct zone *zone, struct page *page,
113945@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
113946 bool compound = PageCompound(page);
113947 int i, bad = 0;
113948
113949+#ifdef CONFIG_PAX_MEMORY_SANITIZE
113950+ unsigned long index = 1UL << order;
113951+#endif
113952+
113953 VM_BUG_ON_PAGE(PageTail(page), page);
113954 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
113955
113956@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
113957 debug_check_no_obj_freed(page_address(page),
113958 PAGE_SIZE << order);
113959 }
113960+
113961+#ifdef CONFIG_PAX_MEMORY_SANITIZE
113962+ for (; index; --index)
113963+ sanitize_highpage(page + index - 1);
113964+#endif
113965+
113966 arch_free_page(page, order);
113967 kernel_map_pages(page, 1 << order, 0);
113968
113969@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
113970 local_irq_restore(flags);
113971 }
113972
113973+#ifdef CONFIG_PAX_LATENT_ENTROPY
113974+bool __meminitdata extra_latent_entropy;
113975+
113976+static int __init setup_pax_extra_latent_entropy(char *str)
113977+{
113978+ extra_latent_entropy = true;
113979+ return 0;
113980+}
113981+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
113982+
113983+volatile u64 latent_entropy __latent_entropy;
113984+EXPORT_SYMBOL(latent_entropy);
113985+#endif
113986+
113987 void __init __free_pages_bootmem(struct page *page, unsigned int order)
113988 {
113989 unsigned int nr_pages = 1 << order;
113990@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
113991 __ClearPageReserved(p);
113992 set_page_count(p, 0);
113993
113994+#ifdef CONFIG_PAX_LATENT_ENTROPY
113995+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
113996+ u64 hash = 0;
113997+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
113998+ const u64 *data = lowmem_page_address(page);
113999+
114000+ for (index = 0; index < end; index++)
114001+ hash ^= hash + data[index];
114002+ latent_entropy ^= hash;
114003+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
114004+ }
114005+#endif
114006+
114007 page_zone(page)->managed_pages += nr_pages;
114008 set_page_refcounted(page);
114009 __free_pages(page, order);
114010@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
114011 kernel_map_pages(page, 1 << order, 1);
114012 kasan_alloc_pages(page, order);
114013
114014+#ifndef CONFIG_PAX_MEMORY_SANITIZE
114015 if (gfp_flags & __GFP_ZERO)
114016 prep_zero_page(page, order, gfp_flags);
114017+#endif
114018
114019 if (order && (gfp_flags & __GFP_COMP))
114020 prep_compound_page(page, order);
114021@@ -983,12 +1023,15 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
114022 set_page_owner(page, order, gfp_flags);
114023
114024 /*
114025- * page->pfmemalloc is set when ALLOC_NO_WATERMARKS was necessary to
114026+ * page is set pfmemalloc when ALLOC_NO_WATERMARKS was necessary to
114027 * allocate the page. The expectation is that the caller is taking
114028 * steps that will free more memory. The caller should avoid the page
114029 * being used for !PFMEMALLOC purposes.
114030 */
114031- page->pfmemalloc = !!(alloc_flags & ALLOC_NO_WATERMARKS);
114032+ if (alloc_flags & ALLOC_NO_WATERMARKS)
114033+ set_page_pfmemalloc(page);
114034+ else
114035+ clear_page_pfmemalloc(page);
114036
114037 return 0;
114038 }
114039@@ -1649,6 +1692,8 @@ int __isolate_free_page(struct page *page, unsigned int order)
114040 zone->free_area[order].nr_free--;
114041 rmv_page_order(page);
114042
114043+ set_page_owner(page, order, 0);
114044+
114045 /* Set the pageblock if the isolated page is at least a pageblock */
114046 if (order >= pageblock_order - 1) {
114047 struct page *endpage = page + (1 << order) - 1;
114048@@ -1660,7 +1705,7 @@ int __isolate_free_page(struct page *page, unsigned int order)
114049 }
114050 }
114051
114052- set_page_owner(page, order, 0);
114053+
114054 return 1UL << order;
114055 }
114056
114057@@ -1749,7 +1794,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
114058 }
114059
114060 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
114061- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
114062+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
114063 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
114064 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
114065
114066@@ -2068,7 +2113,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
114067 do {
114068 mod_zone_page_state(zone, NR_ALLOC_BATCH,
114069 high_wmark_pages(zone) - low_wmark_pages(zone) -
114070- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
114071+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
114072 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
114073 } while (zone++ != preferred_zone);
114074 }
114075@@ -5781,7 +5826,7 @@ static void __setup_per_zone_wmarks(void)
114076
114077 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
114078 high_wmark_pages(zone) - low_wmark_pages(zone) -
114079- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
114080+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
114081
114082 setup_zone_migrate_reserve(zone);
114083 spin_unlock_irqrestore(&zone->lock, flags);
114084diff --git a/mm/percpu.c b/mm/percpu.c
114085index 2dd7448..9bb6305 100644
114086--- a/mm/percpu.c
114087+++ b/mm/percpu.c
114088@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
114089 static unsigned int pcpu_high_unit_cpu __read_mostly;
114090
114091 /* the address of the first chunk which starts with the kernel static area */
114092-void *pcpu_base_addr __read_mostly;
114093+void *pcpu_base_addr __read_only;
114094 EXPORT_SYMBOL_GPL(pcpu_base_addr);
114095
114096 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
114097diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
114098index e88d071..d80e01a 100644
114099--- a/mm/process_vm_access.c
114100+++ b/mm/process_vm_access.c
114101@@ -13,6 +13,7 @@
114102 #include <linux/uio.h>
114103 #include <linux/sched.h>
114104 #include <linux/highmem.h>
114105+#include <linux/security.h>
114106 #include <linux/ptrace.h>
114107 #include <linux/slab.h>
114108 #include <linux/syscalls.h>
114109@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
114110 ssize_t iov_len;
114111 size_t total_len = iov_iter_count(iter);
114112
114113+ return -ENOSYS; // PaX: until properly audited
114114+
114115 /*
114116 * Work out how many pages of struct pages we're going to need
114117 * when eventually calling get_user_pages
114118 */
114119 for (i = 0; i < riovcnt; i++) {
114120 iov_len = rvec[i].iov_len;
114121- if (iov_len > 0) {
114122- nr_pages_iov = ((unsigned long)rvec[i].iov_base
114123- + iov_len)
114124- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
114125- / PAGE_SIZE + 1;
114126- nr_pages = max(nr_pages, nr_pages_iov);
114127- }
114128+ if (iov_len <= 0)
114129+ continue;
114130+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
114131+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
114132+ nr_pages = max(nr_pages, nr_pages_iov);
114133 }
114134
114135 if (nr_pages == 0)
114136@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
114137 goto free_proc_pages;
114138 }
114139
114140+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
114141+ rc = -EPERM;
114142+ goto put_task_struct;
114143+ }
114144+
114145 mm = mm_access(task, PTRACE_MODE_ATTACH);
114146 if (!mm || IS_ERR(mm)) {
114147 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
114148diff --git a/mm/rmap.c b/mm/rmap.c
114149index 24dd3f9..4eb43f4 100644
114150--- a/mm/rmap.c
114151+++ b/mm/rmap.c
114152@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114153 struct anon_vma *anon_vma = vma->anon_vma;
114154 struct anon_vma_chain *avc;
114155
114156+#ifdef CONFIG_PAX_SEGMEXEC
114157+ struct anon_vma_chain *avc_m = NULL;
114158+#endif
114159+
114160 might_sleep();
114161 if (unlikely(!anon_vma)) {
114162 struct mm_struct *mm = vma->vm_mm;
114163@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114164 if (!avc)
114165 goto out_enomem;
114166
114167+#ifdef CONFIG_PAX_SEGMEXEC
114168+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
114169+ if (!avc_m)
114170+ goto out_enomem_free_avc;
114171+#endif
114172+
114173 anon_vma = find_mergeable_anon_vma(vma);
114174 allocated = NULL;
114175 if (!anon_vma) {
114176@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114177 /* page_table_lock to protect against threads */
114178 spin_lock(&mm->page_table_lock);
114179 if (likely(!vma->anon_vma)) {
114180+
114181+#ifdef CONFIG_PAX_SEGMEXEC
114182+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
114183+
114184+ if (vma_m) {
114185+ BUG_ON(vma_m->anon_vma);
114186+ vma_m->anon_vma = anon_vma;
114187+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
114188+ anon_vma->degree++;
114189+ avc_m = NULL;
114190+ }
114191+#endif
114192+
114193 vma->anon_vma = anon_vma;
114194 anon_vma_chain_link(vma, avc, anon_vma);
114195 /* vma reference or self-parent link for new root */
114196@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
114197
114198 if (unlikely(allocated))
114199 put_anon_vma(allocated);
114200+
114201+#ifdef CONFIG_PAX_SEGMEXEC
114202+ if (unlikely(avc_m))
114203+ anon_vma_chain_free(avc_m);
114204+#endif
114205+
114206 if (unlikely(avc))
114207 anon_vma_chain_free(avc);
114208 }
114209 return 0;
114210
114211 out_enomem_free_avc:
114212+
114213+#ifdef CONFIG_PAX_SEGMEXEC
114214+ if (avc_m)
114215+ anon_vma_chain_free(avc_m);
114216+#endif
114217+
114218 anon_vma_chain_free(avc);
114219 out_enomem:
114220 return -ENOMEM;
114221@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
114222 * good chance of avoiding scanning the whole hierarchy when it searches where
114223 * page is mapped.
114224 */
114225-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
114226+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
114227 {
114228 struct anon_vma_chain *avc, *pavc;
114229 struct anon_vma *root = NULL;
114230@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
114231 * the corresponding VMA in the parent process is attached to.
114232 * Returns 0 on success, non-zero on failure.
114233 */
114234-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
114235+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
114236 {
114237 struct anon_vma_chain *avc;
114238 struct anon_vma *anon_vma;
114239@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
114240 void __init anon_vma_init(void)
114241 {
114242 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
114243- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
114244- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
114245+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
114246+ anon_vma_ctor);
114247+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
114248+ SLAB_PANIC|SLAB_NO_SANITIZE);
114249 }
114250
114251 /*
114252diff --git a/mm/shmem.c b/mm/shmem.c
114253index 47d536e..8321b4e 100644
114254--- a/mm/shmem.c
114255+++ b/mm/shmem.c
114256@@ -33,7 +33,7 @@
114257 #include <linux/swap.h>
114258 #include <linux/uio.h>
114259
114260-static struct vfsmount *shm_mnt;
114261+struct vfsmount *shm_mnt;
114262
114263 #ifdef CONFIG_SHMEM
114264 /*
114265@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
114266 #define BOGO_DIRENT_SIZE 20
114267
114268 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
114269-#define SHORT_SYMLINK_LEN 128
114270+#define SHORT_SYMLINK_LEN 64
114271
114272 /*
114273 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
114274@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
114275 static int shmem_xattr_validate(const char *name)
114276 {
114277 struct { const char *prefix; size_t len; } arr[] = {
114278+
114279+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
114280+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
114281+#endif
114282+
114283 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
114284 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
114285 };
114286@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
114287 if (err)
114288 return err;
114289
114290+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
114291+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
114292+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
114293+ return -EOPNOTSUPP;
114294+ if (size > 8)
114295+ return -EINVAL;
114296+ }
114297+#endif
114298+
114299 return simple_xattr_set(&info->xattrs, name, value, size, flags);
114300 }
114301
114302@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
114303 int err = -ENOMEM;
114304
114305 /* Round up to L1_CACHE_BYTES to resist false sharing */
114306- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
114307- L1_CACHE_BYTES), GFP_KERNEL);
114308+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
114309 if (!sbinfo)
114310 return -ENOMEM;
114311
114312diff --git a/mm/slab.c b/mm/slab.c
114313index 7eb38dd..0451459 100644
114314--- a/mm/slab.c
114315+++ b/mm/slab.c
114316@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
114317 if ((x)->max_freeable < i) \
114318 (x)->max_freeable = i; \
114319 } while (0)
114320-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
114321-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
114322-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
114323-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
114324+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
114325+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
114326+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
114327+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
114328+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
114329+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
114330 #else
114331 #define STATS_INC_ACTIVE(x) do { } while (0)
114332 #define STATS_DEC_ACTIVE(x) do { } while (0)
114333@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
114334 #define STATS_INC_ALLOCMISS(x) do { } while (0)
114335 #define STATS_INC_FREEHIT(x) do { } while (0)
114336 #define STATS_INC_FREEMISS(x) do { } while (0)
114337+#define STATS_INC_SANITIZED(x) do { } while (0)
114338+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
114339 #endif
114340
114341 #if DEBUG
114342@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
114343 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
114344 */
114345 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
114346- const struct page *page, void *obj)
114347+ const struct page *page, const void *obj)
114348 {
114349 u32 offset = (obj - page->s_mem);
114350 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
114351@@ -1452,7 +1456,7 @@ void __init kmem_cache_init(void)
114352 * structures first. Without this, further allocations will bug.
114353 */
114354 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
114355- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
114356+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
114357 slab_state = PARTIAL_NODE;
114358
114359 slab_early_init = 0;
114360@@ -1602,7 +1606,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,
114361 }
114362
114363 /* Record if ALLOC_NO_WATERMARKS was set when allocating the slab */
114364- if (unlikely(page->pfmemalloc))
114365+ if (page_is_pfmemalloc(page))
114366 pfmemalloc_active = true;
114367
114368 nr_pages = (1 << cachep->gfporder);
114369@@ -1613,7 +1617,7 @@ static struct page *kmem_getpages(struct kmem_cache *cachep, gfp_t flags,
114370 add_zone_page_state(page_zone(page),
114371 NR_SLAB_UNRECLAIMABLE, nr_pages);
114372 __SetPageSlab(page);
114373- if (page->pfmemalloc)
114374+ if (page_is_pfmemalloc(page))
114375 SetPageSlabPfmemalloc(page);
114376
114377 if (kmemcheck_enabled && !(cachep->flags & SLAB_NOTRACK)) {
114378@@ -2073,7 +2077,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
114379
114380 cachep = find_mergeable(size, align, flags, name, ctor);
114381 if (cachep) {
114382- cachep->refcount++;
114383+ atomic_inc(&cachep->refcount);
114384
114385 /*
114386 * Adjust the object sizes so that we clear
114387@@ -3371,6 +3375,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
114388 struct array_cache *ac = cpu_cache_get(cachep);
114389
114390 check_irq_off();
114391+
114392+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114393+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
114394+ STATS_INC_NOT_SANITIZED(cachep);
114395+ else {
114396+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
114397+
114398+ if (cachep->ctor)
114399+ cachep->ctor(objp);
114400+
114401+ STATS_INC_SANITIZED(cachep);
114402+ }
114403+#endif
114404+
114405 kmemleak_free_recursive(objp, cachep->flags);
114406 objp = cache_free_debugcheck(cachep, objp, caller);
114407
114408@@ -3483,7 +3501,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
114409 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
114410 }
114411
114412-void *__kmalloc_node(size_t size, gfp_t flags, int node)
114413+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
114414 {
114415 return __do_kmalloc_node(size, flags, node, _RET_IP_);
114416 }
114417@@ -3503,7 +3521,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
114418 * @flags: the type of memory to allocate (see kmalloc).
114419 * @caller: function caller for debug tracking of the caller
114420 */
114421-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
114422+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
114423 unsigned long caller)
114424 {
114425 struct kmem_cache *cachep;
114426@@ -3576,6 +3594,7 @@ void kfree(const void *objp)
114427
114428 if (unlikely(ZERO_OR_NULL_PTR(objp)))
114429 return;
114430+ VM_BUG_ON(!virt_addr_valid(objp));
114431 local_irq_save(flags);
114432 kfree_debugcheck(objp);
114433 c = virt_to_cache(objp);
114434@@ -3995,14 +4014,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
114435 }
114436 /* cpu stats */
114437 {
114438- unsigned long allochit = atomic_read(&cachep->allochit);
114439- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
114440- unsigned long freehit = atomic_read(&cachep->freehit);
114441- unsigned long freemiss = atomic_read(&cachep->freemiss);
114442+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
114443+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
114444+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
114445+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
114446
114447 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
114448 allochit, allocmiss, freehit, freemiss);
114449 }
114450+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114451+ {
114452+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
114453+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
114454+
114455+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
114456+ }
114457+#endif
114458 #endif
114459 }
114460
114461@@ -4210,13 +4237,80 @@ static const struct file_operations proc_slabstats_operations = {
114462 static int __init slab_proc_init(void)
114463 {
114464 #ifdef CONFIG_DEBUG_SLAB_LEAK
114465- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
114466+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
114467 #endif
114468 return 0;
114469 }
114470 module_init(slab_proc_init);
114471 #endif
114472
114473+bool is_usercopy_object(const void *ptr)
114474+{
114475+ struct page *page;
114476+ struct kmem_cache *cachep;
114477+
114478+ if (ZERO_OR_NULL_PTR(ptr))
114479+ return false;
114480+
114481+ if (!slab_is_available())
114482+ return false;
114483+
114484+ if (is_vmalloc_addr(ptr)
114485+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
114486+ && !object_starts_on_stack(ptr)
114487+#endif
114488+ ) {
114489+ struct vm_struct *vm = find_vm_area(ptr);
114490+ if (vm && (vm->flags & VM_USERCOPY))
114491+ return true;
114492+ return false;
114493+ }
114494+
114495+ if (!virt_addr_valid(ptr))
114496+ return false;
114497+
114498+ page = virt_to_head_page(ptr);
114499+
114500+ if (!PageSlab(page))
114501+ return false;
114502+
114503+ cachep = page->slab_cache;
114504+ return cachep->flags & SLAB_USERCOPY;
114505+}
114506+
114507+#ifdef CONFIG_PAX_USERCOPY
114508+const char *check_heap_object(const void *ptr, unsigned long n)
114509+{
114510+ struct page *page;
114511+ struct kmem_cache *cachep;
114512+ unsigned int objnr;
114513+ unsigned long offset;
114514+
114515+ if (ZERO_OR_NULL_PTR(ptr))
114516+ return "<null>";
114517+
114518+ if (!virt_addr_valid(ptr))
114519+ return NULL;
114520+
114521+ page = virt_to_head_page(ptr);
114522+
114523+ if (!PageSlab(page))
114524+ return NULL;
114525+
114526+ cachep = page->slab_cache;
114527+ if (!(cachep->flags & SLAB_USERCOPY))
114528+ return cachep->name;
114529+
114530+ objnr = obj_to_index(cachep, page, ptr);
114531+ BUG_ON(objnr >= cachep->num);
114532+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
114533+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
114534+ return NULL;
114535+
114536+ return cachep->name;
114537+}
114538+#endif
114539+
114540 /**
114541 * ksize - get the actual amount of memory allocated for a given object
114542 * @objp: Pointer to the object
114543diff --git a/mm/slab.h b/mm/slab.h
114544index 4c3ac12..7b2e470 100644
114545--- a/mm/slab.h
114546+++ b/mm/slab.h
114547@@ -22,7 +22,7 @@ struct kmem_cache {
114548 unsigned int align; /* Alignment as calculated */
114549 unsigned long flags; /* Active flags on the slab */
114550 const char *name; /* Slab name for sysfs */
114551- int refcount; /* Use counter */
114552+ atomic_t refcount; /* Use counter */
114553 void (*ctor)(void *); /* Called on object slot creation */
114554 struct list_head list; /* List of all slab caches on the system */
114555 };
114556@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
114557 /* The slab cache that manages slab cache information */
114558 extern struct kmem_cache *kmem_cache;
114559
114560+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114561+#ifdef CONFIG_X86_64
114562+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
114563+#else
114564+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
114565+#endif
114566+enum pax_sanitize_mode {
114567+ PAX_SANITIZE_SLAB_OFF = 0,
114568+ PAX_SANITIZE_SLAB_FAST,
114569+ PAX_SANITIZE_SLAB_FULL,
114570+};
114571+extern enum pax_sanitize_mode pax_sanitize_slab;
114572+#endif
114573+
114574 unsigned long calculate_alignment(unsigned long flags,
114575 unsigned long align, unsigned long size);
114576
114577@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
114578
114579 /* Legal flag mask for kmem_cache_create(), for various configurations */
114580 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
114581- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
114582+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
114583+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
114584
114585 #if defined(CONFIG_DEBUG_SLAB)
114586 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
114587@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
114588 return s;
114589
114590 page = virt_to_head_page(x);
114591+
114592+ BUG_ON(!PageSlab(page));
114593+
114594 cachep = page->slab_cache;
114595 if (slab_equal_or_root(cachep, s))
114596 return cachep;
114597diff --git a/mm/slab_common.c b/mm/slab_common.c
114598index 999bb34..9843aea 100644
114599--- a/mm/slab_common.c
114600+++ b/mm/slab_common.c
114601@@ -25,11 +25,35 @@
114602
114603 #include "slab.h"
114604
114605-enum slab_state slab_state;
114606+enum slab_state slab_state __read_only;
114607 LIST_HEAD(slab_caches);
114608 DEFINE_MUTEX(slab_mutex);
114609 struct kmem_cache *kmem_cache;
114610
114611+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114612+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
114613+static int __init pax_sanitize_slab_setup(char *str)
114614+{
114615+ if (!str)
114616+ return 0;
114617+
114618+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
114619+ pr_info("PaX slab sanitization: %s\n", "disabled");
114620+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
114621+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
114622+ pr_info("PaX slab sanitization: %s\n", "fast");
114623+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
114624+ } else if (!strcmp(str, "full")) {
114625+ pr_info("PaX slab sanitization: %s\n", "full");
114626+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
114627+ } else
114628+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
114629+
114630+ return 0;
114631+}
114632+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
114633+#endif
114634+
114635 /*
114636 * Set of flags that will prevent slab merging
114637 */
114638@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
114639 * Merge control. If this is set then no merging of slab caches will occur.
114640 * (Could be removed. This was introduced to pacify the merge skeptics.)
114641 */
114642-static int slab_nomerge;
114643+static int slab_nomerge = 1;
114644
114645 static int __init setup_slab_nomerge(char *str)
114646 {
114647@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
114648 /*
114649 * We may have set a slab to be unmergeable during bootstrap.
114650 */
114651- if (s->refcount < 0)
114652+ if (atomic_read(&s->refcount) < 0)
114653 return 1;
114654
114655 return 0;
114656@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
114657 if (err)
114658 goto out_free_cache;
114659
114660- s->refcount = 1;
114661+ atomic_set(&s->refcount, 1);
114662 list_add(&s->list, &slab_caches);
114663 out:
114664 if (err)
114665@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
114666 */
114667 flags &= CACHE_CREATE_MASK;
114668
114669+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114670+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
114671+ flags |= SLAB_NO_SANITIZE;
114672+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
114673+ flags &= ~SLAB_NO_SANITIZE;
114674+#endif
114675+
114676 s = __kmem_cache_alias(name, size, align, flags, ctor);
114677 if (s)
114678 goto out_unlock;
114679@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
114680 rcu_barrier();
114681
114682 list_for_each_entry_safe(s, s2, release, list) {
114683-#ifdef SLAB_SUPPORTS_SYSFS
114684+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
114685 sysfs_slab_remove(s);
114686 #else
114687 slab_kmem_cache_release(s);
114688@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
114689
114690 mutex_lock(&slab_mutex);
114691
114692- s->refcount--;
114693- if (s->refcount)
114694+ if (!atomic_dec_and_test(&s->refcount))
114695 goto out_unlock;
114696
114697 for_each_memcg_cache_safe(c, c2, s) {
114698@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
114699 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
114700 name, size, err);
114701
114702- s->refcount = -1; /* Exempt from merging for now */
114703+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
114704 }
114705
114706 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
114707@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
114708
114709 create_boot_cache(s, name, size, flags);
114710 list_add(&s->list, &slab_caches);
114711- s->refcount = 1;
114712+ atomic_set(&s->refcount, 1);
114713 return s;
114714 }
114715
114716@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
114717 EXPORT_SYMBOL(kmalloc_dma_caches);
114718 #endif
114719
114720+#ifdef CONFIG_PAX_USERCOPY_SLABS
114721+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
114722+EXPORT_SYMBOL(kmalloc_usercopy_caches);
114723+#endif
114724+
114725 /*
114726 * Conversion table for small slabs sizes / 8 to the index in the
114727 * kmalloc array. This is necessary for slabs < 192 since we have non power
114728@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
114729 return kmalloc_dma_caches[index];
114730
114731 #endif
114732+
114733+#ifdef CONFIG_PAX_USERCOPY_SLABS
114734+ if (unlikely((flags & GFP_USERCOPY)))
114735+ return kmalloc_usercopy_caches[index];
114736+
114737+#endif
114738+
114739 return kmalloc_caches[index];
114740 }
114741
114742@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
114743 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
114744 if (!kmalloc_caches[i]) {
114745 kmalloc_caches[i] = create_kmalloc_cache(NULL,
114746- 1 << i, flags);
114747+ 1 << i, SLAB_USERCOPY | flags);
114748 }
114749
114750 /*
114751@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
114752 * earlier power of two caches
114753 */
114754 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
114755- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
114756+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
114757
114758 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
114759- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
114760+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
114761 }
114762
114763 /* Kmalloc array is now usable */
114764@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
114765 }
114766 }
114767 #endif
114768+
114769+#ifdef CONFIG_PAX_USERCOPY_SLABS
114770+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
114771+ struct kmem_cache *s = kmalloc_caches[i];
114772+
114773+ if (s) {
114774+ int size = kmalloc_size(i);
114775+ char *n = kasprintf(GFP_NOWAIT,
114776+ "usercopy-kmalloc-%d", size);
114777+
114778+ BUG_ON(!n);
114779+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
114780+ size, SLAB_USERCOPY | flags);
114781+ }
114782+ }
114783+#endif
114784+
114785 }
114786 #endif /* !CONFIG_SLOB */
114787
114788@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
114789 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
114790 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
114791 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
114792+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114793+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
114794+#endif
114795 #endif
114796 seq_putc(m, '\n');
114797 }
114798@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
114799 module_init(slab_proc_init);
114800 #endif /* CONFIG_SLABINFO */
114801
114802-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
114803+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
114804 gfp_t flags)
114805 {
114806 void *ret;
114807diff --git a/mm/slob.c b/mm/slob.c
114808index 4765f65..f17284d 100644
114809--- a/mm/slob.c
114810+++ b/mm/slob.c
114811@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
114812 /*
114813 * Return the size of a slob block.
114814 */
114815-static slobidx_t slob_units(slob_t *s)
114816+static slobidx_t slob_units(const slob_t *s)
114817 {
114818 if (s->units > 0)
114819 return s->units;
114820@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
114821 /*
114822 * Return the next free slob block pointer after this one.
114823 */
114824-static slob_t *slob_next(slob_t *s)
114825+static slob_t *slob_next(const slob_t *s)
114826 {
114827 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
114828 slobidx_t next;
114829@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
114830 /*
114831 * Returns true if s is the last free block in its page.
114832 */
114833-static int slob_last(slob_t *s)
114834+static int slob_last(const slob_t *s)
114835 {
114836 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
114837 }
114838
114839-static void *slob_new_pages(gfp_t gfp, int order, int node)
114840+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
114841 {
114842- void *page;
114843+ struct page *page;
114844
114845 #ifdef CONFIG_NUMA
114846 if (node != NUMA_NO_NODE)
114847@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
114848 if (!page)
114849 return NULL;
114850
114851- return page_address(page);
114852+ __SetPageSlab(page);
114853+ return page;
114854 }
114855
114856-static void slob_free_pages(void *b, int order)
114857+static void slob_free_pages(struct page *sp, int order)
114858 {
114859 if (current->reclaim_state)
114860 current->reclaim_state->reclaimed_slab += 1 << order;
114861- free_pages((unsigned long)b, order);
114862+ __ClearPageSlab(sp);
114863+ page_mapcount_reset(sp);
114864+ sp->private = 0;
114865+ __free_pages(sp, order);
114866 }
114867
114868 /*
114869@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
114870
114871 /* Not enough space: must allocate a new page */
114872 if (!b) {
114873- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
114874- if (!b)
114875+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
114876+ if (!sp)
114877 return NULL;
114878- sp = virt_to_page(b);
114879- __SetPageSlab(sp);
114880+ b = page_address(sp);
114881
114882 spin_lock_irqsave(&slob_lock, flags);
114883 sp->units = SLOB_UNITS(PAGE_SIZE);
114884 sp->freelist = b;
114885+ sp->private = 0;
114886 INIT_LIST_HEAD(&sp->lru);
114887 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
114888 set_slob_page_free(sp, slob_list);
114889@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
114890 /*
114891 * slob_free: entry point into the slob allocator.
114892 */
114893-static void slob_free(void *block, int size)
114894+static void slob_free(struct kmem_cache *c, void *block, int size)
114895 {
114896 struct page *sp;
114897 slob_t *prev, *next, *b = (slob_t *)block;
114898@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
114899 if (slob_page_free(sp))
114900 clear_slob_page_free(sp);
114901 spin_unlock_irqrestore(&slob_lock, flags);
114902- __ClearPageSlab(sp);
114903- page_mapcount_reset(sp);
114904- slob_free_pages(b, 0);
114905+ slob_free_pages(sp, 0);
114906 return;
114907 }
114908
114909+#ifdef CONFIG_PAX_MEMORY_SANITIZE
114910+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
114911+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
114912+#endif
114913+
114914 if (!slob_page_free(sp)) {
114915 /* This slob page is about to become partially free. Easy! */
114916 sp->units = units;
114917@@ -424,11 +431,10 @@ out:
114918 */
114919
114920 static __always_inline void *
114921-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114922+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
114923 {
114924- unsigned int *m;
114925- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114926- void *ret;
114927+ slob_t *m;
114928+ void *ret = NULL;
114929
114930 gfp &= gfp_allowed_mask;
114931
114932@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114933
114934 if (!m)
114935 return NULL;
114936- *m = size;
114937+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
114938+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
114939+ m[0].units = size;
114940+ m[1].units = align;
114941 ret = (void *)m + align;
114942
114943 trace_kmalloc_node(caller, ret,
114944 size, size + align, gfp, node);
114945 } else {
114946 unsigned int order = get_order(size);
114947+ struct page *page;
114948
114949 if (likely(order))
114950 gfp |= __GFP_COMP;
114951- ret = slob_new_pages(gfp, order, node);
114952+ page = slob_new_pages(gfp, order, node);
114953+ if (page) {
114954+ ret = page_address(page);
114955+ page->private = size;
114956+ }
114957
114958 trace_kmalloc_node(caller, ret,
114959 size, PAGE_SIZE << order, gfp, node);
114960 }
114961
114962- kmemleak_alloc(ret, size, 1, gfp);
114963 return ret;
114964 }
114965
114966-void *__kmalloc(size_t size, gfp_t gfp)
114967+static __always_inline void *
114968+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
114969+{
114970+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114971+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
114972+
114973+ if (!ZERO_OR_NULL_PTR(ret))
114974+ kmemleak_alloc(ret, size, 1, gfp);
114975+ return ret;
114976+}
114977+
114978+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
114979 {
114980 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
114981 }
114982@@ -491,34 +515,123 @@ void kfree(const void *block)
114983 return;
114984 kmemleak_free(block);
114985
114986+ VM_BUG_ON(!virt_addr_valid(block));
114987 sp = virt_to_page(block);
114988- if (PageSlab(sp)) {
114989+ VM_BUG_ON(!PageSlab(sp));
114990+ if (!sp->private) {
114991 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
114992- unsigned int *m = (unsigned int *)(block - align);
114993- slob_free(m, *m + align);
114994- } else
114995+ slob_t *m = (slob_t *)(block - align);
114996+ slob_free(NULL, m, m[0].units + align);
114997+ } else {
114998+ __ClearPageSlab(sp);
114999+ page_mapcount_reset(sp);
115000+ sp->private = 0;
115001 __free_pages(sp, compound_order(sp));
115002+ }
115003 }
115004 EXPORT_SYMBOL(kfree);
115005
115006+bool is_usercopy_object(const void *ptr)
115007+{
115008+ if (!slab_is_available())
115009+ return false;
115010+
115011+ if (is_vmalloc_addr(ptr)
115012+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115013+ && !object_starts_on_stack(ptr)
115014+#endif
115015+ ) {
115016+ struct vm_struct *vm = find_vm_area(ptr);
115017+ if (vm && (vm->flags & VM_USERCOPY))
115018+ return true;
115019+ return false;
115020+ }
115021+
115022+ // PAX: TODO
115023+
115024+ return false;
115025+}
115026+
115027+#ifdef CONFIG_PAX_USERCOPY
115028+const char *check_heap_object(const void *ptr, unsigned long n)
115029+{
115030+ struct page *page;
115031+ const slob_t *free;
115032+ const void *base;
115033+ unsigned long flags;
115034+
115035+ if (ZERO_OR_NULL_PTR(ptr))
115036+ return "<null>";
115037+
115038+ if (!virt_addr_valid(ptr))
115039+ return NULL;
115040+
115041+ page = virt_to_head_page(ptr);
115042+ if (!PageSlab(page))
115043+ return NULL;
115044+
115045+ if (page->private) {
115046+ base = page;
115047+ if (base <= ptr && n <= page->private - (ptr - base))
115048+ return NULL;
115049+ return "<slob>";
115050+ }
115051+
115052+ /* some tricky double walking to find the chunk */
115053+ spin_lock_irqsave(&slob_lock, flags);
115054+ base = (void *)((unsigned long)ptr & PAGE_MASK);
115055+ free = page->freelist;
115056+
115057+ while (!slob_last(free) && (void *)free <= ptr) {
115058+ base = free + slob_units(free);
115059+ free = slob_next(free);
115060+ }
115061+
115062+ while (base < (void *)free) {
115063+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
115064+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
115065+ int offset;
115066+
115067+ if (ptr < base + align)
115068+ break;
115069+
115070+ offset = ptr - base - align;
115071+ if (offset >= m) {
115072+ base += size;
115073+ continue;
115074+ }
115075+
115076+ if (n > m - offset)
115077+ break;
115078+
115079+ spin_unlock_irqrestore(&slob_lock, flags);
115080+ return NULL;
115081+ }
115082+
115083+ spin_unlock_irqrestore(&slob_lock, flags);
115084+ return "<slob>";
115085+}
115086+#endif
115087+
115088 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
115089 size_t ksize(const void *block)
115090 {
115091 struct page *sp;
115092 int align;
115093- unsigned int *m;
115094+ slob_t *m;
115095
115096 BUG_ON(!block);
115097 if (unlikely(block == ZERO_SIZE_PTR))
115098 return 0;
115099
115100 sp = virt_to_page(block);
115101- if (unlikely(!PageSlab(sp)))
115102- return PAGE_SIZE << compound_order(sp);
115103+ VM_BUG_ON(!PageSlab(sp));
115104+ if (sp->private)
115105+ return sp->private;
115106
115107 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
115108- m = (unsigned int *)(block - align);
115109- return SLOB_UNITS(*m) * SLOB_UNIT;
115110+ m = (slob_t *)(block - align);
115111+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
115112 }
115113 EXPORT_SYMBOL(ksize);
115114
115115@@ -534,23 +647,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
115116
115117 static void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
115118 {
115119- void *b;
115120+ void *b = NULL;
115121
115122 flags &= gfp_allowed_mask;
115123
115124 lockdep_trace_alloc(flags);
115125
115126+#ifdef CONFIG_PAX_USERCOPY_SLABS
115127+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
115128+#else
115129 if (c->size < PAGE_SIZE) {
115130 b = slob_alloc(c->size, flags, c->align, node);
115131 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
115132 SLOB_UNITS(c->size) * SLOB_UNIT,
115133 flags, node);
115134 } else {
115135- b = slob_new_pages(flags, get_order(c->size), node);
115136+ struct page *sp;
115137+
115138+ sp = slob_new_pages(flags, get_order(c->size), node);
115139+ if (sp) {
115140+ b = page_address(sp);
115141+ sp->private = c->size;
115142+ }
115143 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
115144 PAGE_SIZE << get_order(c->size),
115145 flags, node);
115146 }
115147+#endif
115148
115149 if (b && c->ctor)
115150 c->ctor(b);
115151@@ -566,7 +689,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
115152 EXPORT_SYMBOL(kmem_cache_alloc);
115153
115154 #ifdef CONFIG_NUMA
115155-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
115156+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
115157 {
115158 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
115159 }
115160@@ -579,12 +702,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
115161 EXPORT_SYMBOL(kmem_cache_alloc_node);
115162 #endif
115163
115164-static void __kmem_cache_free(void *b, int size)
115165+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
115166 {
115167- if (size < PAGE_SIZE)
115168- slob_free(b, size);
115169+ struct page *sp;
115170+
115171+ sp = virt_to_page(b);
115172+ BUG_ON(!PageSlab(sp));
115173+ if (!sp->private)
115174+ slob_free(c, b, size);
115175 else
115176- slob_free_pages(b, get_order(size));
115177+ slob_free_pages(sp, get_order(size));
115178 }
115179
115180 static void kmem_rcu_free(struct rcu_head *head)
115181@@ -592,22 +719,36 @@ static void kmem_rcu_free(struct rcu_head *head)
115182 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
115183 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
115184
115185- __kmem_cache_free(b, slob_rcu->size);
115186+ __kmem_cache_free(NULL, b, slob_rcu->size);
115187 }
115188
115189 void kmem_cache_free(struct kmem_cache *c, void *b)
115190 {
115191+ int size = c->size;
115192+
115193+#ifdef CONFIG_PAX_USERCOPY_SLABS
115194+ if (size + c->align < PAGE_SIZE) {
115195+ size += c->align;
115196+ b -= c->align;
115197+ }
115198+#endif
115199+
115200 kmemleak_free_recursive(b, c->flags);
115201 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
115202 struct slob_rcu *slob_rcu;
115203- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
115204- slob_rcu->size = c->size;
115205+ slob_rcu = b + (size - sizeof(struct slob_rcu));
115206+ slob_rcu->size = size;
115207 call_rcu(&slob_rcu->head, kmem_rcu_free);
115208 } else {
115209- __kmem_cache_free(b, c->size);
115210+ __kmem_cache_free(c, b, size);
115211 }
115212
115213+#ifdef CONFIG_PAX_USERCOPY_SLABS
115214+ trace_kfree(_RET_IP_, b);
115215+#else
115216 trace_kmem_cache_free(_RET_IP_, b);
115217+#endif
115218+
115219 }
115220 EXPORT_SYMBOL(kmem_cache_free);
115221
115222diff --git a/mm/slub.c b/mm/slub.c
115223index 54c0876..61847f8 100644
115224--- a/mm/slub.c
115225+++ b/mm/slub.c
115226@@ -198,7 +198,7 @@ struct track {
115227
115228 enum track_item { TRACK_ALLOC, TRACK_FREE };
115229
115230-#ifdef CONFIG_SYSFS
115231+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115232 static int sysfs_slab_add(struct kmem_cache *);
115233 static int sysfs_slab_alias(struct kmem_cache *, const char *);
115234 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
115235@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
115236 if (!t->addr)
115237 return;
115238
115239- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
115240+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
115241 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
115242 #ifdef CONFIG_STACKTRACE
115243 {
115244@@ -1427,7 +1427,7 @@ static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node)
115245 inc_slabs_node(s, page_to_nid(page), page->objects);
115246 page->slab_cache = s;
115247 __SetPageSlab(page);
115248- if (page->pfmemalloc)
115249+ if (page_is_pfmemalloc(page))
115250 SetPageSlabPfmemalloc(page);
115251
115252 start = page_address(page);
115253@@ -2707,6 +2707,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
115254
115255 slab_free_hook(s, x);
115256
115257+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115258+ if (!(s->flags & SLAB_NO_SANITIZE)) {
115259+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
115260+ if (s->ctor)
115261+ s->ctor(x);
115262+ }
115263+#endif
115264+
115265 redo:
115266 /*
115267 * Determine the currently cpus per cpu slab.
115268@@ -3048,6 +3056,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
115269 s->inuse = size;
115270
115271 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
115272+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115273+ (!(flags & SLAB_NO_SANITIZE)) ||
115274+#endif
115275 s->ctor)) {
115276 /*
115277 * Relocate free pointer after the object if it is not
115278@@ -3302,7 +3313,7 @@ static int __init setup_slub_min_objects(char *str)
115279
115280 __setup("slub_min_objects=", setup_slub_min_objects);
115281
115282-void *__kmalloc(size_t size, gfp_t flags)
115283+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
115284 {
115285 struct kmem_cache *s;
115286 void *ret;
115287@@ -3340,7 +3351,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
115288 return ptr;
115289 }
115290
115291-void *__kmalloc_node(size_t size, gfp_t flags, int node)
115292+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
115293 {
115294 struct kmem_cache *s;
115295 void *ret;
115296@@ -3388,6 +3399,70 @@ static size_t __ksize(const void *object)
115297 return slab_ksize(page->slab_cache);
115298 }
115299
115300+bool is_usercopy_object(const void *ptr)
115301+{
115302+ struct page *page;
115303+ struct kmem_cache *s;
115304+
115305+ if (ZERO_OR_NULL_PTR(ptr))
115306+ return false;
115307+
115308+ if (!slab_is_available())
115309+ return false;
115310+
115311+ if (is_vmalloc_addr(ptr)
115312+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115313+ && !object_starts_on_stack(ptr)
115314+#endif
115315+ ) {
115316+ struct vm_struct *vm = find_vm_area(ptr);
115317+ if (vm && (vm->flags & VM_USERCOPY))
115318+ return true;
115319+ return false;
115320+ }
115321+
115322+ if (!virt_addr_valid(ptr))
115323+ return false;
115324+
115325+ page = virt_to_head_page(ptr);
115326+
115327+ if (!PageSlab(page))
115328+ return false;
115329+
115330+ s = page->slab_cache;
115331+ return s->flags & SLAB_USERCOPY;
115332+}
115333+
115334+#ifdef CONFIG_PAX_USERCOPY
115335+const char *check_heap_object(const void *ptr, unsigned long n)
115336+{
115337+ struct page *page;
115338+ struct kmem_cache *s;
115339+ unsigned long offset;
115340+
115341+ if (ZERO_OR_NULL_PTR(ptr))
115342+ return "<null>";
115343+
115344+ if (!virt_addr_valid(ptr))
115345+ return NULL;
115346+
115347+ page = virt_to_head_page(ptr);
115348+
115349+ if (!PageSlab(page))
115350+ return NULL;
115351+
115352+ s = page->slab_cache;
115353+ if (!(s->flags & SLAB_USERCOPY))
115354+ return s->name;
115355+
115356+ offset = (ptr - page_address(page)) % s->size;
115357+ if (offset <= s->object_size && n <= s->object_size - offset)
115358+ return NULL;
115359+
115360+ return s->name;
115361+}
115362+#endif
115363+
115364 size_t ksize(const void *object)
115365 {
115366 size_t size = __ksize(object);
115367@@ -3408,6 +3483,7 @@ void kfree(const void *x)
115368 if (unlikely(ZERO_OR_NULL_PTR(x)))
115369 return;
115370
115371+ VM_BUG_ON(!virt_addr_valid(x));
115372 page = virt_to_head_page(x);
115373 if (unlikely(!PageSlab(page))) {
115374 BUG_ON(!PageCompound(page));
115375@@ -3724,7 +3800,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
115376
115377 s = find_mergeable(size, align, flags, name, ctor);
115378 if (s) {
115379- s->refcount++;
115380+ atomic_inc(&s->refcount);
115381
115382 /*
115383 * Adjust the object sizes so that we clear
115384@@ -3740,7 +3816,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
115385 }
115386
115387 if (sysfs_slab_alias(s, name)) {
115388- s->refcount--;
115389+ atomic_dec(&s->refcount);
115390 s = NULL;
115391 }
115392 }
115393@@ -3857,7 +3933,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
115394 }
115395 #endif
115396
115397-#ifdef CONFIG_SYSFS
115398+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115399 static int count_inuse(struct page *page)
115400 {
115401 return page->inuse;
115402@@ -4138,7 +4214,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
115403 len += sprintf(buf + len, "%7ld ", l->count);
115404
115405 if (l->addr)
115406+#ifdef CONFIG_GRKERNSEC_HIDESYM
115407+ len += sprintf(buf + len, "%pS", NULL);
115408+#else
115409 len += sprintf(buf + len, "%pS", (void *)l->addr);
115410+#endif
115411 else
115412 len += sprintf(buf + len, "<not-available>");
115413
115414@@ -4236,12 +4316,12 @@ static void __init resiliency_test(void)
115415 validate_slab_cache(kmalloc_caches[9]);
115416 }
115417 #else
115418-#ifdef CONFIG_SYSFS
115419+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115420 static void resiliency_test(void) {};
115421 #endif
115422 #endif
115423
115424-#ifdef CONFIG_SYSFS
115425+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115426 enum slab_stat_type {
115427 SL_ALL, /* All slabs */
115428 SL_PARTIAL, /* Only partially allocated slabs */
115429@@ -4478,13 +4558,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
115430 {
115431 if (!s->ctor)
115432 return 0;
115433+#ifdef CONFIG_GRKERNSEC_HIDESYM
115434+ return sprintf(buf, "%pS\n", NULL);
115435+#else
115436 return sprintf(buf, "%pS\n", s->ctor);
115437+#endif
115438 }
115439 SLAB_ATTR_RO(ctor);
115440
115441 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
115442 {
115443- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
115444+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
115445 }
115446 SLAB_ATTR_RO(aliases);
115447
115448@@ -4572,6 +4656,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
115449 SLAB_ATTR_RO(cache_dma);
115450 #endif
115451
115452+#ifdef CONFIG_PAX_USERCOPY_SLABS
115453+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
115454+{
115455+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
115456+}
115457+SLAB_ATTR_RO(usercopy);
115458+#endif
115459+
115460+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115461+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
115462+{
115463+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
115464+}
115465+SLAB_ATTR_RO(sanitize);
115466+#endif
115467+
115468 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
115469 {
115470 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
115471@@ -4627,7 +4727,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
115472 * as well as cause other issues like converting a mergeable
115473 * cache into an umergeable one.
115474 */
115475- if (s->refcount > 1)
115476+ if (atomic_read(&s->refcount) > 1)
115477 return -EINVAL;
115478
115479 s->flags &= ~SLAB_TRACE;
115480@@ -4747,7 +4847,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
115481 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
115482 size_t length)
115483 {
115484- if (s->refcount > 1)
115485+ if (atomic_read(&s->refcount) > 1)
115486 return -EINVAL;
115487
115488 s->flags &= ~SLAB_FAILSLAB;
115489@@ -4914,6 +5014,12 @@ static struct attribute *slab_attrs[] = {
115490 #ifdef CONFIG_ZONE_DMA
115491 &cache_dma_attr.attr,
115492 #endif
115493+#ifdef CONFIG_PAX_USERCOPY_SLABS
115494+ &usercopy_attr.attr,
115495+#endif
115496+#ifdef CONFIG_PAX_MEMORY_SANITIZE
115497+ &sanitize_attr.attr,
115498+#endif
115499 #ifdef CONFIG_NUMA
115500 &remote_node_defrag_ratio_attr.attr,
115501 #endif
115502@@ -5155,6 +5261,7 @@ static char *create_unique_id(struct kmem_cache *s)
115503 return name;
115504 }
115505
115506+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115507 static int sysfs_slab_add(struct kmem_cache *s)
115508 {
115509 int err;
115510@@ -5228,6 +5335,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
115511 kobject_del(&s->kobj);
115512 kobject_put(&s->kobj);
115513 }
115514+#endif
115515
115516 /*
115517 * Need to buffer aliases during bootup until sysfs becomes
115518@@ -5241,6 +5349,7 @@ struct saved_alias {
115519
115520 static struct saved_alias *alias_list;
115521
115522+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
115523 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
115524 {
115525 struct saved_alias *al;
115526@@ -5263,6 +5372,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
115527 alias_list = al;
115528 return 0;
115529 }
115530+#endif
115531
115532 static int __init slab_sysfs_init(void)
115533 {
115534diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
115535index 4cba9c2..b4f9fcc 100644
115536--- a/mm/sparse-vmemmap.c
115537+++ b/mm/sparse-vmemmap.c
115538@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
115539 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
115540 if (!p)
115541 return NULL;
115542- pud_populate(&init_mm, pud, p);
115543+ pud_populate_kernel(&init_mm, pud, p);
115544 }
115545 return pud;
115546 }
115547@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
115548 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
115549 if (!p)
115550 return NULL;
115551- pgd_populate(&init_mm, pgd, p);
115552+ pgd_populate_kernel(&init_mm, pgd, p);
115553 }
115554 return pgd;
115555 }
115556diff --git a/mm/sparse.c b/mm/sparse.c
115557index d1b48b6..6e8590e 100644
115558--- a/mm/sparse.c
115559+++ b/mm/sparse.c
115560@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
115561
115562 for (i = 0; i < PAGES_PER_SECTION; i++) {
115563 if (PageHWPoison(&memmap[i])) {
115564- atomic_long_sub(1, &num_poisoned_pages);
115565+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
115566 ClearPageHWPoison(&memmap[i]);
115567 }
115568 }
115569diff --git a/mm/swap.c b/mm/swap.c
115570index a7251a8..ac754a9 100644
115571--- a/mm/swap.c
115572+++ b/mm/swap.c
115573@@ -85,6 +85,8 @@ static void __put_compound_page(struct page *page)
115574 if (!PageHuge(page))
115575 __page_cache_release(page);
115576 dtor = get_compound_page_dtor(page);
115577+ if (!PageHuge(page))
115578+ BUG_ON(dtor != free_compound_page);
115579 (*dtor)(page);
115580 }
115581
115582diff --git a/mm/swapfile.c b/mm/swapfile.c
115583index a7e7210..b286e7d 100644
115584--- a/mm/swapfile.c
115585+++ b/mm/swapfile.c
115586@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
115587
115588 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
115589 /* Activity counter to indicate that a swapon or swapoff has occurred */
115590-static atomic_t proc_poll_event = ATOMIC_INIT(0);
115591+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
115592
115593 static inline unsigned char swap_count(unsigned char ent)
115594 {
115595@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
115596 spin_unlock(&swap_lock);
115597
115598 err = 0;
115599- atomic_inc(&proc_poll_event);
115600+ atomic_inc_unchecked(&proc_poll_event);
115601 wake_up_interruptible(&proc_poll_wait);
115602
115603 out_dput:
115604@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
115605
115606 poll_wait(file, &proc_poll_wait, wait);
115607
115608- if (seq->poll_event != atomic_read(&proc_poll_event)) {
115609- seq->poll_event = atomic_read(&proc_poll_event);
115610+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
115611+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
115612 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
115613 }
115614
115615@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
115616 return ret;
115617
115618 seq = file->private_data;
115619- seq->poll_event = atomic_read(&proc_poll_event);
115620+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
115621 return 0;
115622 }
115623
115624@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
115625 (frontswap_map) ? "FS" : "");
115626
115627 mutex_unlock(&swapon_mutex);
115628- atomic_inc(&proc_poll_event);
115629+ atomic_inc_unchecked(&proc_poll_event);
115630 wake_up_interruptible(&proc_poll_wait);
115631
115632 if (S_ISREG(inode->i_mode))
115633diff --git a/mm/util.c b/mm/util.c
115634index 68ff8a5..40c7a70 100644
115635--- a/mm/util.c
115636+++ b/mm/util.c
115637@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
115638 void arch_pick_mmap_layout(struct mm_struct *mm)
115639 {
115640 mm->mmap_base = TASK_UNMAPPED_BASE;
115641+
115642+#ifdef CONFIG_PAX_RANDMMAP
115643+ if (mm->pax_flags & MF_PAX_RANDMMAP)
115644+ mm->mmap_base += mm->delta_mmap;
115645+#endif
115646+
115647 mm->get_unmapped_area = arch_get_unmapped_area;
115648 }
115649 #endif
115650@@ -434,6 +440,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
115651 if (!mm->arg_end)
115652 goto out_mm; /* Shh! No looking before we're done */
115653
115654+ if (gr_acl_handle_procpidmem(task))
115655+ goto out_mm;
115656+
115657 len = mm->arg_end - mm->arg_start;
115658
115659 if (len > buflen)
115660diff --git a/mm/vmalloc.c b/mm/vmalloc.c
115661index 2faaa29..37314a8 100644
115662--- a/mm/vmalloc.c
115663+++ b/mm/vmalloc.c
115664@@ -40,20 +40,65 @@ struct vfree_deferred {
115665 struct work_struct wq;
115666 };
115667 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
115668+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
115669+
115670+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115671+struct stack_deferred_llist {
115672+ struct llist_head list;
115673+ void *stack;
115674+ void *lowmem_stack;
115675+};
115676+
115677+struct stack_deferred {
115678+ struct stack_deferred_llist list;
115679+ struct work_struct wq;
115680+};
115681+
115682+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
115683+#endif
115684
115685 static void __vunmap(const void *, int);
115686
115687-static void free_work(struct work_struct *w)
115688+static void vfree_work(struct work_struct *w)
115689 {
115690 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
115691 struct llist_node *llnode = llist_del_all(&p->list);
115692 while (llnode) {
115693- void *p = llnode;
115694+ void *x = llnode;
115695 llnode = llist_next(llnode);
115696- __vunmap(p, 1);
115697+ __vunmap(x, 1);
115698 }
115699 }
115700
115701+static void vunmap_work(struct work_struct *w)
115702+{
115703+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
115704+ struct llist_node *llnode = llist_del_all(&p->list);
115705+ while (llnode) {
115706+ void *x = llnode;
115707+ llnode = llist_next(llnode);
115708+ __vunmap(x, 0);
115709+ }
115710+}
115711+
115712+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115713+static void unmap_work(struct work_struct *w)
115714+{
115715+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
115716+ struct llist_node *llnode = llist_del_all(&p->list.list);
115717+ while (llnode) {
115718+ struct stack_deferred_llist *x =
115719+ llist_entry((struct llist_head *)llnode,
115720+ struct stack_deferred_llist, list);
115721+ void *stack = ACCESS_ONCE(x->stack);
115722+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
115723+ llnode = llist_next(llnode);
115724+ __vunmap(stack, 0);
115725+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
115726+ }
115727+}
115728+#endif
115729+
115730 /*** Page table manipulation functions ***/
115731
115732 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
115733@@ -62,8 +107,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
115734
115735 pte = pte_offset_kernel(pmd, addr);
115736 do {
115737- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
115738- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
115739+
115740+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115741+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
115742+ BUG_ON(!pte_exec(*pte));
115743+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
115744+ continue;
115745+ }
115746+#endif
115747+
115748+ {
115749+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
115750+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
115751+ }
115752 } while (pte++, addr += PAGE_SIZE, addr != end);
115753 }
115754
115755@@ -127,16 +183,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
115756 pte = pte_alloc_kernel(pmd, addr);
115757 if (!pte)
115758 return -ENOMEM;
115759+
115760+ pax_open_kernel();
115761 do {
115762 struct page *page = pages[*nr];
115763
115764- if (WARN_ON(!pte_none(*pte)))
115765+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115766+ if (pgprot_val(prot) & _PAGE_NX)
115767+#endif
115768+
115769+ if (!pte_none(*pte)) {
115770+ pax_close_kernel();
115771+ WARN_ON(1);
115772 return -EBUSY;
115773- if (WARN_ON(!page))
115774+ }
115775+ if (!page) {
115776+ pax_close_kernel();
115777+ WARN_ON(1);
115778 return -ENOMEM;
115779+ }
115780 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
115781 (*nr)++;
115782 } while (pte++, addr += PAGE_SIZE, addr != end);
115783+ pax_close_kernel();
115784 return 0;
115785 }
115786
115787@@ -146,7 +215,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
115788 pmd_t *pmd;
115789 unsigned long next;
115790
115791- pmd = pmd_alloc(&init_mm, pud, addr);
115792+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
115793 if (!pmd)
115794 return -ENOMEM;
115795 do {
115796@@ -163,7 +232,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
115797 pud_t *pud;
115798 unsigned long next;
115799
115800- pud = pud_alloc(&init_mm, pgd, addr);
115801+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
115802 if (!pud)
115803 return -ENOMEM;
115804 do {
115805@@ -223,6 +292,12 @@ int is_vmalloc_or_module_addr(const void *x)
115806 if (addr >= MODULES_VADDR && addr < MODULES_END)
115807 return 1;
115808 #endif
115809+
115810+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
115811+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
115812+ return 1;
115813+#endif
115814+
115815 return is_vmalloc_addr(x);
115816 }
115817
115818@@ -243,8 +318,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
115819
115820 if (!pgd_none(*pgd)) {
115821 pud_t *pud = pud_offset(pgd, addr);
115822+#ifdef CONFIG_X86
115823+ if (!pud_large(*pud))
115824+#endif
115825 if (!pud_none(*pud)) {
115826 pmd_t *pmd = pmd_offset(pud, addr);
115827+#ifdef CONFIG_X86
115828+ if (!pmd_large(*pmd))
115829+#endif
115830 if (!pmd_none(*pmd)) {
115831 pte_t *ptep, pte;
115832
115833@@ -346,7 +427,7 @@ static void purge_vmap_area_lazy(void);
115834 * Allocate a region of KVA of the specified size and alignment, within the
115835 * vstart and vend.
115836 */
115837-static struct vmap_area *alloc_vmap_area(unsigned long size,
115838+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
115839 unsigned long align,
115840 unsigned long vstart, unsigned long vend,
115841 int node, gfp_t gfp_mask)
115842@@ -1202,13 +1283,27 @@ void __init vmalloc_init(void)
115843 for_each_possible_cpu(i) {
115844 struct vmap_block_queue *vbq;
115845 struct vfree_deferred *p;
115846+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115847+ struct stack_deferred *p2;
115848+#endif
115849
115850 vbq = &per_cpu(vmap_block_queue, i);
115851 spin_lock_init(&vbq->lock);
115852 INIT_LIST_HEAD(&vbq->free);
115853+
115854 p = &per_cpu(vfree_deferred, i);
115855 init_llist_head(&p->list);
115856- INIT_WORK(&p->wq, free_work);
115857+ INIT_WORK(&p->wq, vfree_work);
115858+
115859+ p = &per_cpu(vunmap_deferred, i);
115860+ init_llist_head(&p->list);
115861+ INIT_WORK(&p->wq, vunmap_work);
115862+
115863+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115864+ p2 = &per_cpu(stack_deferred, i);
115865+ init_llist_head(&p2->list.list);
115866+ INIT_WORK(&p2->wq, unmap_work);
115867+#endif
115868 }
115869
115870 /* Import existing vmlist entries. */
115871@@ -1333,6 +1428,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
115872 struct vm_struct *area;
115873
115874 BUG_ON(in_interrupt());
115875+
115876+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115877+ if (flags & VM_KERNEXEC) {
115878+ if (start != VMALLOC_START || end != VMALLOC_END)
115879+ return NULL;
115880+ start = (unsigned long)MODULES_EXEC_VADDR;
115881+ end = (unsigned long)MODULES_EXEC_END;
115882+ }
115883+#endif
115884+
115885 if (flags & VM_IOREMAP)
115886 align = 1ul << clamp_t(int, fls_long(size),
115887 PAGE_SHIFT, IOREMAP_MAX_ORDER);
115888@@ -1531,13 +1636,36 @@ EXPORT_SYMBOL(vfree);
115889 */
115890 void vunmap(const void *addr)
115891 {
115892- BUG_ON(in_interrupt());
115893- might_sleep();
115894- if (addr)
115895+ if (!addr)
115896+ return;
115897+ if (unlikely(in_interrupt())) {
115898+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
115899+ if (llist_add((struct llist_node *)addr, &p->list))
115900+ schedule_work(&p->wq);
115901+ } else {
115902+ might_sleep();
115903 __vunmap(addr, 0);
115904+ }
115905 }
115906 EXPORT_SYMBOL(vunmap);
115907
115908+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
115909+void unmap_process_stacks(struct task_struct *task)
115910+{
115911+ if (unlikely(in_interrupt())) {
115912+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
115913+ struct stack_deferred_llist *list = task->stack;
115914+ list->stack = task->stack;
115915+ list->lowmem_stack = task->lowmem_stack;
115916+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
115917+ schedule_work(&p->wq);
115918+ } else {
115919+ __vunmap(task->stack, 0);
115920+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
115921+ }
115922+}
115923+#endif
115924+
115925 /**
115926 * vmap - map an array of pages into virtually contiguous space
115927 * @pages: array of page pointers
115928@@ -1558,6 +1686,11 @@ void *vmap(struct page **pages, unsigned int count,
115929 if (count > totalram_pages)
115930 return NULL;
115931
115932+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115933+ if (!(pgprot_val(prot) & _PAGE_NX))
115934+ flags |= VM_KERNEXEC;
115935+#endif
115936+
115937 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
115938 __builtin_return_address(0));
115939 if (!area)
115940@@ -1662,6 +1795,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
115941 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
115942 goto fail;
115943
115944+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
115945+ if (!(pgprot_val(prot) & _PAGE_NX)) {
115946+ vm_flags |= VM_KERNEXEC;
115947+ start = VMALLOC_START;
115948+ end = VMALLOC_END;
115949+ }
115950+#endif
115951+
115952 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
115953 vm_flags, start, end, node, gfp_mask, caller);
115954 if (!area)
115955@@ -1715,6 +1856,14 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
115956 gfp_mask, prot, 0, node, caller);
115957 }
115958
115959+void *vmalloc_usercopy(unsigned long size)
115960+{
115961+ return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END,
115962+ GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
115963+ VM_USERCOPY, NUMA_NO_NODE,
115964+ __builtin_return_address(0));
115965+}
115966+
115967 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
115968 {
115969 return __vmalloc_node(size, 1, gfp_mask, prot, NUMA_NO_NODE,
115970@@ -1838,10 +1987,9 @@ EXPORT_SYMBOL(vzalloc_node);
115971 * For tight control over page level allocator and protection flags
115972 * use __vmalloc() instead.
115973 */
115974-
115975 void *vmalloc_exec(unsigned long size)
115976 {
115977- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
115978+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
115979 NUMA_NO_NODE, __builtin_return_address(0));
115980 }
115981
115982@@ -2148,6 +2296,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
115983 {
115984 struct vm_struct *area;
115985
115986+ BUG_ON(vma->vm_mirror);
115987+
115988 size = PAGE_ALIGN(size);
115989
115990 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
115991@@ -2630,7 +2780,11 @@ static int s_show(struct seq_file *m, void *p)
115992 v->addr, v->addr + v->size, v->size);
115993
115994 if (v->caller)
115995+#ifdef CONFIG_GRKERNSEC_HIDESYM
115996+ seq_printf(m, " %pK", v->caller);
115997+#else
115998 seq_printf(m, " %pS", v->caller);
115999+#endif
116000
116001 if (v->nr_pages)
116002 seq_printf(m, " pages=%d", v->nr_pages);
116003diff --git a/mm/vmstat.c b/mm/vmstat.c
116004index 4f5cd97..9fb715a 100644
116005--- a/mm/vmstat.c
116006+++ b/mm/vmstat.c
116007@@ -27,6 +27,7 @@
116008 #include <linux/mm_inline.h>
116009 #include <linux/page_ext.h>
116010 #include <linux/page_owner.h>
116011+#include <linux/grsecurity.h>
116012
116013 #include "internal.h"
116014
116015@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
116016 *
116017 * vm_stat contains the global counters
116018 */
116019-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
116020+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
116021 EXPORT_SYMBOL(vm_stat);
116022
116023 #ifdef CONFIG_SMP
116024@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
116025
116026 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
116027 if (diff[i]) {
116028- atomic_long_add(diff[i], &vm_stat[i]);
116029+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
116030 changes++;
116031 }
116032 return changes;
116033@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
116034 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
116035 if (v) {
116036
116037- atomic_long_add(v, &zone->vm_stat[i]);
116038+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
116039 global_diff[i] += v;
116040 #ifdef CONFIG_NUMA
116041 /* 3 seconds idle till flush */
116042@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
116043
116044 v = p->vm_stat_diff[i];
116045 p->vm_stat_diff[i] = 0;
116046- atomic_long_add(v, &zone->vm_stat[i]);
116047+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
116048 global_diff[i] += v;
116049 }
116050 }
116051@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
116052 if (pset->vm_stat_diff[i]) {
116053 int v = pset->vm_stat_diff[i];
116054 pset->vm_stat_diff[i] = 0;
116055- atomic_long_add(v, &zone->vm_stat[i]);
116056- atomic_long_add(v, &vm_stat[i]);
116057+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
116058+ atomic_long_add_unchecked(v, &vm_stat[i]);
116059 }
116060 }
116061 #endif
116062@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
116063 stat_items_size += sizeof(struct vm_event_state);
116064 #endif
116065
116066- v = kmalloc(stat_items_size, GFP_KERNEL);
116067+ v = kzalloc(stat_items_size, GFP_KERNEL);
116068 m->private = v;
116069 if (!v)
116070 return ERR_PTR(-ENOMEM);
116071+
116072+#ifdef CONFIG_GRKERNSEC_PROC_ADD
116073+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
116074+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
116075+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
116076+ && !in_group_p(grsec_proc_gid)
116077+#endif
116078+ )
116079+ return (unsigned long *)m->private + *pos;
116080+#endif
116081+#endif
116082+
116083 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
116084 v[i] = global_page_state(i);
116085 v += NR_VM_ZONE_STAT_ITEMS;
116086@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
116087 cpu_notifier_register_done();
116088 #endif
116089 #ifdef CONFIG_PROC_FS
116090- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
116091- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
116092- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
116093- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
116094+ {
116095+ mode_t gr_mode = S_IRUGO;
116096+#ifdef CONFIG_GRKERNSEC_PROC_ADD
116097+ gr_mode = S_IRUSR;
116098+#endif
116099+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
116100+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
116101+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
116102+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
116103+ }
116104 #endif
116105 return 0;
116106 }
116107diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
116108index 59555f0..fd7ade9 100644
116109--- a/net/8021q/vlan.c
116110+++ b/net/8021q/vlan.c
116111@@ -491,7 +491,7 @@ out:
116112 return NOTIFY_DONE;
116113 }
116114
116115-static struct notifier_block vlan_notifier_block __read_mostly = {
116116+static struct notifier_block vlan_notifier_block = {
116117 .notifier_call = vlan_device_event,
116118 };
116119
116120@@ -566,8 +566,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
116121 err = -EPERM;
116122 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
116123 break;
116124- if ((args.u.name_type >= 0) &&
116125- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
116126+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
116127 struct vlan_net *vn;
116128
116129 vn = net_generic(net, vlan_net_id);
116130diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
116131index c92b52f..006c052 100644
116132--- a/net/8021q/vlan_netlink.c
116133+++ b/net/8021q/vlan_netlink.c
116134@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
116135 return dev_net(real_dev);
116136 }
116137
116138-struct rtnl_link_ops vlan_link_ops __read_mostly = {
116139+struct rtnl_link_ops vlan_link_ops = {
116140 .kind = "vlan",
116141 .maxtype = IFLA_VLAN_MAX,
116142 .policy = vlan_policy,
116143diff --git a/net/9p/client.c b/net/9p/client.c
116144index 81925b9..fcf6fe0 100644
116145--- a/net/9p/client.c
116146+++ b/net/9p/client.c
116147@@ -1541,6 +1541,7 @@ p9_client_read(struct p9_fid *fid, u64 offset, struct iov_iter *to, int *err)
116148 struct p9_client *clnt = fid->clnt;
116149 struct p9_req_t *req;
116150 int total = 0;
116151+ *err = 0;
116152
116153 p9_debug(P9_DEBUG_9P, ">>> TREAD fid %d offset %llu %d\n",
116154 fid->fid, (unsigned long long) offset, (int)iov_iter_count(to));
116155@@ -1616,6 +1617,7 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err)
116156 struct p9_client *clnt = fid->clnt;
116157 struct p9_req_t *req;
116158 int total = 0;
116159+ *err = 0;
116160
116161 p9_debug(P9_DEBUG_9P, ">>> TWRITE fid %d offset %llu count %zd\n",
116162 fid->fid, (unsigned long long) offset,
116163diff --git a/net/9p/mod.c b/net/9p/mod.c
116164index 6ab36ae..6f1841b 100644
116165--- a/net/9p/mod.c
116166+++ b/net/9p/mod.c
116167@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
116168 void v9fs_register_trans(struct p9_trans_module *m)
116169 {
116170 spin_lock(&v9fs_trans_lock);
116171- list_add_tail(&m->list, &v9fs_trans_list);
116172+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
116173 spin_unlock(&v9fs_trans_lock);
116174 }
116175 EXPORT_SYMBOL(v9fs_register_trans);
116176@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
116177 void v9fs_unregister_trans(struct p9_trans_module *m)
116178 {
116179 spin_lock(&v9fs_trans_lock);
116180- list_del_init(&m->list);
116181+ pax_list_del_init((struct list_head *)&m->list);
116182 spin_unlock(&v9fs_trans_lock);
116183 }
116184 EXPORT_SYMBOL(v9fs_unregister_trans);
116185diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
116186index bced8c0..ef253b7 100644
116187--- a/net/9p/trans_fd.c
116188+++ b/net/9p/trans_fd.c
116189@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
116190 oldfs = get_fs();
116191 set_fs(get_ds());
116192 /* The cast to a user pointer is valid due to the set_fs() */
116193- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
116194+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
116195 set_fs(oldfs);
116196
116197 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
116198diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
116199index af46bc4..f9adfcd 100644
116200--- a/net/appletalk/atalk_proc.c
116201+++ b/net/appletalk/atalk_proc.c
116202@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
116203 struct proc_dir_entry *p;
116204 int rc = -ENOMEM;
116205
116206- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
116207+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
116208 if (!atalk_proc_dir)
116209 goto out;
116210
116211diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
116212index 876fbe8..8bbea9f 100644
116213--- a/net/atm/atm_misc.c
116214+++ b/net/atm/atm_misc.c
116215@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
116216 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
116217 return 1;
116218 atm_return(vcc, truesize);
116219- atomic_inc(&vcc->stats->rx_drop);
116220+ atomic_inc_unchecked(&vcc->stats->rx_drop);
116221 return 0;
116222 }
116223 EXPORT_SYMBOL(atm_charge);
116224@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
116225 }
116226 }
116227 atm_return(vcc, guess);
116228- atomic_inc(&vcc->stats->rx_drop);
116229+ atomic_inc_unchecked(&vcc->stats->rx_drop);
116230 return NULL;
116231 }
116232 EXPORT_SYMBOL(atm_alloc_charge);
116233@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
116234
116235 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
116236 {
116237-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
116238+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
116239 __SONET_ITEMS
116240 #undef __HANDLE_ITEM
116241 }
116242@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
116243
116244 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
116245 {
116246-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
116247+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
116248 __SONET_ITEMS
116249 #undef __HANDLE_ITEM
116250 }
116251diff --git a/net/atm/lec.c b/net/atm/lec.c
116252index cd3b379..977a3c9 100644
116253--- a/net/atm/lec.c
116254+++ b/net/atm/lec.c
116255@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
116256 }
116257
116258 static struct lane2_ops lane2_ops = {
116259- lane2_resolve, /* resolve, spec 3.1.3 */
116260- lane2_associate_req, /* associate_req, spec 3.1.4 */
116261- NULL /* associate indicator, spec 3.1.5 */
116262+ .resolve = lane2_resolve,
116263+ .associate_req = lane2_associate_req,
116264+ .associate_indicator = NULL
116265 };
116266
116267 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
116268diff --git a/net/atm/lec.h b/net/atm/lec.h
116269index 4149db1..f2ab682 100644
116270--- a/net/atm/lec.h
116271+++ b/net/atm/lec.h
116272@@ -48,7 +48,7 @@ struct lane2_ops {
116273 const u8 *tlvs, u32 sizeoftlvs);
116274 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
116275 const u8 *tlvs, u32 sizeoftlvs);
116276-};
116277+} __no_const;
116278
116279 /*
116280 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
116281diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
116282index d1b2d9a..d549f7f 100644
116283--- a/net/atm/mpoa_caches.c
116284+++ b/net/atm/mpoa_caches.c
116285@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
116286
116287
116288 static struct in_cache_ops ingress_ops = {
116289- in_cache_add_entry, /* add_entry */
116290- in_cache_get, /* get */
116291- in_cache_get_with_mask, /* get_with_mask */
116292- in_cache_get_by_vcc, /* get_by_vcc */
116293- in_cache_put, /* put */
116294- in_cache_remove_entry, /* remove_entry */
116295- cache_hit, /* cache_hit */
116296- clear_count_and_expired, /* clear_count */
116297- check_resolving_entries, /* check_resolving */
116298- refresh_entries, /* refresh */
116299- in_destroy_cache /* destroy_cache */
116300+ .add_entry = in_cache_add_entry,
116301+ .get = in_cache_get,
116302+ .get_with_mask = in_cache_get_with_mask,
116303+ .get_by_vcc = in_cache_get_by_vcc,
116304+ .put = in_cache_put,
116305+ .remove_entry = in_cache_remove_entry,
116306+ .cache_hit = cache_hit,
116307+ .clear_count = clear_count_and_expired,
116308+ .check_resolving = check_resolving_entries,
116309+ .refresh = refresh_entries,
116310+ .destroy_cache = in_destroy_cache
116311 };
116312
116313 static struct eg_cache_ops egress_ops = {
116314- eg_cache_add_entry, /* add_entry */
116315- eg_cache_get_by_cache_id, /* get_by_cache_id */
116316- eg_cache_get_by_tag, /* get_by_tag */
116317- eg_cache_get_by_vcc, /* get_by_vcc */
116318- eg_cache_get_by_src_ip, /* get_by_src_ip */
116319- eg_cache_put, /* put */
116320- eg_cache_remove_entry, /* remove_entry */
116321- update_eg_cache_entry, /* update */
116322- clear_expired, /* clear_expired */
116323- eg_destroy_cache /* destroy_cache */
116324+ .add_entry = eg_cache_add_entry,
116325+ .get_by_cache_id = eg_cache_get_by_cache_id,
116326+ .get_by_tag = eg_cache_get_by_tag,
116327+ .get_by_vcc = eg_cache_get_by_vcc,
116328+ .get_by_src_ip = eg_cache_get_by_src_ip,
116329+ .put = eg_cache_put,
116330+ .remove_entry = eg_cache_remove_entry,
116331+ .update = update_eg_cache_entry,
116332+ .clear_expired = clear_expired,
116333+ .destroy_cache = eg_destroy_cache
116334 };
116335
116336
116337diff --git a/net/atm/proc.c b/net/atm/proc.c
116338index bbb6461..cf04016 100644
116339--- a/net/atm/proc.c
116340+++ b/net/atm/proc.c
116341@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
116342 const struct k_atm_aal_stats *stats)
116343 {
116344 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
116345- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
116346- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
116347- atomic_read(&stats->rx_drop));
116348+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
116349+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
116350+ atomic_read_unchecked(&stats->rx_drop));
116351 }
116352
116353 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
116354diff --git a/net/atm/resources.c b/net/atm/resources.c
116355index 0447d5d..3cf4728 100644
116356--- a/net/atm/resources.c
116357+++ b/net/atm/resources.c
116358@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
116359 static void copy_aal_stats(struct k_atm_aal_stats *from,
116360 struct atm_aal_stats *to)
116361 {
116362-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
116363+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
116364 __AAL_STAT_ITEMS
116365 #undef __HANDLE_ITEM
116366 }
116367@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
116368 static void subtract_aal_stats(struct k_atm_aal_stats *from,
116369 struct atm_aal_stats *to)
116370 {
116371-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
116372+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
116373 __AAL_STAT_ITEMS
116374 #undef __HANDLE_ITEM
116375 }
116376diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c
116377index 1997538..3b78e84 100644
116378--- a/net/ax25/ax25_subr.c
116379+++ b/net/ax25/ax25_subr.c
116380@@ -264,6 +264,7 @@ void ax25_disconnect(ax25_cb *ax25, int reason)
116381 {
116382 ax25_clear_queues(ax25);
116383
116384+ ax25_stop_heartbeat(ax25);
116385 ax25_stop_t1timer(ax25);
116386 ax25_stop_t2timer(ax25);
116387 ax25_stop_t3timer(ax25);
116388diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
116389index 919a5ce..cc6b444 100644
116390--- a/net/ax25/sysctl_net_ax25.c
116391+++ b/net/ax25/sysctl_net_ax25.c
116392@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
116393 {
116394 char path[sizeof("net/ax25/") + IFNAMSIZ];
116395 int k;
116396- struct ctl_table *table;
116397+ ctl_table_no_const *table;
116398
116399 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
116400 if (!table)
116401diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
116402index 00e00e0..710fcd2 100644
116403--- a/net/batman-adv/bat_iv_ogm.c
116404+++ b/net/batman-adv/bat_iv_ogm.c
116405@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
116406
116407 /* randomize initial seqno to avoid collision */
116408 get_random_bytes(&random_seqno, sizeof(random_seqno));
116409- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
116410+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
116411
116412 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
116413 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
116414@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
116415 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
116416
116417 /* change sequence number to network order */
116418- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
116419+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
116420 batadv_ogm_packet->seqno = htonl(seqno);
116421- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
116422+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
116423
116424 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
116425
116426@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
116427 return;
116428
116429 /* could be changed by schedule_own_packet() */
116430- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
116431+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
116432
116433 if (ogm_packet->flags & BATADV_DIRECTLINK)
116434 has_directlink_flag = true;
116435diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
116436index 3d1dcaa..4699f4e 100644
116437--- a/net/batman-adv/fragmentation.c
116438+++ b/net/batman-adv/fragmentation.c
116439@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
116440 frag_header.packet_type = BATADV_UNICAST_FRAG;
116441 frag_header.version = BATADV_COMPAT_VERSION;
116442 frag_header.ttl = BATADV_TTL;
116443- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
116444+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
116445 frag_header.reserved = 0;
116446 frag_header.no = 0;
116447 frag_header.total_size = htons(skb->len);
116448diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
116449index 5ec31d7..e371631 100644
116450--- a/net/batman-adv/soft-interface.c
116451+++ b/net/batman-adv/soft-interface.c
116452@@ -295,7 +295,7 @@ send:
116453 primary_if->net_dev->dev_addr);
116454
116455 /* set broadcast sequence number */
116456- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
116457+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
116458 bcast_packet->seqno = htonl(seqno);
116459
116460 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
116461@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
116462 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
116463
116464 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
116465- atomic_set(&bat_priv->bcast_seqno, 1);
116466+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
116467 atomic_set(&bat_priv->tt.vn, 0);
116468 atomic_set(&bat_priv->tt.local_changes, 0);
116469 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
116470@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
116471
116472 /* randomize initial seqno to avoid collision */
116473 get_random_bytes(&random_seqno, sizeof(random_seqno));
116474- atomic_set(&bat_priv->frag_seqno, random_seqno);
116475+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
116476
116477 bat_priv->primary_if = NULL;
116478 bat_priv->num_ifaces = 0;
116479@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
116480 return 0;
116481 }
116482
116483-struct rtnl_link_ops batadv_link_ops __read_mostly = {
116484+struct rtnl_link_ops batadv_link_ops = {
116485 .kind = "batadv",
116486 .priv_size = sizeof(struct batadv_priv),
116487 .setup = batadv_softif_init_early,
116488diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
116489index 9398c3f..0e79657 100644
116490--- a/net/batman-adv/types.h
116491+++ b/net/batman-adv/types.h
116492@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
116493 struct batadv_hard_iface_bat_iv {
116494 unsigned char *ogm_buff;
116495 int ogm_buff_len;
116496- atomic_t ogm_seqno;
116497+ atomic_unchecked_t ogm_seqno;
116498 };
116499
116500 /**
116501@@ -766,7 +766,7 @@ struct batadv_priv {
116502 atomic_t bonding;
116503 atomic_t fragmentation;
116504 atomic_t packet_size_max;
116505- atomic_t frag_seqno;
116506+ atomic_unchecked_t frag_seqno;
116507 #ifdef CONFIG_BATMAN_ADV_BLA
116508 atomic_t bridge_loop_avoidance;
116509 #endif
116510@@ -785,7 +785,7 @@ struct batadv_priv {
116511 #endif
116512 uint32_t isolation_mark;
116513 uint32_t isolation_mark_mask;
116514- atomic_t bcast_seqno;
116515+ atomic_unchecked_t bcast_seqno;
116516 atomic_t bcast_queue_left;
116517 atomic_t batman_queue_left;
116518 char num_ifaces;
116519diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
116520index e11a5cf..02864cd 100644
116521--- a/net/bluetooth/hci_sock.c
116522+++ b/net/bluetooth/hci_sock.c
116523@@ -1253,7 +1253,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
116524 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
116525 }
116526
116527- len = min_t(unsigned int, len, sizeof(uf));
116528+ len = min((size_t)len, sizeof(uf));
116529 if (copy_from_user(&uf, optval, len)) {
116530 err = -EFAULT;
116531 break;
116532diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
116533index dad4197..253bbdf 100644
116534--- a/net/bluetooth/l2cap_core.c
116535+++ b/net/bluetooth/l2cap_core.c
116536@@ -3541,8 +3541,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
116537 break;
116538
116539 case L2CAP_CONF_RFC:
116540- if (olen == sizeof(rfc))
116541- memcpy(&rfc, (void *)val, olen);
116542+ if (olen != sizeof(rfc))
116543+ break;
116544+
116545+ memcpy(&rfc, (void *)val, olen);
116546
116547 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
116548 rfc.mode != chan->mode)
116549diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
116550index a7278f0..3443626 100644
116551--- a/net/bluetooth/l2cap_sock.c
116552+++ b/net/bluetooth/l2cap_sock.c
116553@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
116554 struct sock *sk = sock->sk;
116555 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
116556 struct l2cap_options opts;
116557- int len, err = 0;
116558+ int err = 0;
116559+ size_t len = optlen;
116560 u32 opt;
116561
116562 BT_DBG("sk %p", sk);
116563@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
116564 opts.max_tx = chan->max_tx;
116565 opts.txwin_size = chan->tx_win;
116566
116567- len = min_t(unsigned int, sizeof(opts), optlen);
116568+ len = min(sizeof(opts), len);
116569 if (copy_from_user((char *) &opts, optval, len)) {
116570 err = -EFAULT;
116571 break;
116572@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116573 struct bt_security sec;
116574 struct bt_power pwr;
116575 struct l2cap_conn *conn;
116576- int len, err = 0;
116577+ int err = 0;
116578+ size_t len = optlen;
116579 u32 opt;
116580
116581 BT_DBG("sk %p", sk);
116582@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116583
116584 sec.level = BT_SECURITY_LOW;
116585
116586- len = min_t(unsigned int, sizeof(sec), optlen);
116587+ len = min(sizeof(sec), len);
116588 if (copy_from_user((char *) &sec, optval, len)) {
116589 err = -EFAULT;
116590 break;
116591@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
116592
116593 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
116594
116595- len = min_t(unsigned int, sizeof(pwr), optlen);
116596+ len = min(sizeof(pwr), len);
116597 if (copy_from_user((char *) &pwr, optval, len)) {
116598 err = -EFAULT;
116599 break;
116600diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
116601index 825e8fb..efc24a4 100644
116602--- a/net/bluetooth/rfcomm/sock.c
116603+++ b/net/bluetooth/rfcomm/sock.c
116604@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
116605 struct sock *sk = sock->sk;
116606 struct bt_security sec;
116607 int err = 0;
116608- size_t len;
116609+ size_t len = optlen;
116610 u32 opt;
116611
116612 BT_DBG("sk %p", sk);
116613@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
116614
116615 sec.level = BT_SECURITY_LOW;
116616
116617- len = min_t(unsigned int, sizeof(sec), optlen);
116618+ len = min(sizeof(sec), len);
116619 if (copy_from_user((char *) &sec, optval, len)) {
116620 err = -EFAULT;
116621 break;
116622diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
116623index 8e385a0..a5bdd8e 100644
116624--- a/net/bluetooth/rfcomm/tty.c
116625+++ b/net/bluetooth/rfcomm/tty.c
116626@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
116627 BT_DBG("tty %p id %d", tty, tty->index);
116628
116629 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
116630- dev->channel, dev->port.count);
116631+ dev->channel, atomic_read(&dev->port.count));
116632
116633 err = tty_port_open(&dev->port, tty, filp);
116634 if (err)
116635@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
116636 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
116637
116638 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
116639- dev->port.count);
116640+ atomic_read(&dev->port.count));
116641
116642 tty_port_close(&dev->port, tty, filp);
116643 }
116644diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
116645index e29ad70b..cc00066 100644
116646--- a/net/bridge/br_mdb.c
116647+++ b/net/bridge/br_mdb.c
116648@@ -371,6 +371,7 @@ static int __br_mdb_add(struct net *net, struct net_bridge *br,
116649 if (!p || p->br != br || p->state == BR_STATE_DISABLED)
116650 return -EINVAL;
116651
116652+ memset(&ip, 0, sizeof(ip));
116653 ip.proto = entry->addr.proto;
116654 if (ip.proto == htons(ETH_P_IP))
116655 ip.u.ip4 = entry->addr.u.ip4;
116656@@ -417,6 +418,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry)
116657 if (!netif_running(br->dev) || br->multicast_disabled)
116658 return -EINVAL;
116659
116660+ memset(&ip, 0, sizeof(ip));
116661 ip.proto = entry->addr.proto;
116662 if (ip.proto == htons(ETH_P_IP)) {
116663 if (timer_pending(&br->ip4_other_query.timer))
116664diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
116665index 4b5c236..f303683 100644
116666--- a/net/bridge/br_netlink.c
116667+++ b/net/bridge/br_netlink.c
116668@@ -112,6 +112,8 @@ static inline size_t br_port_info_size(void)
116669 + nla_total_size(1) /* IFLA_BRPORT_FAST_LEAVE */
116670 + nla_total_size(1) /* IFLA_BRPORT_LEARNING */
116671 + nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */
116672+ + nla_total_size(1) /* IFLA_BRPORT_PROXYARP */
116673+ + nla_total_size(1) /* IFLA_BRPORT_PROXYARP_WIFI */
116674 + 0;
116675 }
116676
116677@@ -504,6 +506,8 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {
116678 [IFLA_BRPORT_FAST_LEAVE]= { .type = NLA_U8 },
116679 [IFLA_BRPORT_LEARNING] = { .type = NLA_U8 },
116680 [IFLA_BRPORT_UNICAST_FLOOD] = { .type = NLA_U8 },
116681+ [IFLA_BRPORT_PROXYARP] = { .type = NLA_U8 },
116682+ [IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 },
116683 };
116684
116685 /* Change the state of the port and notify spanning tree */
116686@@ -841,7 +845,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
116687 .get_link_af_size = br_get_link_af_size,
116688 };
116689
116690-struct rtnl_link_ops br_link_ops __read_mostly = {
116691+struct rtnl_link_ops br_link_ops = {
116692 .kind = "bridge",
116693 .priv_size = sizeof(struct net_bridge),
116694 .setup = br_dev_setup,
116695diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
116696index 91180a7..1301daa 100644
116697--- a/net/bridge/netfilter/ebtables.c
116698+++ b/net/bridge/netfilter/ebtables.c
116699@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
116700 tmp.valid_hooks = t->table->valid_hooks;
116701 }
116702 mutex_unlock(&ebt_mutex);
116703- if (copy_to_user(user, &tmp, *len) != 0) {
116704+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116705 BUGPRINT("c2u Didn't work\n");
116706 ret = -EFAULT;
116707 break;
116708@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
116709 goto out;
116710 tmp.valid_hooks = t->valid_hooks;
116711
116712- if (copy_to_user(user, &tmp, *len) != 0) {
116713+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116714 ret = -EFAULT;
116715 break;
116716 }
116717@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
116718 tmp.entries_size = t->table->entries_size;
116719 tmp.valid_hooks = t->table->valid_hooks;
116720
116721- if (copy_to_user(user, &tmp, *len) != 0) {
116722+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
116723 ret = -EFAULT;
116724 break;
116725 }
116726diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
116727index f5afda1..dcf770a 100644
116728--- a/net/caif/cfctrl.c
116729+++ b/net/caif/cfctrl.c
116730@@ -10,6 +10,7 @@
116731 #include <linux/spinlock.h>
116732 #include <linux/slab.h>
116733 #include <linux/pkt_sched.h>
116734+#include <linux/sched.h>
116735 #include <net/caif/caif_layer.h>
116736 #include <net/caif/cfpkt.h>
116737 #include <net/caif/cfctrl.h>
116738@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
116739 memset(&dev_info, 0, sizeof(dev_info));
116740 dev_info.id = 0xff;
116741 cfsrvl_init(&this->serv, 0, &dev_info, false);
116742- atomic_set(&this->req_seq_no, 1);
116743- atomic_set(&this->rsp_seq_no, 1);
116744+ atomic_set_unchecked(&this->req_seq_no, 1);
116745+ atomic_set_unchecked(&this->rsp_seq_no, 1);
116746 this->serv.layer.receive = cfctrl_recv;
116747 sprintf(this->serv.layer.name, "ctrl");
116748 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
116749@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
116750 struct cfctrl_request_info *req)
116751 {
116752 spin_lock_bh(&ctrl->info_list_lock);
116753- atomic_inc(&ctrl->req_seq_no);
116754- req->sequence_no = atomic_read(&ctrl->req_seq_no);
116755+ atomic_inc_unchecked(&ctrl->req_seq_no);
116756+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
116757 list_add_tail(&req->list, &ctrl->list);
116758 spin_unlock_bh(&ctrl->info_list_lock);
116759 }
116760@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
116761 if (p != first)
116762 pr_warn("Requests are not received in order\n");
116763
116764- atomic_set(&ctrl->rsp_seq_no,
116765+ atomic_set_unchecked(&ctrl->rsp_seq_no,
116766 p->sequence_no);
116767 list_del(&p->list);
116768 goto out;
116769diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
116770index 67a4a36..8d28068 100644
116771--- a/net/caif/chnl_net.c
116772+++ b/net/caif/chnl_net.c
116773@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
116774 };
116775
116776
116777-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
116778+static struct rtnl_link_ops ipcaif_link_ops = {
116779 .kind = "caif",
116780 .priv_size = sizeof(struct chnl_net),
116781 .setup = ipcaif_net_setup,
116782diff --git a/net/can/af_can.c b/net/can/af_can.c
116783index 62c635f..0b59618 100644
116784--- a/net/can/af_can.c
116785+++ b/net/can/af_can.c
116786@@ -890,7 +890,7 @@ static const struct net_proto_family can_family_ops = {
116787 };
116788
116789 /* notifier block for netdevice event */
116790-static struct notifier_block can_netdev_notifier __read_mostly = {
116791+static struct notifier_block can_netdev_notifier = {
116792 .notifier_call = can_notifier,
116793 };
116794
116795diff --git a/net/can/bcm.c b/net/can/bcm.c
116796index a1ba687..aafaec5 100644
116797--- a/net/can/bcm.c
116798+++ b/net/can/bcm.c
116799@@ -1620,7 +1620,7 @@ static int __init bcm_module_init(void)
116800 }
116801
116802 /* create /proc/net/can-bcm directory */
116803- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
116804+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
116805 return 0;
116806 }
116807
116808diff --git a/net/can/gw.c b/net/can/gw.c
116809index a6f448e..5902171 100644
116810--- a/net/can/gw.c
116811+++ b/net/can/gw.c
116812@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
116813 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
116814
116815 static HLIST_HEAD(cgw_list);
116816-static struct notifier_block notifier;
116817
116818 static struct kmem_cache *cgw_cache __read_mostly;
116819
116820@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
116821 return err;
116822 }
116823
116824+static struct notifier_block notifier = {
116825+ .notifier_call = cgw_notifier
116826+};
116827+
116828 static __init int cgw_module_init(void)
116829 {
116830 /* sanitize given module parameter */
116831@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
116832 return -ENOMEM;
116833
116834 /* set notifier */
116835- notifier.notifier_call = cgw_notifier;
116836 register_netdevice_notifier(&notifier);
116837
116838 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
116839diff --git a/net/can/proc.c b/net/can/proc.c
116840index 1a19b98..df2b4ec 100644
116841--- a/net/can/proc.c
116842+++ b/net/can/proc.c
116843@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
116844 void can_init_proc(void)
116845 {
116846 /* create /proc/net/can directory */
116847- can_dir = proc_mkdir("can", init_net.proc_net);
116848+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
116849
116850 if (!can_dir) {
116851 printk(KERN_INFO "can: failed to create /proc/net/can . "
116852diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
116853index 967080a..5e75f04 100644
116854--- a/net/ceph/messenger.c
116855+++ b/net/ceph/messenger.c
116856@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
116857 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
116858
116859 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
116860-static atomic_t addr_str_seq = ATOMIC_INIT(0);
116861+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
116862
116863 static struct page *zero_page; /* used in certain error cases */
116864
116865@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
116866 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
116867 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
116868
116869- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
116870+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
116871 s = addr_str[i];
116872
116873 switch (ss->ss_family) {
116874diff --git a/net/compat.c b/net/compat.c
116875index 5cfd26a..7e43828 100644
116876--- a/net/compat.c
116877+++ b/net/compat.c
116878@@ -98,20 +98,20 @@ int get_compat_msghdr(struct msghdr *kmsg,
116879
116880 #define CMSG_COMPAT_FIRSTHDR(msg) \
116881 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
116882- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
116883+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
116884 (struct compat_cmsghdr __user *)NULL)
116885
116886 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
116887 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
116888 (ucmlen) <= (unsigned long) \
116889 ((mhdr)->msg_controllen - \
116890- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
116891+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
116892
116893 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
116894 struct compat_cmsghdr __user *cmsg, int cmsg_len)
116895 {
116896 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
116897- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
116898+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
116899 msg->msg_controllen)
116900 return NULL;
116901 return (struct compat_cmsghdr __user *)ptr;
116902@@ -201,7 +201,7 @@ Efault:
116903
116904 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
116905 {
116906- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
116907+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
116908 struct compat_cmsghdr cmhdr;
116909 struct compat_timeval ctv;
116910 struct compat_timespec cts[3];
116911@@ -257,7 +257,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
116912
116913 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
116914 {
116915- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
116916+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
116917 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
116918 int fdnum = scm->fp->count;
116919 struct file **fp = scm->fp->fp;
116920@@ -345,7 +345,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
116921 return -EFAULT;
116922 old_fs = get_fs();
116923 set_fs(KERNEL_DS);
116924- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
116925+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
116926 set_fs(old_fs);
116927
116928 return err;
116929@@ -406,7 +406,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
116930 len = sizeof(ktime);
116931 old_fs = get_fs();
116932 set_fs(KERNEL_DS);
116933- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
116934+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
116935 set_fs(old_fs);
116936
116937 if (!err) {
116938@@ -549,7 +549,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116939 case MCAST_JOIN_GROUP:
116940 case MCAST_LEAVE_GROUP:
116941 {
116942- struct compat_group_req __user *gr32 = (void *)optval;
116943+ struct compat_group_req __user *gr32 = (void __user *)optval;
116944 struct group_req __user *kgr =
116945 compat_alloc_user_space(sizeof(struct group_req));
116946 u32 interface;
116947@@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116948 case MCAST_BLOCK_SOURCE:
116949 case MCAST_UNBLOCK_SOURCE:
116950 {
116951- struct compat_group_source_req __user *gsr32 = (void *)optval;
116952+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
116953 struct group_source_req __user *kgsr = compat_alloc_user_space(
116954 sizeof(struct group_source_req));
116955 u32 interface;
116956@@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
116957 }
116958 case MCAST_MSFILTER:
116959 {
116960- struct compat_group_filter __user *gf32 = (void *)optval;
116961+ struct compat_group_filter __user *gf32 = (void __user *)optval;
116962 struct group_filter __user *kgf;
116963 u32 interface, fmode, numsrc;
116964
116965@@ -629,7 +629,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
116966 char __user *optval, int __user *optlen,
116967 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
116968 {
116969- struct compat_group_filter __user *gf32 = (void *)optval;
116970+ struct compat_group_filter __user *gf32 = (void __user *)optval;
116971 struct group_filter __user *kgf;
116972 int __user *koptlen;
116973 u32 interface, fmode, numsrc;
116974@@ -773,7 +773,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
116975
116976 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
116977 return -EINVAL;
116978- if (copy_from_user(a, args, nas[call]))
116979+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
116980 return -EFAULT;
116981 a0 = a[0];
116982 a1 = a[1];
116983diff --git a/net/core/datagram.c b/net/core/datagram.c
116984index b80fb91..0364f4f 100644
116985--- a/net/core/datagram.c
116986+++ b/net/core/datagram.c
116987@@ -131,6 +131,35 @@ out_noerr:
116988 goto out;
116989 }
116990
116991+static struct sk_buff *skb_set_peeked(struct sk_buff *skb)
116992+{
116993+ struct sk_buff *nskb;
116994+
116995+ if (skb->peeked)
116996+ return skb;
116997+
116998+ /* We have to unshare an skb before modifying it. */
116999+ if (!skb_shared(skb))
117000+ goto done;
117001+
117002+ nskb = skb_clone(skb, GFP_ATOMIC);
117003+ if (!nskb)
117004+ return ERR_PTR(-ENOMEM);
117005+
117006+ skb->prev->next = nskb;
117007+ skb->next->prev = nskb;
117008+ nskb->prev = skb->prev;
117009+ nskb->next = skb->next;
117010+
117011+ consume_skb(skb);
117012+ skb = nskb;
117013+
117014+done:
117015+ skb->peeked = 1;
117016+
117017+ return skb;
117018+}
117019+
117020 /**
117021 * __skb_recv_datagram - Receive a datagram skbuff
117022 * @sk: socket
117023@@ -165,7 +194,9 @@ out_noerr:
117024 struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
117025 int *peeked, int *off, int *err)
117026 {
117027+ struct sk_buff_head *queue = &sk->sk_receive_queue;
117028 struct sk_buff *skb, *last;
117029+ unsigned long cpu_flags;
117030 long timeo;
117031 /*
117032 * Caller is allowed not to check sk->sk_err before skb_recv_datagram()
117033@@ -184,8 +215,6 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
117034 * Look at current nfs client by the way...
117035 * However, this function was correct in any case. 8)
117036 */
117037- unsigned long cpu_flags;
117038- struct sk_buff_head *queue = &sk->sk_receive_queue;
117039 int _off = *off;
117040
117041 last = (struct sk_buff *)queue;
117042@@ -199,7 +228,12 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
117043 _off -= skb->len;
117044 continue;
117045 }
117046- skb->peeked = 1;
117047+
117048+ skb = skb_set_peeked(skb);
117049+ error = PTR_ERR(skb);
117050+ if (IS_ERR(skb))
117051+ goto unlock_err;
117052+
117053 atomic_inc(&skb->users);
117054 } else
117055 __skb_unlink(skb, queue);
117056@@ -223,6 +257,8 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
117057
117058 return NULL;
117059
117060+unlock_err:
117061+ spin_unlock_irqrestore(&queue->lock, cpu_flags);
117062 no_packet:
117063 *err = error;
117064 return NULL;
117065@@ -302,7 +338,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
117066 }
117067
117068 kfree_skb(skb);
117069- atomic_inc(&sk->sk_drops);
117070+ atomic_inc_unchecked(&sk->sk_drops);
117071 sk_mem_reclaim_partial(sk);
117072
117073 return err;
117074@@ -622,7 +658,8 @@ __sum16 __skb_checksum_complete_head(struct sk_buff *skb, int len)
117075 !skb->csum_complete_sw)
117076 netdev_rx_csum_fault(skb->dev);
117077 }
117078- skb->csum_valid = !sum;
117079+ if (!skb_shared(skb))
117080+ skb->csum_valid = !sum;
117081 return sum;
117082 }
117083 EXPORT_SYMBOL(__skb_checksum_complete_head);
117084@@ -642,11 +679,13 @@ __sum16 __skb_checksum_complete(struct sk_buff *skb)
117085 netdev_rx_csum_fault(skb->dev);
117086 }
117087
117088- /* Save full packet checksum */
117089- skb->csum = csum;
117090- skb->ip_summed = CHECKSUM_COMPLETE;
117091- skb->csum_complete_sw = 1;
117092- skb->csum_valid = !sum;
117093+ if (!skb_shared(skb)) {
117094+ /* Save full packet checksum */
117095+ skb->csum = csum;
117096+ skb->ip_summed = CHECKSUM_COMPLETE;
117097+ skb->csum_complete_sw = 1;
117098+ skb->csum_valid = !sum;
117099+ }
117100
117101 return sum;
117102 }
117103diff --git a/net/core/dev.c b/net/core/dev.c
117104index aa82f9a..f28b00e 100644
117105--- a/net/core/dev.c
117106+++ b/net/core/dev.c
117107@@ -1720,7 +1720,7 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
117108 {
117109 if (skb_orphan_frags(skb, GFP_ATOMIC) ||
117110 unlikely(!is_skb_forwardable(dev, skb))) {
117111- atomic_long_inc(&dev->rx_dropped);
117112+ atomic_long_inc_unchecked(&dev->rx_dropped);
117113 kfree_skb(skb);
117114 return NET_RX_DROP;
117115 }
117116@@ -3018,7 +3018,7 @@ recursion_alert:
117117 drop:
117118 rcu_read_unlock_bh();
117119
117120- atomic_long_inc(&dev->tx_dropped);
117121+ atomic_long_inc_unchecked(&dev->tx_dropped);
117122 kfree_skb_list(skb);
117123 return rc;
117124 out:
117125@@ -3367,7 +3367,7 @@ enqueue:
117126
117127 local_irq_restore(flags);
117128
117129- atomic_long_inc(&skb->dev->rx_dropped);
117130+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
117131 kfree_skb(skb);
117132 return NET_RX_DROP;
117133 }
117134@@ -3444,7 +3444,7 @@ int netif_rx_ni(struct sk_buff *skb)
117135 }
117136 EXPORT_SYMBOL(netif_rx_ni);
117137
117138-static void net_tx_action(struct softirq_action *h)
117139+static __latent_entropy void net_tx_action(void)
117140 {
117141 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
117142
117143@@ -3783,7 +3783,7 @@ ncls:
117144 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
117145 } else {
117146 drop:
117147- atomic_long_inc(&skb->dev->rx_dropped);
117148+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
117149 kfree_skb(skb);
117150 /* Jamal, now you will not able to escape explaining
117151 * me how you were going to use this. :-)
117152@@ -4672,7 +4672,7 @@ out_unlock:
117153 return work;
117154 }
117155
117156-static void net_rx_action(struct softirq_action *h)
117157+static __latent_entropy void net_rx_action(void)
117158 {
117159 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
117160 unsigned long time_limit = jiffies + 2;
117161@@ -6721,8 +6721,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
117162 } else {
117163 netdev_stats_to_stats64(storage, &dev->stats);
117164 }
117165- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
117166- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
117167+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
117168+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
117169 return storage;
117170 }
117171 EXPORT_SYMBOL(dev_get_stats);
117172diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
117173index b94b1d2..da3ed7c 100644
117174--- a/net/core/dev_ioctl.c
117175+++ b/net/core/dev_ioctl.c
117176@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
117177 no_module = !dev;
117178 if (no_module && capable(CAP_NET_ADMIN))
117179 no_module = request_module("netdev-%s", name);
117180- if (no_module && capable(CAP_SYS_MODULE))
117181+ if (no_module && capable(CAP_SYS_MODULE)) {
117182+#ifdef CONFIG_GRKERNSEC_MODHARDEN
117183+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
117184+#else
117185 request_module("%s", name);
117186+#endif
117187+ }
117188 }
117189 EXPORT_SYMBOL(dev_load);
117190
117191diff --git a/net/core/dst.c b/net/core/dst.c
117192index e956ce6..002144be 100644
117193--- a/net/core/dst.c
117194+++ b/net/core/dst.c
117195@@ -284,7 +284,9 @@ void dst_release(struct dst_entry *dst)
117196 int newrefcnt;
117197
117198 newrefcnt = atomic_dec_return(&dst->__refcnt);
117199- WARN_ON(newrefcnt < 0);
117200+ if (unlikely(newrefcnt < 0))
117201+ net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
117202+ __func__, dst, newrefcnt);
117203 if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt)
117204 call_rcu(&dst->rcu_head, dst_destroy_rcu);
117205 }
117206diff --git a/net/core/filter.c b/net/core/filter.c
117207index bf831a8..8d2c4c2 100644
117208--- a/net/core/filter.c
117209+++ b/net/core/filter.c
117210@@ -579,7 +579,11 @@ do_pass:
117211
117212 /* Unknown instruction. */
117213 default:
117214- goto err;
117215+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
117216+ fp->code, fp->jt, fp->jf, fp->k);
117217+ kfree(addrs);
117218+ BUG();
117219+ return -EINVAL;
117220 }
117221
117222 insn++;
117223@@ -623,7 +627,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
117224 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
117225 int pc, ret = 0;
117226
117227- BUILD_BUG_ON(BPF_MEMWORDS > 16);
117228+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
117229
117230 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
117231 if (!masks)
117232@@ -1038,7 +1042,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
117233 if (!fp)
117234 return -ENOMEM;
117235
117236- memcpy(fp->insns, fprog->filter, fsize);
117237+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
117238
117239 fp->len = fprog->len;
117240 /* Since unattached filters are not copied back to user
117241diff --git a/net/core/flow.c b/net/core/flow.c
117242index 1033725..340f65d 100644
117243--- a/net/core/flow.c
117244+++ b/net/core/flow.c
117245@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
117246 static int flow_entry_valid(struct flow_cache_entry *fle,
117247 struct netns_xfrm *xfrm)
117248 {
117249- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
117250+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
117251 return 0;
117252 if (fle->object && !fle->object->ops->check(fle->object))
117253 return 0;
117254@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
117255 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
117256 fcp->hash_count++;
117257 }
117258- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
117259+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
117260 flo = fle->object;
117261 if (!flo)
117262 goto ret_object;
117263@@ -263,7 +263,7 @@ nocache:
117264 }
117265 flo = resolver(net, key, family, dir, flo, ctx);
117266 if (fle) {
117267- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
117268+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
117269 if (!IS_ERR(flo))
117270 fle->object = flo;
117271 else
117272diff --git a/net/core/neighbour.c b/net/core/neighbour.c
117273index 2237c1b..c0c80ab 100644
117274--- a/net/core/neighbour.c
117275+++ b/net/core/neighbour.c
117276@@ -2818,7 +2818,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
117277 void __user *buffer, size_t *lenp, loff_t *ppos)
117278 {
117279 int size, ret;
117280- struct ctl_table tmp = *ctl;
117281+ ctl_table_no_const tmp = *ctl;
117282
117283 tmp.extra1 = &zero;
117284 tmp.extra2 = &unres_qlen_max;
117285@@ -2880,7 +2880,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
117286 void __user *buffer,
117287 size_t *lenp, loff_t *ppos)
117288 {
117289- struct ctl_table tmp = *ctl;
117290+ ctl_table_no_const tmp = *ctl;
117291 int ret;
117292
117293 tmp.extra1 = &zero;
117294diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
117295index 2bf8329..2eb1423 100644
117296--- a/net/core/net-procfs.c
117297+++ b/net/core/net-procfs.c
117298@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
117299 struct rtnl_link_stats64 temp;
117300 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
117301
117302- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117303+ if (gr_proc_is_restricted())
117304+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117305+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
117306+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
117307+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
117308+ else
117309+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
117310 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
117311 dev->name, stats->rx_bytes, stats->rx_packets,
117312 stats->rx_errors,
117313@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
117314 return 0;
117315 }
117316
117317-static const struct seq_operations dev_seq_ops = {
117318+const struct seq_operations dev_seq_ops = {
117319 .start = dev_seq_start,
117320 .next = dev_seq_next,
117321 .stop = dev_seq_stop,
117322@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
117323
117324 static int softnet_seq_open(struct inode *inode, struct file *file)
117325 {
117326- return seq_open(file, &softnet_seq_ops);
117327+ return seq_open_restrict(file, &softnet_seq_ops);
117328 }
117329
117330 static const struct file_operations softnet_seq_fops = {
117331@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
117332 else
117333 seq_printf(seq, "%04x", ntohs(pt->type));
117334
117335+#ifdef CONFIG_GRKERNSEC_HIDESYM
117336+ seq_printf(seq, " %-8s %pf\n",
117337+ pt->dev ? pt->dev->name : "", NULL);
117338+#else
117339 seq_printf(seq, " %-8s %pf\n",
117340 pt->dev ? pt->dev->name : "", pt->func);
117341+#endif
117342 }
117343
117344 return 0;
117345diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
117346index 4238d6d..e6b605c 100644
117347--- a/net/core/net-sysfs.c
117348+++ b/net/core/net-sysfs.c
117349@@ -288,7 +288,7 @@ static ssize_t carrier_changes_show(struct device *dev,
117350 {
117351 struct net_device *netdev = to_net_dev(dev);
117352 return sprintf(buf, fmt_dec,
117353- atomic_read(&netdev->carrier_changes));
117354+ atomic_read_unchecked(&netdev->carrier_changes));
117355 }
117356 static DEVICE_ATTR_RO(carrier_changes);
117357
117358diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
117359index 572af00..5acf072 100644
117360--- a/net/core/net_namespace.c
117361+++ b/net/core/net_namespace.c
117362@@ -734,7 +734,7 @@ static int __register_pernet_operations(struct list_head *list,
117363 int error;
117364 LIST_HEAD(net_exit_list);
117365
117366- list_add_tail(&ops->list, list);
117367+ pax_list_add_tail((struct list_head *)&ops->list, list);
117368 if (ops->init || (ops->id && ops->size)) {
117369 for_each_net(net) {
117370 error = ops_init(ops, net);
117371@@ -747,7 +747,7 @@ static int __register_pernet_operations(struct list_head *list,
117372
117373 out_undo:
117374 /* If I have an error cleanup all namespaces I initialized */
117375- list_del(&ops->list);
117376+ pax_list_del((struct list_head *)&ops->list);
117377 ops_exit_list(ops, &net_exit_list);
117378 ops_free_list(ops, &net_exit_list);
117379 return error;
117380@@ -758,7 +758,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
117381 struct net *net;
117382 LIST_HEAD(net_exit_list);
117383
117384- list_del(&ops->list);
117385+ pax_list_del((struct list_head *)&ops->list);
117386 for_each_net(net)
117387 list_add_tail(&net->exit_list, &net_exit_list);
117388 ops_exit_list(ops, &net_exit_list);
117389@@ -892,7 +892,7 @@ int register_pernet_device(struct pernet_operations *ops)
117390 mutex_lock(&net_mutex);
117391 error = register_pernet_operations(&pernet_list, ops);
117392 if (!error && (first_device == &pernet_list))
117393- first_device = &ops->list;
117394+ first_device = (struct list_head *)&ops->list;
117395 mutex_unlock(&net_mutex);
117396 return error;
117397 }
117398diff --git a/net/core/netpoll.c b/net/core/netpoll.c
117399index c126a87..10ad89d 100644
117400--- a/net/core/netpoll.c
117401+++ b/net/core/netpoll.c
117402@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
117403 struct udphdr *udph;
117404 struct iphdr *iph;
117405 struct ethhdr *eth;
117406- static atomic_t ip_ident;
117407+ static atomic_unchecked_t ip_ident;
117408 struct ipv6hdr *ip6h;
117409
117410 udp_len = len + sizeof(*udph);
117411@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
117412 put_unaligned(0x45, (unsigned char *)iph);
117413 iph->tos = 0;
117414 put_unaligned(htons(ip_len), &(iph->tot_len));
117415- iph->id = htons(atomic_inc_return(&ip_ident));
117416+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
117417 iph->frag_off = 0;
117418 iph->ttl = 64;
117419 iph->protocol = IPPROTO_UDP;
117420diff --git a/net/core/pktgen.c b/net/core/pktgen.c
117421index 508155b..fad080f 100644
117422--- a/net/core/pktgen.c
117423+++ b/net/core/pktgen.c
117424@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
117425 pn->net = net;
117426 INIT_LIST_HEAD(&pn->pktgen_threads);
117427 pn->pktgen_exiting = false;
117428- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
117429+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
117430 if (!pn->proc_dir) {
117431 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
117432 return -ENODEV;
117433diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
117434index 8de3682..fcb8a5e 100644
117435--- a/net/core/rtnetlink.c
117436+++ b/net/core/rtnetlink.c
117437@@ -61,7 +61,7 @@ struct rtnl_link {
117438 rtnl_doit_func doit;
117439 rtnl_dumpit_func dumpit;
117440 rtnl_calcit_func calcit;
117441-};
117442+} __no_const;
117443
117444 static DEFINE_MUTEX(rtnl_mutex);
117445
117446@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
117447 * to use the ops for creating device. So do not
117448 * fill up dellink as well. That disables rtnl_dellink.
117449 */
117450- if (ops->setup && !ops->dellink)
117451- ops->dellink = unregister_netdevice_queue;
117452+ if (ops->setup && !ops->dellink) {
117453+ pax_open_kernel();
117454+ *(void **)&ops->dellink = unregister_netdevice_queue;
117455+ pax_close_kernel();
117456+ }
117457
117458- list_add_tail(&ops->list, &link_ops);
117459+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
117460 return 0;
117461 }
117462 EXPORT_SYMBOL_GPL(__rtnl_link_register);
117463@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
117464 for_each_net(net) {
117465 __rtnl_kill_links(net, ops);
117466 }
117467- list_del(&ops->list);
117468+ pax_list_del((struct list_head *)&ops->list);
117469 }
117470 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
117471
117472@@ -1066,7 +1069,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
117473 (dev->ifalias &&
117474 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
117475 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
117476- atomic_read(&dev->carrier_changes)))
117477+ atomic_read_unchecked(&dev->carrier_changes)))
117478 goto nla_put_failure;
117479
117480 if (1) {
117481@@ -1748,10 +1751,13 @@ static int do_setlink(const struct sk_buff *skb,
117482 goto errout;
117483
117484 nla_for_each_nested(attr, tb[IFLA_VF_PORTS], rem) {
117485- if (nla_type(attr) != IFLA_VF_PORT)
117486- continue;
117487- err = nla_parse_nested(port, IFLA_PORT_MAX,
117488- attr, ifla_port_policy);
117489+ if (nla_type(attr) != IFLA_VF_PORT ||
117490+ nla_len(attr) < NLA_HDRLEN) {
117491+ err = -EINVAL;
117492+ goto errout;
117493+ }
117494+ err = nla_parse_nested(port, IFLA_PORT_MAX, attr,
117495+ ifla_port_policy);
117496 if (err < 0)
117497 goto errout;
117498 if (!port[IFLA_PORT_VF]) {
117499diff --git a/net/core/scm.c b/net/core/scm.c
117500index 3b6899b..cf36238 100644
117501--- a/net/core/scm.c
117502+++ b/net/core/scm.c
117503@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
117504 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
117505 {
117506 struct cmsghdr __user *cm
117507- = (__force struct cmsghdr __user *)msg->msg_control;
117508+ = (struct cmsghdr __force_user *)msg->msg_control;
117509 struct cmsghdr cmhdr;
117510 int cmlen = CMSG_LEN(len);
117511 int err;
117512@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
117513 err = -EFAULT;
117514 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
117515 goto out;
117516- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
117517+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
117518 goto out;
117519 cmlen = CMSG_SPACE(len);
117520 if (msg->msg_controllen < cmlen)
117521@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
117522 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
117523 {
117524 struct cmsghdr __user *cm
117525- = (__force struct cmsghdr __user*)msg->msg_control;
117526+ = (struct cmsghdr __force_user *)msg->msg_control;
117527
117528 int fdmax = 0;
117529 int fdnum = scm->fp->count;
117530@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
117531 if (fdnum < fdmax)
117532 fdmax = fdnum;
117533
117534- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
117535+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
117536 i++, cmfptr++)
117537 {
117538 struct socket *sock;
117539diff --git a/net/core/skbuff.c b/net/core/skbuff.c
117540index 41ec022..89b1df7 100644
117541--- a/net/core/skbuff.c
117542+++ b/net/core/skbuff.c
117543@@ -340,7 +340,7 @@ struct sk_buff *build_skb(void *data, unsigned int frag_size)
117544
117545 if (skb && frag_size) {
117546 skb->head_frag = 1;
117547- if (virt_to_head_page(data)->pfmemalloc)
117548+ if (page_is_pfmemalloc(virt_to_head_page(data)))
117549 skb->pfmemalloc = 1;
117550 }
117551 return skb;
117552@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
117553 __wsum skb_checksum(const struct sk_buff *skb, int offset,
117554 int len, __wsum csum)
117555 {
117556- const struct skb_checksum_ops ops = {
117557+ static const struct skb_checksum_ops ops = {
117558 .update = csum_partial_ext,
117559 .combine = csum_block_add_ext,
117560 };
117561@@ -3335,12 +3335,14 @@ void __init skb_init(void)
117562 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
117563 sizeof(struct sk_buff),
117564 0,
117565- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
117566+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
117567+ SLAB_NO_SANITIZE,
117568 NULL);
117569 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
117570 sizeof(struct sk_buff_fclones),
117571 0,
117572- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
117573+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
117574+ SLAB_NO_SANITIZE,
117575 NULL);
117576 }
117577
117578diff --git a/net/core/sock.c b/net/core/sock.c
117579index dc30dc5..8bb3ef3 100644
117580--- a/net/core/sock.c
117581+++ b/net/core/sock.c
117582@@ -440,7 +440,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
117583 struct sk_buff_head *list = &sk->sk_receive_queue;
117584
117585 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
117586- atomic_inc(&sk->sk_drops);
117587+ atomic_inc_unchecked(&sk->sk_drops);
117588 trace_sock_rcvqueue_full(sk, skb);
117589 return -ENOMEM;
117590 }
117591@@ -450,7 +450,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
117592 return err;
117593
117594 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
117595- atomic_inc(&sk->sk_drops);
117596+ atomic_inc_unchecked(&sk->sk_drops);
117597 return -ENOBUFS;
117598 }
117599
117600@@ -483,7 +483,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
117601 skb->dev = NULL;
117602
117603 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
117604- atomic_inc(&sk->sk_drops);
117605+ atomic_inc_unchecked(&sk->sk_drops);
117606 goto discard_and_relse;
117607 }
117608 if (nested)
117609@@ -501,7 +501,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
117610 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
117611 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
117612 bh_unlock_sock(sk);
117613- atomic_inc(&sk->sk_drops);
117614+ atomic_inc_unchecked(&sk->sk_drops);
117615 goto discard_and_relse;
117616 }
117617
117618@@ -907,6 +907,7 @@ set_rcvbuf:
117619 }
117620 break;
117621
117622+#ifndef GRKERNSEC_BPF_HARDEN
117623 case SO_ATTACH_BPF:
117624 ret = -EINVAL;
117625 if (optlen == sizeof(u32)) {
117626@@ -919,7 +920,7 @@ set_rcvbuf:
117627 ret = sk_attach_bpf(ufd, sk);
117628 }
117629 break;
117630-
117631+#endif
117632 case SO_DETACH_FILTER:
117633 ret = sk_detach_filter(sk);
117634 break;
117635@@ -1021,12 +1022,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117636 struct timeval tm;
117637 } v;
117638
117639- int lv = sizeof(int);
117640- int len;
117641+ unsigned int lv = sizeof(int);
117642+ unsigned int len;
117643
117644 if (get_user(len, optlen))
117645 return -EFAULT;
117646- if (len < 0)
117647+ if (len > INT_MAX)
117648 return -EINVAL;
117649
117650 memset(&v, 0, sizeof(v));
117651@@ -1164,11 +1165,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117652
117653 case SO_PEERNAME:
117654 {
117655- char address[128];
117656+ char address[_K_SS_MAXSIZE];
117657
117658 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
117659 return -ENOTCONN;
117660- if (lv < len)
117661+ if (lv < len || sizeof address < len)
117662 return -EINVAL;
117663 if (copy_to_user(optval, address, len))
117664 return -EFAULT;
117665@@ -1256,7 +1257,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
117666
117667 if (len > lv)
117668 len = lv;
117669- if (copy_to_user(optval, &v, len))
117670+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
117671 return -EFAULT;
117672 lenout:
117673 if (put_user(len, optlen))
117674@@ -2359,7 +2360,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
117675 */
117676 smp_wmb();
117677 atomic_set(&sk->sk_refcnt, 1);
117678- atomic_set(&sk->sk_drops, 0);
117679+ atomic_set_unchecked(&sk->sk_drops, 0);
117680 }
117681 EXPORT_SYMBOL(sock_init_data);
117682
117683@@ -2487,6 +2488,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
117684 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
117685 int level, int type)
117686 {
117687+ struct sock_extended_err ee;
117688 struct sock_exterr_skb *serr;
117689 struct sk_buff *skb;
117690 int copied, err;
117691@@ -2508,7 +2510,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
117692 sock_recv_timestamp(msg, sk, skb);
117693
117694 serr = SKB_EXT_ERR(skb);
117695- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
117696+ ee = serr->ee;
117697+ put_cmsg(msg, level, type, sizeof ee, &ee);
117698
117699 msg->msg_flags |= MSG_ERRQUEUE;
117700 err = copied;
117701diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
117702index 74dddf8..7f4e77e 100644
117703--- a/net/core/sock_diag.c
117704+++ b/net/core/sock_diag.c
117705@@ -9,7 +9,7 @@
117706 #include <linux/inet_diag.h>
117707 #include <linux/sock_diag.h>
117708
117709-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
117710+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
117711 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
117712 static DEFINE_MUTEX(sock_diag_table_mutex);
117713
117714@@ -127,8 +127,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
117715 mutex_lock(&sock_diag_table_mutex);
117716 if (sock_diag_handlers[hndl->family])
117717 err = -EBUSY;
117718- else
117719+ else {
117720+ pax_open_kernel();
117721 sock_diag_handlers[hndl->family] = hndl;
117722+ pax_close_kernel();
117723+ }
117724 mutex_unlock(&sock_diag_table_mutex);
117725
117726 return err;
117727@@ -144,7 +147,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
117728
117729 mutex_lock(&sock_diag_table_mutex);
117730 BUG_ON(sock_diag_handlers[family] != hnld);
117731+ pax_open_kernel();
117732 sock_diag_handlers[family] = NULL;
117733+ pax_close_kernel();
117734 mutex_unlock(&sock_diag_table_mutex);
117735 }
117736 EXPORT_SYMBOL_GPL(sock_diag_unregister);
117737diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
117738index 95b6139..3048623 100644
117739--- a/net/core/sysctl_net_core.c
117740+++ b/net/core/sysctl_net_core.c
117741@@ -35,7 +35,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
117742 {
117743 unsigned int orig_size, size;
117744 int ret, i;
117745- struct ctl_table tmp = {
117746+ ctl_table_no_const tmp = {
117747 .data = &size,
117748 .maxlen = sizeof(size),
117749 .mode = table->mode
117750@@ -203,7 +203,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
117751 void __user *buffer, size_t *lenp, loff_t *ppos)
117752 {
117753 char id[IFNAMSIZ];
117754- struct ctl_table tbl = {
117755+ ctl_table_no_const tbl = {
117756 .data = id,
117757 .maxlen = IFNAMSIZ,
117758 };
117759@@ -221,7 +221,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
117760 static int proc_do_rss_key(struct ctl_table *table, int write,
117761 void __user *buffer, size_t *lenp, loff_t *ppos)
117762 {
117763- struct ctl_table fake_table;
117764+ ctl_table_no_const fake_table;
117765 char buf[NETDEV_RSS_KEY_LEN * 3];
117766
117767 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
117768@@ -285,7 +285,7 @@ static struct ctl_table net_core_table[] = {
117769 .mode = 0444,
117770 .proc_handler = proc_do_rss_key,
117771 },
117772-#ifdef CONFIG_BPF_JIT
117773+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
117774 {
117775 .procname = "bpf_jit_enable",
117776 .data = &bpf_jit_enable,
117777@@ -409,13 +409,12 @@ static struct ctl_table netns_core_table[] = {
117778
117779 static __net_init int sysctl_core_net_init(struct net *net)
117780 {
117781- struct ctl_table *tbl;
117782+ ctl_table_no_const *tbl = NULL;
117783
117784 net->core.sysctl_somaxconn = SOMAXCONN;
117785
117786- tbl = netns_core_table;
117787 if (!net_eq(net, &init_net)) {
117788- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
117789+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
117790 if (tbl == NULL)
117791 goto err_dup;
117792
117793@@ -425,17 +424,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
117794 if (net->user_ns != &init_user_ns) {
117795 tbl[0].procname = NULL;
117796 }
117797- }
117798-
117799- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
117800+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
117801+ } else
117802+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
117803 if (net->core.sysctl_hdr == NULL)
117804 goto err_reg;
117805
117806 return 0;
117807
117808 err_reg:
117809- if (tbl != netns_core_table)
117810- kfree(tbl);
117811+ kfree(tbl);
117812 err_dup:
117813 return -ENOMEM;
117814 }
117815@@ -450,7 +448,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
117816 kfree(tbl);
117817 }
117818
117819-static __net_initdata struct pernet_operations sysctl_core_ops = {
117820+static __net_initconst struct pernet_operations sysctl_core_ops = {
117821 .init = sysctl_core_net_init,
117822 .exit = sysctl_core_net_exit,
117823 };
117824diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
117825index 754484b..4f4b894 100644
117826--- a/net/decnet/af_decnet.c
117827+++ b/net/decnet/af_decnet.c
117828@@ -466,6 +466,7 @@ static struct proto dn_proto = {
117829 .sysctl_rmem = sysctl_decnet_rmem,
117830 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
117831 .obj_size = sizeof(struct dn_sock),
117832+ .slab_flags = SLAB_USERCOPY,
117833 };
117834
117835 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
117836diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
117837index b2c26b0..41f803e 100644
117838--- a/net/decnet/dn_dev.c
117839+++ b/net/decnet/dn_dev.c
117840@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
117841 .extra1 = &min_t3,
117842 .extra2 = &max_t3
117843 },
117844- {0}
117845+ { }
117846 },
117847 };
117848
117849diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
117850index 5325b54..a0d4d69 100644
117851--- a/net/decnet/sysctl_net_decnet.c
117852+++ b/net/decnet/sysctl_net_decnet.c
117853@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
117854
117855 if (len > *lenp) len = *lenp;
117856
117857- if (copy_to_user(buffer, addr, len))
117858+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
117859 return -EFAULT;
117860
117861 *lenp = len;
117862@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
117863
117864 if (len > *lenp) len = *lenp;
117865
117866- if (copy_to_user(buffer, devname, len))
117867+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
117868 return -EFAULT;
117869
117870 *lenp = len;
117871diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
117872index 392e29a..da953a2 100644
117873--- a/net/dsa/dsa.c
117874+++ b/net/dsa/dsa.c
117875@@ -851,7 +851,7 @@ static struct packet_type dsa_pack_type __read_mostly = {
117876 .func = dsa_switch_rcv,
117877 };
117878
117879-static struct notifier_block dsa_netdevice_nb __read_mostly = {
117880+static struct notifier_block dsa_netdevice_nb = {
117881 .notifier_call = dsa_slave_netdevice_event,
117882 };
117883
117884diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
117885index a2c7e4c..3dc9f67 100644
117886--- a/net/hsr/hsr_netlink.c
117887+++ b/net/hsr/hsr_netlink.c
117888@@ -102,7 +102,7 @@ nla_put_failure:
117889 return -EMSGSIZE;
117890 }
117891
117892-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
117893+static struct rtnl_link_ops hsr_link_ops = {
117894 .kind = "hsr",
117895 .maxtype = IFLA_HSR_MAX,
117896 .policy = hsr_policy,
117897diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
117898index 0ae5822..3fe3627 100644
117899--- a/net/ieee802154/6lowpan/core.c
117900+++ b/net/ieee802154/6lowpan/core.c
117901@@ -219,7 +219,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
117902 dev_put(real_dev);
117903 }
117904
117905-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
117906+static struct rtnl_link_ops lowpan_link_ops = {
117907 .kind = "lowpan",
117908 .priv_size = sizeof(struct lowpan_dev_info),
117909 .setup = lowpan_setup,
117910diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
117911index f46e4d1..dcb7f86 100644
117912--- a/net/ieee802154/6lowpan/reassembly.c
117913+++ b/net/ieee802154/6lowpan/reassembly.c
117914@@ -207,7 +207,7 @@ found:
117915 } else {
117916 fq->q.meat += skb->len;
117917 }
117918- add_frag_mem_limit(&fq->q, skb->truesize);
117919+ add_frag_mem_limit(fq->q.net, skb->truesize);
117920
117921 if (fq->q.flags == (INET_FRAG_FIRST_IN | INET_FRAG_LAST_IN) &&
117922 fq->q.meat == fq->q.len) {
117923@@ -287,7 +287,7 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *prev,
117924 clone->data_len = clone->len;
117925 head->data_len -= clone->len;
117926 head->len -= clone->len;
117927- add_frag_mem_limit(&fq->q, clone->truesize);
117928+ add_frag_mem_limit(fq->q.net, clone->truesize);
117929 }
117930
117931 WARN_ON(head == NULL);
117932@@ -310,7 +310,7 @@ static int lowpan_frag_reasm(struct lowpan_frag_queue *fq, struct sk_buff *prev,
117933 }
117934 fp = next;
117935 }
117936- sub_frag_mem_limit(&fq->q, sum_truesize);
117937+ sub_frag_mem_limit(fq->q.net, sum_truesize);
117938
117939 head->next = NULL;
117940 head->dev = dev;
117941@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
117942
117943 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117944 {
117945- struct ctl_table *table;
117946+ ctl_table_no_const *table = NULL;
117947 struct ctl_table_header *hdr;
117948 struct netns_ieee802154_lowpan *ieee802154_lowpan =
117949 net_ieee802154_lowpan(net);
117950
117951- table = lowpan_frags_ns_ctl_table;
117952 if (!net_eq(net, &init_net)) {
117953- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
117954+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
117955 GFP_KERNEL);
117956 if (table == NULL)
117957 goto err_alloc;
117958@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117959 /* Don't export sysctls to unprivileged users */
117960 if (net->user_ns != &init_user_ns)
117961 table[0].procname = NULL;
117962- }
117963-
117964- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
117965+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
117966+ } else
117967+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
117968 if (hdr == NULL)
117969 goto err_reg;
117970
117971@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
117972 return 0;
117973
117974 err_reg:
117975- if (!net_eq(net, &init_net))
117976- kfree(table);
117977+ kfree(table);
117978 err_alloc:
117979 return -ENOMEM;
117980 }
117981diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
117982index a5aa54e..3bd5f9f 100644
117983--- a/net/ipv4/af_inet.c
117984+++ b/net/ipv4/af_inet.c
117985@@ -1391,7 +1391,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
117986 return ip_recv_error(sk, msg, len, addr_len);
117987 #if IS_ENABLED(CONFIG_IPV6)
117988 if (sk->sk_family == AF_INET6)
117989- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
117990+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
117991 #endif
117992 return -EINVAL;
117993 }
117994diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
117995index 419d23c..2084616 100644
117996--- a/net/ipv4/devinet.c
117997+++ b/net/ipv4/devinet.c
117998@@ -69,7 +69,8 @@
117999
118000 static struct ipv4_devconf ipv4_devconf = {
118001 .data = {
118002- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
118003+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
118004+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
118005 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
118006 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
118007 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
118008@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
118009
118010 static struct ipv4_devconf ipv4_devconf_dflt = {
118011 .data = {
118012- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
118013+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
118014+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
118015 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
118016 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
118017 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
118018@@ -1580,7 +1582,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
118019 idx = 0;
118020 head = &net->dev_index_head[h];
118021 rcu_read_lock();
118022- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
118023+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
118024 net->dev_base_seq;
118025 hlist_for_each_entry_rcu(dev, head, index_hlist) {
118026 if (idx < s_idx)
118027@@ -1899,7 +1901,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
118028 idx = 0;
118029 head = &net->dev_index_head[h];
118030 rcu_read_lock();
118031- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
118032+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
118033 net->dev_base_seq;
118034 hlist_for_each_entry_rcu(dev, head, index_hlist) {
118035 if (idx < s_idx)
118036@@ -2134,7 +2136,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
118037 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
118038 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
118039
118040-static struct devinet_sysctl_table {
118041+static const struct devinet_sysctl_table {
118042 struct ctl_table_header *sysctl_header;
118043 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
118044 } devinet_sysctl = {
118045@@ -2266,7 +2268,7 @@ static __net_init int devinet_init_net(struct net *net)
118046 int err;
118047 struct ipv4_devconf *all, *dflt;
118048 #ifdef CONFIG_SYSCTL
118049- struct ctl_table *tbl = ctl_forward_entry;
118050+ ctl_table_no_const *tbl = NULL;
118051 struct ctl_table_header *forw_hdr;
118052 #endif
118053
118054@@ -2284,7 +2286,7 @@ static __net_init int devinet_init_net(struct net *net)
118055 goto err_alloc_dflt;
118056
118057 #ifdef CONFIG_SYSCTL
118058- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
118059+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
118060 if (!tbl)
118061 goto err_alloc_ctl;
118062
118063@@ -2304,7 +2306,10 @@ static __net_init int devinet_init_net(struct net *net)
118064 goto err_reg_dflt;
118065
118066 err = -ENOMEM;
118067- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
118068+ if (!net_eq(net, &init_net))
118069+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
118070+ else
118071+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
118072 if (!forw_hdr)
118073 goto err_reg_ctl;
118074 net->ipv4.forw_hdr = forw_hdr;
118075@@ -2320,8 +2325,7 @@ err_reg_ctl:
118076 err_reg_dflt:
118077 __devinet_sysctl_unregister(all);
118078 err_reg_all:
118079- if (tbl != ctl_forward_entry)
118080- kfree(tbl);
118081+ kfree(tbl);
118082 err_alloc_ctl:
118083 #endif
118084 if (dflt != &ipv4_devconf_dflt)
118085diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
118086index 872494e..8e0b4d1 100644
118087--- a/net/ipv4/fib_frontend.c
118088+++ b/net/ipv4/fib_frontend.c
118089@@ -1083,12 +1083,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
118090 #ifdef CONFIG_IP_ROUTE_MULTIPATH
118091 fib_sync_up(dev);
118092 #endif
118093- atomic_inc(&net->ipv4.dev_addr_genid);
118094+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
118095 rt_cache_flush(dev_net(dev));
118096 break;
118097 case NETDEV_DOWN:
118098 fib_del_ifaddr(ifa, NULL);
118099- atomic_inc(&net->ipv4.dev_addr_genid);
118100+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
118101 if (!ifa->ifa_dev->ifa_list) {
118102 /* Last address was deleted from this interface.
118103 * Disable IP.
118104@@ -1126,7 +1126,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
118105 #ifdef CONFIG_IP_ROUTE_MULTIPATH
118106 fib_sync_up(dev);
118107 #endif
118108- atomic_inc(&net->ipv4.dev_addr_genid);
118109+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
118110 rt_cache_flush(net);
118111 break;
118112 case NETDEV_DOWN:
118113diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
118114index 8d695b6..752d427a 100644
118115--- a/net/ipv4/fib_semantics.c
118116+++ b/net/ipv4/fib_semantics.c
118117@@ -752,7 +752,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
118118 nh->nh_saddr = inet_select_addr(nh->nh_dev,
118119 nh->nh_gw,
118120 nh->nh_parent->fib_scope);
118121- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
118122+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
118123
118124 return nh->nh_saddr;
118125 }
118126diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
118127index 09b62e1..2871350 100644
118128--- a/net/ipv4/fib_trie.c
118129+++ b/net/ipv4/fib_trie.c
118130@@ -2457,7 +2457,7 @@ static struct key_vector *fib_route_get_idx(struct fib_route_iter *iter,
118131 key = l->key + 1;
118132 iter->pos++;
118133
118134- if (pos-- <= 0)
118135+ if (--pos <= 0)
118136 break;
118137
118138 l = NULL;
118139diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
118140index 5e346a0..d0a7c03 100644
118141--- a/net/ipv4/inet_fragment.c
118142+++ b/net/ipv4/inet_fragment.c
118143@@ -131,34 +131,22 @@ inet_evict_bucket(struct inet_frags *f, struct inet_frag_bucket *hb)
118144 unsigned int evicted = 0;
118145 HLIST_HEAD(expired);
118146
118147-evict_again:
118148 spin_lock(&hb->chain_lock);
118149
118150 hlist_for_each_entry_safe(fq, n, &hb->chain, list) {
118151 if (!inet_fragq_should_evict(fq))
118152 continue;
118153
118154- if (!del_timer(&fq->timer)) {
118155- /* q expiring right now thus increment its refcount so
118156- * it won't be freed under us and wait until the timer
118157- * has finished executing then destroy it
118158- */
118159- atomic_inc(&fq->refcnt);
118160- spin_unlock(&hb->chain_lock);
118161- del_timer_sync(&fq->timer);
118162- inet_frag_put(fq, f);
118163- goto evict_again;
118164- }
118165+ if (!del_timer(&fq->timer))
118166+ continue;
118167
118168- fq->flags |= INET_FRAG_EVICTED;
118169- hlist_del(&fq->list);
118170- hlist_add_head(&fq->list, &expired);
118171+ hlist_add_head(&fq->list_evictor, &expired);
118172 ++evicted;
118173 }
118174
118175 spin_unlock(&hb->chain_lock);
118176
118177- hlist_for_each_entry_safe(fq, n, &expired, list)
118178+ hlist_for_each_entry_safe(fq, n, &expired, list_evictor)
118179 f->frag_expire((unsigned long) fq);
118180
118181 return evicted;
118182@@ -240,19 +228,21 @@ void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f)
118183 int i;
118184
118185 nf->low_thresh = 0;
118186- local_bh_disable();
118187
118188 evict_again:
118189+ local_bh_disable();
118190 seq = read_seqbegin(&f->rnd_seqlock);
118191
118192 for (i = 0; i < INETFRAGS_HASHSZ ; i++)
118193 inet_evict_bucket(f, &f->hash[i]);
118194
118195- if (read_seqretry(&f->rnd_seqlock, seq))
118196+ local_bh_enable();
118197+ cond_resched();
118198+
118199+ if (read_seqretry(&f->rnd_seqlock, seq) ||
118200+ percpu_counter_sum(&nf->mem))
118201 goto evict_again;
118202
118203- local_bh_enable();
118204-
118205 percpu_counter_destroy(&nf->mem);
118206 }
118207 EXPORT_SYMBOL(inet_frags_exit_net);
118208@@ -284,8 +274,8 @@ static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f)
118209 struct inet_frag_bucket *hb;
118210
118211 hb = get_frag_bucket_locked(fq, f);
118212- if (!(fq->flags & INET_FRAG_EVICTED))
118213- hlist_del(&fq->list);
118214+ hlist_del(&fq->list);
118215+ fq->flags |= INET_FRAG_COMPLETE;
118216 spin_unlock(&hb->chain_lock);
118217 }
118218
118219@@ -297,7 +287,6 @@ void inet_frag_kill(struct inet_frag_queue *fq, struct inet_frags *f)
118220 if (!(fq->flags & INET_FRAG_COMPLETE)) {
118221 fq_unlink(fq, f);
118222 atomic_dec(&fq->refcnt);
118223- fq->flags |= INET_FRAG_COMPLETE;
118224 }
118225 }
118226 EXPORT_SYMBOL(inet_frag_kill);
118227@@ -330,11 +319,12 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f)
118228 fp = xp;
118229 }
118230 sum = sum_truesize + f->qsize;
118231- sub_frag_mem_limit(q, sum);
118232
118233 if (f->destructor)
118234 f->destructor(q);
118235 kmem_cache_free(f->frags_cachep, q);
118236+
118237+ sub_frag_mem_limit(nf, sum);
118238 }
118239 EXPORT_SYMBOL(inet_frag_destroy);
118240
118241@@ -390,7 +380,7 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf,
118242
118243 q->net = nf;
118244 f->constructor(q, arg);
118245- add_frag_mem_limit(q, f->qsize);
118246+ add_frag_mem_limit(nf, f->qsize);
118247
118248 setup_timer(&q->timer, f->frag_expire, (unsigned long)q);
118249 spin_lock_init(&q->lock);
118250diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
118251index c6fb80b..8705495 100644
118252--- a/net/ipv4/inet_hashtables.c
118253+++ b/net/ipv4/inet_hashtables.c
118254@@ -18,6 +18,7 @@
118255 #include <linux/sched.h>
118256 #include <linux/slab.h>
118257 #include <linux/wait.h>
118258+#include <linux/security.h>
118259
118260 #include <net/inet_connection_sock.h>
118261 #include <net/inet_hashtables.h>
118262@@ -53,6 +54,8 @@ u32 sk_ehashfn(const struct sock *sk)
118263 sk->sk_daddr, sk->sk_dport);
118264 }
118265
118266+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
118267+
118268 /*
118269 * Allocate and initialize a new local port bind bucket.
118270 * The bindhash mutex for snum's hash chain must be held here.
118271@@ -564,6 +567,8 @@ ok:
118272 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
118273 spin_unlock(&head->lock);
118274
118275+ gr_update_task_in_ip_table(inet_sk(sk));
118276+
118277 if (tw) {
118278 inet_twsk_deschedule(tw);
118279 while (twrefcnt) {
118280diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
118281index 241afd7..31b95d5 100644
118282--- a/net/ipv4/inetpeer.c
118283+++ b/net/ipv4/inetpeer.c
118284@@ -461,7 +461,7 @@ relookup:
118285 if (p) {
118286 p->daddr = *daddr;
118287 atomic_set(&p->refcnt, 1);
118288- atomic_set(&p->rid, 0);
118289+ atomic_set_unchecked(&p->rid, 0);
118290 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
118291 p->rate_tokens = 0;
118292 /* 60*HZ is arbitrary, but chosen enough high so that the first
118293diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
118294index cc1da6d..593fc73 100644
118295--- a/net/ipv4/ip_fragment.c
118296+++ b/net/ipv4/ip_fragment.c
118297@@ -192,7 +192,7 @@ static void ip_expire(unsigned long arg)
118298 ipq_kill(qp);
118299 IP_INC_STATS_BH(net, IPSTATS_MIB_REASMFAILS);
118300
118301- if (!(qp->q.flags & INET_FRAG_EVICTED)) {
118302+ if (!inet_frag_evicting(&qp->q)) {
118303 struct sk_buff *head = qp->q.fragments;
118304 const struct iphdr *iph;
118305 int err;
118306@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
118307 return 0;
118308
118309 start = qp->rid;
118310- end = atomic_inc_return(&peer->rid);
118311+ end = atomic_inc_return_unchecked(&peer->rid);
118312 qp->rid = end;
118313
118314 rc = qp->q.fragments && (end - start) > max;
118315@@ -301,7 +301,7 @@ static int ip_frag_reinit(struct ipq *qp)
118316 kfree_skb(fp);
118317 fp = xp;
118318 } while (fp);
118319- sub_frag_mem_limit(&qp->q, sum_truesize);
118320+ sub_frag_mem_limit(qp->q.net, sum_truesize);
118321
118322 qp->q.flags = 0;
118323 qp->q.len = 0;
118324@@ -446,7 +446,7 @@ found:
118325 qp->q.fragments = next;
118326
118327 qp->q.meat -= free_it->len;
118328- sub_frag_mem_limit(&qp->q, free_it->truesize);
118329+ sub_frag_mem_limit(qp->q.net, free_it->truesize);
118330 kfree_skb(free_it);
118331 }
118332 }
118333@@ -470,7 +470,7 @@ found:
118334 qp->q.stamp = skb->tstamp;
118335 qp->q.meat += skb->len;
118336 qp->ecn |= ecn;
118337- add_frag_mem_limit(&qp->q, skb->truesize);
118338+ add_frag_mem_limit(qp->q.net, skb->truesize);
118339 if (offset == 0)
118340 qp->q.flags |= INET_FRAG_FIRST_IN;
118341
118342@@ -573,7 +573,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
118343 head->len -= clone->len;
118344 clone->csum = 0;
118345 clone->ip_summed = head->ip_summed;
118346- add_frag_mem_limit(&qp->q, clone->truesize);
118347+ add_frag_mem_limit(qp->q.net, clone->truesize);
118348 }
118349
118350 skb_push(head, head->data - skb_network_header(head));
118351@@ -601,7 +601,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
118352 }
118353 fp = next;
118354 }
118355- sub_frag_mem_limit(&qp->q, sum_truesize);
118356+ sub_frag_mem_limit(qp->q.net, sum_truesize);
118357
118358 head->next = NULL;
118359 head->dev = dev;
118360@@ -750,12 +750,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
118361
118362 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118363 {
118364- struct ctl_table *table;
118365+ ctl_table_no_const *table = NULL;
118366 struct ctl_table_header *hdr;
118367
118368- table = ip4_frags_ns_ctl_table;
118369 if (!net_eq(net, &init_net)) {
118370- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
118371+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
118372 if (!table)
118373 goto err_alloc;
118374
118375@@ -769,9 +768,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118376 /* Don't export sysctls to unprivileged users */
118377 if (net->user_ns != &init_user_ns)
118378 table[0].procname = NULL;
118379- }
118380+ hdr = register_net_sysctl(net, "net/ipv4", table);
118381+ } else
118382+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
118383
118384- hdr = register_net_sysctl(net, "net/ipv4", table);
118385 if (!hdr)
118386 goto err_reg;
118387
118388@@ -779,8 +779,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
118389 return 0;
118390
118391 err_reg:
118392- if (!net_eq(net, &init_net))
118393- kfree(table);
118394+ kfree(table);
118395 err_alloc:
118396 return -ENOMEM;
118397 }
118398diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
118399index 5fd7064..d13d75f 100644
118400--- a/net/ipv4/ip_gre.c
118401+++ b/net/ipv4/ip_gre.c
118402@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
118403 module_param(log_ecn_error, bool, 0644);
118404 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
118405
118406-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
118407+static struct rtnl_link_ops ipgre_link_ops;
118408 static int ipgre_tunnel_init(struct net_device *dev);
118409
118410 static int ipgre_net_id __read_mostly;
118411@@ -819,7 +819,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
118412 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
118413 };
118414
118415-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
118416+static struct rtnl_link_ops ipgre_link_ops = {
118417 .kind = "gre",
118418 .maxtype = IFLA_GRE_MAX,
118419 .policy = ipgre_policy,
118420@@ -834,7 +834,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
118421 .get_link_net = ip_tunnel_get_link_net,
118422 };
118423
118424-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
118425+static struct rtnl_link_ops ipgre_tap_ops = {
118426 .kind = "gretap",
118427 .maxtype = IFLA_GRE_MAX,
118428 .policy = ipgre_policy,
118429diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
118430index 2db4c87..4db9282 100644
118431--- a/net/ipv4/ip_input.c
118432+++ b/net/ipv4/ip_input.c
118433@@ -147,6 +147,10 @@
118434 #include <linux/mroute.h>
118435 #include <linux/netlink.h>
118436
118437+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118438+extern int grsec_enable_blackhole;
118439+#endif
118440+
118441 /*
118442 * Process Router Attention IP option (RFC 2113)
118443 */
118444@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sock *sk, struct sk_buff *skb)
118445 if (!raw) {
118446 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
118447 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
118448+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
118449+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
118450+#endif
118451 icmp_send(skb, ICMP_DEST_UNREACH,
118452 ICMP_PROT_UNREACH, 0);
118453 }
118454diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
118455index 6ddde89..653e224 100644
118456--- a/net/ipv4/ip_sockglue.c
118457+++ b/net/ipv4/ip_sockglue.c
118458@@ -1291,7 +1291,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
118459 len = min_t(unsigned int, len, opt->optlen);
118460 if (put_user(len, optlen))
118461 return -EFAULT;
118462- if (copy_to_user(optval, opt->__data, len))
118463+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
118464+ copy_to_user(optval, opt->__data, len))
118465 return -EFAULT;
118466 return 0;
118467 }
118468@@ -1425,7 +1426,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
118469 if (sk->sk_type != SOCK_STREAM)
118470 return -ENOPROTOOPT;
118471
118472- msg.msg_control = (__force void *) optval;
118473+ msg.msg_control = (__force_kernel void *) optval;
118474 msg.msg_controllen = len;
118475 msg.msg_flags = flags;
118476
118477diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
118478index 0c15208..a3a76c5 100644
118479--- a/net/ipv4/ip_vti.c
118480+++ b/net/ipv4/ip_vti.c
118481@@ -45,7 +45,7 @@
118482 #include <net/net_namespace.h>
118483 #include <net/netns/generic.h>
118484
118485-static struct rtnl_link_ops vti_link_ops __read_mostly;
118486+static struct rtnl_link_ops vti_link_ops;
118487
118488 static int vti_net_id __read_mostly;
118489 static int vti_tunnel_init(struct net_device *dev);
118490@@ -525,7 +525,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
118491 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
118492 };
118493
118494-static struct rtnl_link_ops vti_link_ops __read_mostly = {
118495+static struct rtnl_link_ops vti_link_ops = {
118496 .kind = "vti",
118497 .maxtype = IFLA_VTI_MAX,
118498 .policy = vti_policy,
118499diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
118500index 8e7328c..9bd7ed3 100644
118501--- a/net/ipv4/ipconfig.c
118502+++ b/net/ipv4/ipconfig.c
118503@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
118504
118505 mm_segment_t oldfs = get_fs();
118506 set_fs(get_ds());
118507- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
118508+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
118509 set_fs(oldfs);
118510 return res;
118511 }
118512@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
118513
118514 mm_segment_t oldfs = get_fs();
118515 set_fs(get_ds());
118516- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
118517+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
118518 set_fs(oldfs);
118519 return res;
118520 }
118521@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
118522
118523 mm_segment_t oldfs = get_fs();
118524 set_fs(get_ds());
118525- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
118526+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
118527 set_fs(oldfs);
118528 return res;
118529 }
118530diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
118531index ff96396..2e928ba 100644
118532--- a/net/ipv4/ipip.c
118533+++ b/net/ipv4/ipip.c
118534@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
118535 static int ipip_net_id __read_mostly;
118536
118537 static int ipip_tunnel_init(struct net_device *dev);
118538-static struct rtnl_link_ops ipip_link_ops __read_mostly;
118539+static struct rtnl_link_ops ipip_link_ops;
118540
118541 static int ipip_err(struct sk_buff *skb, u32 info)
118542 {
118543@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
118544 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
118545 };
118546
118547-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
118548+static struct rtnl_link_ops ipip_link_ops = {
118549 .kind = "ipip",
118550 .maxtype = IFLA_IPTUN_MAX,
118551 .policy = ipip_policy,
118552diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
118553index a612007..99ac4bc5 100644
118554--- a/net/ipv4/netfilter/arp_tables.c
118555+++ b/net/ipv4/netfilter/arp_tables.c
118556@@ -884,14 +884,14 @@ static int compat_table_info(const struct xt_table_info *info,
118557 #endif
118558
118559 static int get_info(struct net *net, void __user *user,
118560- const int *len, int compat)
118561+ int len, int compat)
118562 {
118563 char name[XT_TABLE_MAXNAMELEN];
118564 struct xt_table *t;
118565 int ret;
118566
118567- if (*len != sizeof(struct arpt_getinfo)) {
118568- duprintf("length %u != %Zu\n", *len,
118569+ if (len != sizeof(struct arpt_getinfo)) {
118570+ duprintf("length %u != %Zu\n", len,
118571 sizeof(struct arpt_getinfo));
118572 return -EINVAL;
118573 }
118574@@ -928,7 +928,7 @@ static int get_info(struct net *net, void __user *user,
118575 info.size = private->size;
118576 strcpy(info.name, name);
118577
118578- if (copy_to_user(user, &info, *len) != 0)
118579+ if (copy_to_user(user, &info, len) != 0)
118580 ret = -EFAULT;
118581 else
118582 ret = 0;
118583@@ -1695,7 +1695,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
118584
118585 switch (cmd) {
118586 case ARPT_SO_GET_INFO:
118587- ret = get_info(sock_net(sk), user, len, 1);
118588+ ret = get_info(sock_net(sk), user, *len, 1);
118589 break;
118590 case ARPT_SO_GET_ENTRIES:
118591 ret = compat_get_entries(sock_net(sk), user, len);
118592@@ -1740,7 +1740,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
118593
118594 switch (cmd) {
118595 case ARPT_SO_GET_INFO:
118596- ret = get_info(sock_net(sk), user, len, 0);
118597+ ret = get_info(sock_net(sk), user, *len, 0);
118598 break;
118599
118600 case ARPT_SO_GET_ENTRIES:
118601diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
118602index 2d0e265..67e5b8d 100644
118603--- a/net/ipv4/netfilter/ip_tables.c
118604+++ b/net/ipv4/netfilter/ip_tables.c
118605@@ -1072,14 +1072,14 @@ static int compat_table_info(const struct xt_table_info *info,
118606 #endif
118607
118608 static int get_info(struct net *net, void __user *user,
118609- const int *len, int compat)
118610+ int len, int compat)
118611 {
118612 char name[XT_TABLE_MAXNAMELEN];
118613 struct xt_table *t;
118614 int ret;
118615
118616- if (*len != sizeof(struct ipt_getinfo)) {
118617- duprintf("length %u != %zu\n", *len,
118618+ if (len != sizeof(struct ipt_getinfo)) {
118619+ duprintf("length %u != %zu\n", len,
118620 sizeof(struct ipt_getinfo));
118621 return -EINVAL;
118622 }
118623@@ -1116,7 +1116,7 @@ static int get_info(struct net *net, void __user *user,
118624 info.size = private->size;
118625 strcpy(info.name, name);
118626
118627- if (copy_to_user(user, &info, *len) != 0)
118628+ if (copy_to_user(user, &info, len) != 0)
118629 ret = -EFAULT;
118630 else
118631 ret = 0;
118632@@ -1978,7 +1978,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
118633
118634 switch (cmd) {
118635 case IPT_SO_GET_INFO:
118636- ret = get_info(sock_net(sk), user, len, 1);
118637+ ret = get_info(sock_net(sk), user, *len, 1);
118638 break;
118639 case IPT_SO_GET_ENTRIES:
118640 ret = compat_get_entries(sock_net(sk), user, len);
118641@@ -2025,7 +2025,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
118642
118643 switch (cmd) {
118644 case IPT_SO_GET_INFO:
118645- ret = get_info(sock_net(sk), user, len, 0);
118646+ ret = get_info(sock_net(sk), user, *len, 0);
118647 break;
118648
118649 case IPT_SO_GET_ENTRIES:
118650diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
118651index 771ab3d..5b99b18 100644
118652--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
118653+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
118654@@ -725,7 +725,7 @@ static int clusterip_net_init(struct net *net)
118655 spin_lock_init(&cn->lock);
118656
118657 #ifdef CONFIG_PROC_FS
118658- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
118659+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
118660 if (!cn->procdir) {
118661 pr_err("Unable to proc dir entry\n");
118662 return -ENOMEM;
118663diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
118664index 05ff44b..da00000 100644
118665--- a/net/ipv4/ping.c
118666+++ b/net/ipv4/ping.c
118667@@ -59,7 +59,7 @@ struct ping_table {
118668 };
118669
118670 static struct ping_table ping_table;
118671-struct pingv6_ops pingv6_ops;
118672+struct pingv6_ops *pingv6_ops;
118673 EXPORT_SYMBOL_GPL(pingv6_ops);
118674
118675 static u16 ping_port_rover;
118676@@ -359,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
118677 return -ENODEV;
118678 }
118679 }
118680- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
118681+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
118682 scoped);
118683 rcu_read_unlock();
118684
118685@@ -567,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
118686 }
118687 #if IS_ENABLED(CONFIG_IPV6)
118688 } else if (skb->protocol == htons(ETH_P_IPV6)) {
118689- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
118690+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
118691 #endif
118692 }
118693
118694@@ -585,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
118695 info, (u8 *)icmph);
118696 #if IS_ENABLED(CONFIG_IPV6)
118697 } else if (family == AF_INET6) {
118698- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
118699+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
118700 info, (u8 *)icmph);
118701 #endif
118702 }
118703@@ -918,10 +918,10 @@ int ping_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
118704 }
118705
118706 if (inet6_sk(sk)->rxopt.all)
118707- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
118708+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
118709 if (skb->protocol == htons(ETH_P_IPV6) &&
118710 inet6_sk(sk)->rxopt.all)
118711- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
118712+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
118713 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
118714 ip_cmsg_recv(msg, skb);
118715 #endif
118716@@ -1116,7 +1116,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
118717 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
118718 0, sock_i_ino(sp),
118719 atomic_read(&sp->sk_refcnt), sp,
118720- atomic_read(&sp->sk_drops));
118721+ atomic_read_unchecked(&sp->sk_drops));
118722 }
118723
118724 static int ping_v4_seq_show(struct seq_file *seq, void *v)
118725diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
118726index 561cd4b..a32a155 100644
118727--- a/net/ipv4/raw.c
118728+++ b/net/ipv4/raw.c
118729@@ -323,7 +323,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
118730 int raw_rcv(struct sock *sk, struct sk_buff *skb)
118731 {
118732 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
118733- atomic_inc(&sk->sk_drops);
118734+ atomic_inc_unchecked(&sk->sk_drops);
118735 kfree_skb(skb);
118736 return NET_RX_DROP;
118737 }
118738@@ -771,16 +771,20 @@ static int raw_init(struct sock *sk)
118739
118740 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
118741 {
118742+ struct icmp_filter filter;
118743+
118744 if (optlen > sizeof(struct icmp_filter))
118745 optlen = sizeof(struct icmp_filter);
118746- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
118747+ if (copy_from_user(&filter, optval, optlen))
118748 return -EFAULT;
118749+ raw_sk(sk)->filter = filter;
118750 return 0;
118751 }
118752
118753 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
118754 {
118755 int len, ret = -EFAULT;
118756+ struct icmp_filter filter;
118757
118758 if (get_user(len, optlen))
118759 goto out;
118760@@ -790,8 +794,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
118761 if (len > sizeof(struct icmp_filter))
118762 len = sizeof(struct icmp_filter);
118763 ret = -EFAULT;
118764- if (put_user(len, optlen) ||
118765- copy_to_user(optval, &raw_sk(sk)->filter, len))
118766+ filter = raw_sk(sk)->filter;
118767+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
118768 goto out;
118769 ret = 0;
118770 out: return ret;
118771@@ -1020,7 +1024,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
118772 0, 0L, 0,
118773 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
118774 0, sock_i_ino(sp),
118775- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
118776+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
118777 }
118778
118779 static int raw_seq_show(struct seq_file *seq, void *v)
118780diff --git a/net/ipv4/route.c b/net/ipv4/route.c
118781index f45f2a1..e7d47a3 100644
118782--- a/net/ipv4/route.c
118783+++ b/net/ipv4/route.c
118784@@ -227,7 +227,7 @@ static const struct seq_operations rt_cache_seq_ops = {
118785
118786 static int rt_cache_seq_open(struct inode *inode, struct file *file)
118787 {
118788- return seq_open(file, &rt_cache_seq_ops);
118789+ return seq_open_restrict(file, &rt_cache_seq_ops);
118790 }
118791
118792 static const struct file_operations rt_cache_seq_fops = {
118793@@ -318,7 +318,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
118794
118795 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
118796 {
118797- return seq_open(file, &rt_cpu_seq_ops);
118798+ return seq_open_restrict(file, &rt_cpu_seq_ops);
118799 }
118800
118801 static const struct file_operations rt_cpu_seq_fops = {
118802@@ -356,7 +356,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
118803
118804 static int rt_acct_proc_open(struct inode *inode, struct file *file)
118805 {
118806- return single_open(file, rt_acct_proc_show, NULL);
118807+ return single_open_restrict(file, rt_acct_proc_show, NULL);
118808 }
118809
118810 static const struct file_operations rt_acct_proc_fops = {
118811@@ -458,11 +458,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
118812
118813 #define IP_IDENTS_SZ 2048u
118814 struct ip_ident_bucket {
118815- atomic_t id;
118816+ atomic_unchecked_t id;
118817 u32 stamp32;
118818 };
118819
118820-static struct ip_ident_bucket *ip_idents __read_mostly;
118821+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
118822
118823 /* In order to protect privacy, we add a perturbation to identifiers
118824 * if one generator is seldom used. This makes hard for an attacker
118825@@ -478,7 +478,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
118826 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
118827 delta = prandom_u32_max(now - old);
118828
118829- return atomic_add_return(segs + delta, &bucket->id) - segs;
118830+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
118831 }
118832 EXPORT_SYMBOL(ip_idents_reserve);
118833
118834@@ -2641,34 +2641,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
118835 .maxlen = sizeof(int),
118836 .mode = 0200,
118837 .proc_handler = ipv4_sysctl_rtcache_flush,
118838+ .extra1 = &init_net,
118839 },
118840 { },
118841 };
118842
118843 static __net_init int sysctl_route_net_init(struct net *net)
118844 {
118845- struct ctl_table *tbl;
118846+ ctl_table_no_const *tbl = NULL;
118847
118848- tbl = ipv4_route_flush_table;
118849 if (!net_eq(net, &init_net)) {
118850- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
118851+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
118852 if (!tbl)
118853 goto err_dup;
118854
118855 /* Don't export sysctls to unprivileged users */
118856 if (net->user_ns != &init_user_ns)
118857 tbl[0].procname = NULL;
118858- }
118859- tbl[0].extra1 = net;
118860+ tbl[0].extra1 = net;
118861+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
118862+ } else
118863+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
118864
118865- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
118866 if (!net->ipv4.route_hdr)
118867 goto err_reg;
118868 return 0;
118869
118870 err_reg:
118871- if (tbl != ipv4_route_flush_table)
118872- kfree(tbl);
118873+ kfree(tbl);
118874 err_dup:
118875 return -ENOMEM;
118876 }
118877@@ -2691,8 +2691,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
118878
118879 static __net_init int rt_genid_init(struct net *net)
118880 {
118881- atomic_set(&net->ipv4.rt_genid, 0);
118882- atomic_set(&net->fnhe_genid, 0);
118883+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
118884+ atomic_set_unchecked(&net->fnhe_genid, 0);
118885 get_random_bytes(&net->ipv4.dev_addr_genid,
118886 sizeof(net->ipv4.dev_addr_genid));
118887 return 0;
118888@@ -2736,11 +2736,7 @@ int __init ip_rt_init(void)
118889 int rc = 0;
118890 int cpu;
118891
118892- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
118893- if (!ip_idents)
118894- panic("IP: failed to allocate ip_idents\n");
118895-
118896- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
118897+ prandom_bytes(ip_idents, sizeof(ip_idents));
118898
118899 for_each_possible_cpu(cpu) {
118900 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
118901diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
118902index c3852a7..7bdbde7 100644
118903--- a/net/ipv4/sysctl_net_ipv4.c
118904+++ b/net/ipv4/sysctl_net_ipv4.c
118905@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
118906 container_of(table->data, struct net, ipv4.ip_local_ports.range);
118907 int ret;
118908 int range[2];
118909- struct ctl_table tmp = {
118910+ ctl_table_no_const tmp = {
118911 .data = &range,
118912 .maxlen = sizeof(range),
118913 .mode = table->mode,
118914@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
118915 int ret;
118916 gid_t urange[2];
118917 kgid_t low, high;
118918- struct ctl_table tmp = {
118919+ ctl_table_no_const tmp = {
118920 .data = &urange,
118921 .maxlen = sizeof(urange),
118922 .mode = table->mode,
118923@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
118924 void __user *buffer, size_t *lenp, loff_t *ppos)
118925 {
118926 char val[TCP_CA_NAME_MAX];
118927- struct ctl_table tbl = {
118928+ ctl_table_no_const tbl = {
118929 .data = val,
118930 .maxlen = TCP_CA_NAME_MAX,
118931 };
118932@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
118933 void __user *buffer, size_t *lenp,
118934 loff_t *ppos)
118935 {
118936- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
118937+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
118938 int ret;
118939
118940 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
118941@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
118942 void __user *buffer, size_t *lenp,
118943 loff_t *ppos)
118944 {
118945- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
118946+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
118947 int ret;
118948
118949 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
118950@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
118951 void __user *buffer, size_t *lenp,
118952 loff_t *ppos)
118953 {
118954- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
118955+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
118956 struct tcp_fastopen_context *ctxt;
118957 int ret;
118958 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
118959@@ -902,13 +902,12 @@ static struct ctl_table ipv4_net_table[] = {
118960
118961 static __net_init int ipv4_sysctl_init_net(struct net *net)
118962 {
118963- struct ctl_table *table;
118964+ ctl_table_no_const *table = NULL;
118965
118966- table = ipv4_net_table;
118967 if (!net_eq(net, &init_net)) {
118968 int i;
118969
118970- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
118971+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
118972 if (!table)
118973 goto err_alloc;
118974
118975@@ -917,7 +916,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
118976 table[i].data += (void *)net - (void *)&init_net;
118977 }
118978
118979- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
118980+ if (!net_eq(net, &init_net))
118981+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
118982+ else
118983+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
118984 if (!net->ipv4.ipv4_hdr)
118985 goto err_reg;
118986
118987diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
118988index c9ab964..607d9f7 100644
118989--- a/net/ipv4/tcp_input.c
118990+++ b/net/ipv4/tcp_input.c
118991@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
118992 * without any lock. We want to make sure compiler wont store
118993 * intermediate values in this location.
118994 */
118995- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
118996+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
118997 sk->sk_max_pacing_rate);
118998 }
118999
119000@@ -4610,7 +4610,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
119001 * simplifies code)
119002 */
119003 static void
119004-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
119005+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
119006 struct sk_buff *head, struct sk_buff *tail,
119007 u32 start, u32 end)
119008 {
119009@@ -5605,6 +5605,7 @@ discard:
119010 tcp_paws_reject(&tp->rx_opt, 0))
119011 goto discard_and_undo;
119012
119013+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
119014 if (th->syn) {
119015 /* We see SYN without ACK. It is attempt of
119016 * simultaneous connect with crossed SYNs.
119017@@ -5655,6 +5656,7 @@ discard:
119018 goto discard;
119019 #endif
119020 }
119021+#endif
119022 /* "fifth, if neither of the SYN or RST bits is set then
119023 * drop the segment and return."
119024 */
119025@@ -5701,7 +5703,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
119026 goto discard;
119027
119028 if (th->syn) {
119029- if (th->fin)
119030+ if (th->fin || th->urg || th->psh)
119031 goto discard;
119032 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
119033 return 1;
119034diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
119035index fc1c658..4de4e33 100644
119036--- a/net/ipv4/tcp_ipv4.c
119037+++ b/net/ipv4/tcp_ipv4.c
119038@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
119039 int sysctl_tcp_low_latency __read_mostly;
119040 EXPORT_SYMBOL(sysctl_tcp_low_latency);
119041
119042+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119043+extern int grsec_enable_blackhole;
119044+#endif
119045+
119046 #ifdef CONFIG_TCP_MD5SIG
119047 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
119048 __be32 daddr, __be32 saddr, const struct tcphdr *th);
119049@@ -1348,7 +1352,7 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
119050 req = inet_csk_search_req(sk, th->source, iph->saddr, iph->daddr);
119051 if (req) {
119052 nsk = tcp_check_req(sk, skb, req, false);
119053- if (!nsk)
119054+ if (!nsk || nsk == sk)
119055 reqsk_put(req);
119056 return nsk;
119057 }
119058@@ -1427,6 +1431,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
119059 return 0;
119060
119061 reset:
119062+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119063+ if (!grsec_enable_blackhole)
119064+#endif
119065 tcp_v4_send_reset(rsk, skb);
119066 discard:
119067 kfree_skb(skb);
119068@@ -1591,12 +1598,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
119069 TCP_SKB_CB(skb)->sacked = 0;
119070
119071 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
119072- if (!sk)
119073+ if (!sk) {
119074+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119075+ ret = 1;
119076+#endif
119077 goto no_tcp_socket;
119078-
119079+ }
119080 process:
119081- if (sk->sk_state == TCP_TIME_WAIT)
119082+ if (sk->sk_state == TCP_TIME_WAIT) {
119083+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119084+ ret = 2;
119085+#endif
119086 goto do_time_wait;
119087+ }
119088
119089 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
119090 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
119091@@ -1652,6 +1666,10 @@ csum_error:
119092 bad_packet:
119093 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
119094 } else {
119095+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119096+ if (!grsec_enable_blackhole || (ret == 1 &&
119097+ (skb->dev->flags & IFF_LOOPBACK)))
119098+#endif
119099 tcp_v4_send_reset(NULL, skb);
119100 }
119101
119102diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
119103index 17e7339..c72ff6c 100644
119104--- a/net/ipv4/tcp_minisocks.c
119105+++ b/net/ipv4/tcp_minisocks.c
119106@@ -27,6 +27,10 @@
119107 #include <net/inet_common.h>
119108 #include <net/xfrm.h>
119109
119110+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119111+extern int grsec_enable_blackhole;
119112+#endif
119113+
119114 int sysctl_tcp_syncookies __read_mostly = 1;
119115 EXPORT_SYMBOL(sysctl_tcp_syncookies);
119116
119117@@ -778,7 +782,10 @@ embryonic_reset:
119118 * avoid becoming vulnerable to outside attack aiming at
119119 * resetting legit local connections.
119120 */
119121- req->rsk_ops->send_reset(sk, skb);
119122+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119123+ if (!grsec_enable_blackhole)
119124+#endif
119125+ req->rsk_ops->send_reset(sk, skb);
119126 } else if (fastopen) { /* received a valid RST pkt */
119127 reqsk_fastopen_remove(sk, req, true);
119128 tcp_reset(sk);
119129diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
119130index ebf5ff5..4d1ff32 100644
119131--- a/net/ipv4/tcp_probe.c
119132+++ b/net/ipv4/tcp_probe.c
119133@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
119134 if (cnt + width >= len)
119135 break;
119136
119137- if (copy_to_user(buf + cnt, tbuf, width))
119138+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
119139 return -EFAULT;
119140 cnt += width;
119141 }
119142diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
119143index 8c65dc1..55fd1ba 100644
119144--- a/net/ipv4/tcp_timer.c
119145+++ b/net/ipv4/tcp_timer.c
119146@@ -22,6 +22,10 @@
119147 #include <linux/gfp.h>
119148 #include <net/tcp.h>
119149
119150+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119151+extern int grsec_lastack_retries;
119152+#endif
119153+
119154 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
119155 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
119156 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
119157@@ -195,6 +199,13 @@ static int tcp_write_timeout(struct sock *sk)
119158 }
119159 }
119160
119161+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119162+ if ((sk->sk_state == TCP_LAST_ACK) &&
119163+ (grsec_lastack_retries > 0) &&
119164+ (grsec_lastack_retries < retry_until))
119165+ retry_until = grsec_lastack_retries;
119166+#endif
119167+
119168 if (retransmits_timed_out(sk, retry_until,
119169 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
119170 /* Has it gone just too far? */
119171diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
119172index 83aa604..dbfddf5 100644
119173--- a/net/ipv4/udp.c
119174+++ b/net/ipv4/udp.c
119175@@ -87,6 +87,7 @@
119176 #include <linux/types.h>
119177 #include <linux/fcntl.h>
119178 #include <linux/module.h>
119179+#include <linux/security.h>
119180 #include <linux/socket.h>
119181 #include <linux/sockios.h>
119182 #include <linux/igmp.h>
119183@@ -115,6 +116,10 @@
119184 #include <net/busy_poll.h>
119185 #include "udp_impl.h"
119186
119187+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119188+extern int grsec_enable_blackhole;
119189+#endif
119190+
119191 struct udp_table udp_table __read_mostly;
119192 EXPORT_SYMBOL(udp_table);
119193
119194@@ -608,6 +613,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
119195 return true;
119196 }
119197
119198+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
119199+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
119200+
119201 /*
119202 * This routine is called by the ICMP module when it gets some
119203 * sort of error condition. If err < 0 then the socket should
119204@@ -944,9 +952,18 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
119205 dport = usin->sin_port;
119206 if (dport == 0)
119207 return -EINVAL;
119208+
119209+ err = gr_search_udp_sendmsg(sk, usin);
119210+ if (err)
119211+ return err;
119212 } else {
119213 if (sk->sk_state != TCP_ESTABLISHED)
119214 return -EDESTADDRREQ;
119215+
119216+ err = gr_search_udp_sendmsg(sk, NULL);
119217+ if (err)
119218+ return err;
119219+
119220 daddr = inet->inet_daddr;
119221 dport = inet->inet_dport;
119222 /* Open fast path for connected socket.
119223@@ -1193,7 +1210,7 @@ static unsigned int first_packet_length(struct sock *sk)
119224 IS_UDPLITE(sk));
119225 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
119226 IS_UDPLITE(sk));
119227- atomic_inc(&sk->sk_drops);
119228+ atomic_inc_unchecked(&sk->sk_drops);
119229 __skb_unlink(skb, rcvq);
119230 __skb_queue_tail(&list_kill, skb);
119231 }
119232@@ -1273,6 +1290,10 @@ try_again:
119233 if (!skb)
119234 goto out;
119235
119236+ err = gr_search_udp_recvmsg(sk, skb);
119237+ if (err)
119238+ goto out_free;
119239+
119240 ulen = skb->len - sizeof(struct udphdr);
119241 copied = len;
119242 if (copied > ulen)
119243@@ -1305,7 +1326,7 @@ try_again:
119244 if (unlikely(err)) {
119245 trace_kfree_skb(skb, udp_recvmsg);
119246 if (!peeked) {
119247- atomic_inc(&sk->sk_drops);
119248+ atomic_inc_unchecked(&sk->sk_drops);
119249 UDP_INC_STATS_USER(sock_net(sk),
119250 UDP_MIB_INERRORS, is_udplite);
119251 }
119252@@ -1599,7 +1620,7 @@ csum_error:
119253 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
119254 drop:
119255 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
119256- atomic_inc(&sk->sk_drops);
119257+ atomic_inc_unchecked(&sk->sk_drops);
119258 kfree_skb(skb);
119259 return -1;
119260 }
119261@@ -1617,7 +1638,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
119262 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
119263
119264 if (!skb1) {
119265- atomic_inc(&sk->sk_drops);
119266+ atomic_inc_unchecked(&sk->sk_drops);
119267 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
119268 IS_UDPLITE(sk));
119269 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
119270@@ -1823,6 +1844,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
119271 goto csum_error;
119272
119273 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
119274+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
119275+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
119276+#endif
119277 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
119278
119279 /*
119280@@ -2420,7 +2444,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
119281 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
119282 0, sock_i_ino(sp),
119283 atomic_read(&sp->sk_refcnt), sp,
119284- atomic_read(&sp->sk_drops));
119285+ atomic_read_unchecked(&sp->sk_drops));
119286 }
119287
119288 int udp4_seq_show(struct seq_file *seq, void *v)
119289diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
119290index bff6974..c63736c 100644
119291--- a/net/ipv4/xfrm4_policy.c
119292+++ b/net/ipv4/xfrm4_policy.c
119293@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
119294 fl4->flowi4_tos = iph->tos;
119295 }
119296
119297-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
119298+static int xfrm4_garbage_collect(struct dst_ops *ops)
119299 {
119300 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
119301
119302- xfrm4_policy_afinfo.garbage_collect(net);
119303+ xfrm_garbage_collect_deferred(net);
119304 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
119305 }
119306
119307@@ -268,19 +268,18 @@ static struct ctl_table xfrm4_policy_table[] = {
119308
119309 static int __net_init xfrm4_net_init(struct net *net)
119310 {
119311- struct ctl_table *table;
119312+ ctl_table_no_const *table = NULL;
119313 struct ctl_table_header *hdr;
119314
119315- table = xfrm4_policy_table;
119316 if (!net_eq(net, &init_net)) {
119317- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
119318+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
119319 if (!table)
119320 goto err_alloc;
119321
119322 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
119323- }
119324-
119325- hdr = register_net_sysctl(net, "net/ipv4", table);
119326+ hdr = register_net_sysctl(net, "net/ipv4", table);
119327+ } else
119328+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
119329 if (!hdr)
119330 goto err_reg;
119331
119332@@ -288,8 +287,7 @@ static int __net_init xfrm4_net_init(struct net *net)
119333 return 0;
119334
119335 err_reg:
119336- if (!net_eq(net, &init_net))
119337- kfree(table);
119338+ kfree(table);
119339 err_alloc:
119340 return -ENOMEM;
119341 }
119342diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
119343index 37b70e8..1475ab7 100644
119344--- a/net/ipv6/addrconf.c
119345+++ b/net/ipv6/addrconf.c
119346@@ -178,7 +178,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
119347 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
119348 .mtu6 = IPV6_MIN_MTU,
119349 .accept_ra = 1,
119350- .accept_redirects = 1,
119351+ .accept_redirects = 0,
119352 .autoconf = 1,
119353 .force_mld_version = 0,
119354 .mldv1_unsolicited_report_interval = 10 * HZ,
119355@@ -219,7 +219,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
119356 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
119357 .mtu6 = IPV6_MIN_MTU,
119358 .accept_ra = 1,
119359- .accept_redirects = 1,
119360+ .accept_redirects = 0,
119361 .autoconf = 1,
119362 .force_mld_version = 0,
119363 .mldv1_unsolicited_report_interval = 10 * HZ,
119364@@ -620,7 +620,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
119365 idx = 0;
119366 head = &net->dev_index_head[h];
119367 rcu_read_lock();
119368- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
119369+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
119370 net->dev_base_seq;
119371 hlist_for_each_entry_rcu(dev, head, index_hlist) {
119372 if (idx < s_idx)
119373@@ -2506,7 +2506,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
119374 p.iph.ihl = 5;
119375 p.iph.protocol = IPPROTO_IPV6;
119376 p.iph.ttl = 64;
119377- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
119378+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
119379
119380 if (ops->ndo_do_ioctl) {
119381 mm_segment_t oldfs = get_fs();
119382@@ -3772,16 +3772,23 @@ static const struct file_operations if6_fops = {
119383 .release = seq_release_net,
119384 };
119385
119386+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
119387+extern void unregister_ipv6_seq_ops_addr(void);
119388+
119389 static int __net_init if6_proc_net_init(struct net *net)
119390 {
119391- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
119392+ register_ipv6_seq_ops_addr(&if6_seq_ops);
119393+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
119394+ unregister_ipv6_seq_ops_addr();
119395 return -ENOMEM;
119396+ }
119397 return 0;
119398 }
119399
119400 static void __net_exit if6_proc_net_exit(struct net *net)
119401 {
119402 remove_proc_entry("if_inet6", net->proc_net);
119403+ unregister_ipv6_seq_ops_addr();
119404 }
119405
119406 static struct pernet_operations if6_proc_net_ops = {
119407@@ -4400,7 +4407,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
119408 s_ip_idx = ip_idx = cb->args[2];
119409
119410 rcu_read_lock();
119411- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
119412+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
119413 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
119414 idx = 0;
119415 head = &net->dev_index_head[h];
119416@@ -5057,7 +5064,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
119417 rt_genid_bump_ipv6(net);
119418 break;
119419 }
119420- atomic_inc(&net->ipv6.dev_addr_genid);
119421+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
119422 }
119423
119424 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
119425@@ -5077,7 +5084,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
119426 int *valp = ctl->data;
119427 int val = *valp;
119428 loff_t pos = *ppos;
119429- struct ctl_table lctl;
119430+ ctl_table_no_const lctl;
119431 int ret;
119432
119433 /*
119434@@ -5102,7 +5109,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
119435 {
119436 struct inet6_dev *idev = ctl->extra1;
119437 int min_mtu = IPV6_MIN_MTU;
119438- struct ctl_table lctl;
119439+ ctl_table_no_const lctl;
119440
119441 lctl = *ctl;
119442 lctl.extra1 = &min_mtu;
119443@@ -5177,7 +5184,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
119444 int *valp = ctl->data;
119445 int val = *valp;
119446 loff_t pos = *ppos;
119447- struct ctl_table lctl;
119448+ ctl_table_no_const lctl;
119449 int ret;
119450
119451 /*
119452@@ -5242,7 +5249,7 @@ static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write,
119453 int err;
119454 struct in6_addr addr;
119455 char str[IPV6_MAX_STRLEN];
119456- struct ctl_table lctl = *ctl;
119457+ ctl_table_no_const lctl = *ctl;
119458 struct net *net = ctl->extra2;
119459 struct ipv6_stable_secret *secret = ctl->data;
119460
119461diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
119462index eef63b3..d68f5da 100644
119463--- a/net/ipv6/af_inet6.c
119464+++ b/net/ipv6/af_inet6.c
119465@@ -768,7 +768,7 @@ static int __net_init inet6_net_init(struct net *net)
119466 net->ipv6.sysctl.auto_flowlabels = 0;
119467 net->ipv6.sysctl.idgen_retries = 3;
119468 net->ipv6.sysctl.idgen_delay = 1 * HZ;
119469- atomic_set(&net->ipv6.fib6_sernum, 1);
119470+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
119471
119472 err = ipv6_init_mibs(net);
119473 if (err)
119474diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
119475index 62d908e..bac79a9 100644
119476--- a/net/ipv6/datagram.c
119477+++ b/net/ipv6/datagram.c
119478@@ -967,5 +967,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
119479 0,
119480 sock_i_ino(sp),
119481 atomic_read(&sp->sk_refcnt), sp,
119482- atomic_read(&sp->sk_drops));
119483+ atomic_read_unchecked(&sp->sk_drops));
119484 }
119485diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
119486index 2c2b5d5..cc01abd 100644
119487--- a/net/ipv6/icmp.c
119488+++ b/net/ipv6/icmp.c
119489@@ -1004,7 +1004,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
119490
119491 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
119492 {
119493- struct ctl_table *table;
119494+ ctl_table_no_const *table;
119495
119496 table = kmemdup(ipv6_icmp_table_template,
119497 sizeof(ipv6_icmp_table_template),
119498diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
119499index bde57b1..5b45dbb 100644
119500--- a/net/ipv6/ip6_fib.c
119501+++ b/net/ipv6/ip6_fib.c
119502@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
119503 int new, old;
119504
119505 do {
119506- old = atomic_read(&net->ipv6.fib6_sernum);
119507+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
119508 new = old < INT_MAX ? old + 1 : 1;
119509- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
119510+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
119511 old, new) != old);
119512 return new;
119513 }
119514diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
119515index a38d3ac..d02e37d 100644
119516--- a/net/ipv6/ip6_gre.c
119517+++ b/net/ipv6/ip6_gre.c
119518@@ -71,8 +71,8 @@ struct ip6gre_net {
119519 struct net_device *fb_tunnel_dev;
119520 };
119521
119522-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
119523-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
119524+static struct rtnl_link_ops ip6gre_link_ops;
119525+static struct rtnl_link_ops ip6gre_tap_ops;
119526 static int ip6gre_tunnel_init(struct net_device *dev);
119527 static void ip6gre_tunnel_setup(struct net_device *dev);
119528 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
119529@@ -1280,7 +1280,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
119530 }
119531
119532
119533-static struct inet6_protocol ip6gre_protocol __read_mostly = {
119534+static struct inet6_protocol ip6gre_protocol = {
119535 .handler = ip6gre_rcv,
119536 .err_handler = ip6gre_err,
119537 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
119538@@ -1639,7 +1639,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
119539 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
119540 };
119541
119542-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
119543+static struct rtnl_link_ops ip6gre_link_ops = {
119544 .kind = "ip6gre",
119545 .maxtype = IFLA_GRE_MAX,
119546 .policy = ip6gre_policy,
119547@@ -1654,7 +1654,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
119548 .get_link_net = ip6_tnl_get_link_net,
119549 };
119550
119551-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
119552+static struct rtnl_link_ops ip6gre_tap_ops = {
119553 .kind = "ip6gretap",
119554 .maxtype = IFLA_GRE_MAX,
119555 .policy = ip6gre_policy,
119556diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
119557index 5cafd92..d5aead4 100644
119558--- a/net/ipv6/ip6_tunnel.c
119559+++ b/net/ipv6/ip6_tunnel.c
119560@@ -80,7 +80,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
119561
119562 static int ip6_tnl_dev_init(struct net_device *dev);
119563 static void ip6_tnl_dev_setup(struct net_device *dev);
119564-static struct rtnl_link_ops ip6_link_ops __read_mostly;
119565+static struct rtnl_link_ops ip6_link_ops;
119566
119567 static int ip6_tnl_net_id __read_mostly;
119568 struct ip6_tnl_net {
119569@@ -1776,7 +1776,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
119570 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
119571 };
119572
119573-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
119574+static struct rtnl_link_ops ip6_link_ops = {
119575 .kind = "ip6tnl",
119576 .maxtype = IFLA_IPTUN_MAX,
119577 .policy = ip6_tnl_policy,
119578diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
119579index 0224c03..c5ec3d9 100644
119580--- a/net/ipv6/ip6_vti.c
119581+++ b/net/ipv6/ip6_vti.c
119582@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
119583
119584 static int vti6_dev_init(struct net_device *dev);
119585 static void vti6_dev_setup(struct net_device *dev);
119586-static struct rtnl_link_ops vti6_link_ops __read_mostly;
119587+static struct rtnl_link_ops vti6_link_ops;
119588
119589 static int vti6_net_id __read_mostly;
119590 struct vti6_net {
119591@@ -1019,7 +1019,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
119592 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
119593 };
119594
119595-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
119596+static struct rtnl_link_ops vti6_link_ops = {
119597 .kind = "vti6",
119598 .maxtype = IFLA_VTI_MAX,
119599 .policy = vti6_policy,
119600diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
119601index 63e6956..ebbbcf6 100644
119602--- a/net/ipv6/ipv6_sockglue.c
119603+++ b/net/ipv6/ipv6_sockglue.c
119604@@ -1015,7 +1015,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
119605 if (sk->sk_type != SOCK_STREAM)
119606 return -ENOPROTOOPT;
119607
119608- msg.msg_control = optval;
119609+ msg.msg_control = (void __force_kernel *)optval;
119610 msg.msg_controllen = len;
119611 msg.msg_flags = flags;
119612
119613diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
119614index 96f153c..82fcad9 100644
119615--- a/net/ipv6/ndisc.c
119616+++ b/net/ipv6/ndisc.c
119617@@ -1650,6 +1650,7 @@ int ndisc_rcv(struct sk_buff *skb)
119618 static int ndisc_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
119619 {
119620 struct net_device *dev = netdev_notifier_info_to_dev(ptr);
119621+ struct netdev_notifier_change_info *change_info;
119622 struct net *net = dev_net(dev);
119623 struct inet6_dev *idev;
119624
119625@@ -1664,6 +1665,11 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event,
119626 ndisc_send_unsol_na(dev);
119627 in6_dev_put(idev);
119628 break;
119629+ case NETDEV_CHANGE:
119630+ change_info = ptr;
119631+ if (change_info->flags_changed & IFF_NOARP)
119632+ neigh_changeaddr(&nd_tbl, dev);
119633+ break;
119634 case NETDEV_DOWN:
119635 neigh_ifdown(&nd_tbl, dev);
119636 fib6_run_gc(0, net, false);
119637diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
119638index 62f5b0d..331fdb1 100644
119639--- a/net/ipv6/netfilter/ip6_tables.c
119640+++ b/net/ipv6/netfilter/ip6_tables.c
119641@@ -1085,14 +1085,14 @@ static int compat_table_info(const struct xt_table_info *info,
119642 #endif
119643
119644 static int get_info(struct net *net, void __user *user,
119645- const int *len, int compat)
119646+ int len, int compat)
119647 {
119648 char name[XT_TABLE_MAXNAMELEN];
119649 struct xt_table *t;
119650 int ret;
119651
119652- if (*len != sizeof(struct ip6t_getinfo)) {
119653- duprintf("length %u != %zu\n", *len,
119654+ if (len != sizeof(struct ip6t_getinfo)) {
119655+ duprintf("length %u != %zu\n", len,
119656 sizeof(struct ip6t_getinfo));
119657 return -EINVAL;
119658 }
119659@@ -1129,7 +1129,7 @@ static int get_info(struct net *net, void __user *user,
119660 info.size = private->size;
119661 strcpy(info.name, name);
119662
119663- if (copy_to_user(user, &info, *len) != 0)
119664+ if (copy_to_user(user, &info, len) != 0)
119665 ret = -EFAULT;
119666 else
119667 ret = 0;
119668@@ -1991,7 +1991,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
119669
119670 switch (cmd) {
119671 case IP6T_SO_GET_INFO:
119672- ret = get_info(sock_net(sk), user, len, 1);
119673+ ret = get_info(sock_net(sk), user, *len, 1);
119674 break;
119675 case IP6T_SO_GET_ENTRIES:
119676 ret = compat_get_entries(sock_net(sk), user, len);
119677@@ -2038,7 +2038,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
119678
119679 switch (cmd) {
119680 case IP6T_SO_GET_INFO:
119681- ret = get_info(sock_net(sk), user, len, 0);
119682+ ret = get_info(sock_net(sk), user, *len, 0);
119683 break;
119684
119685 case IP6T_SO_GET_ENTRIES:
119686diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
119687index 6f187c8..55e564f 100644
119688--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
119689+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
119690@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
119691
119692 static int nf_ct_frag6_sysctl_register(struct net *net)
119693 {
119694- struct ctl_table *table;
119695+ ctl_table_no_const *table = NULL;
119696 struct ctl_table_header *hdr;
119697
119698- table = nf_ct_frag6_sysctl_table;
119699 if (!net_eq(net, &init_net)) {
119700- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
119701+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
119702 GFP_KERNEL);
119703 if (table == NULL)
119704 goto err_alloc;
119705@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
119706 table[2].data = &net->nf_frag.frags.high_thresh;
119707 table[2].extra1 = &net->nf_frag.frags.low_thresh;
119708 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
119709- }
119710-
119711- hdr = register_net_sysctl(net, "net/netfilter", table);
119712+ hdr = register_net_sysctl(net, "net/netfilter", table);
119713+ } else
119714+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
119715 if (hdr == NULL)
119716 goto err_reg;
119717
119718@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
119719 return 0;
119720
119721 err_reg:
119722- if (!net_eq(net, &init_net))
119723- kfree(table);
119724+ kfree(table);
119725 err_alloc:
119726 return -ENOMEM;
119727 }
119728@@ -348,7 +346,7 @@ found:
119729 fq->ecn |= ecn;
119730 if (payload_len > fq->q.max_size)
119731 fq->q.max_size = payload_len;
119732- add_frag_mem_limit(&fq->q, skb->truesize);
119733+ add_frag_mem_limit(fq->q.net, skb->truesize);
119734
119735 /* The first fragment.
119736 * nhoffset is obtained from the first fragment, of course.
119737@@ -430,7 +428,7 @@ nf_ct_frag6_reasm(struct frag_queue *fq, struct net_device *dev)
119738 clone->ip_summed = head->ip_summed;
119739
119740 NFCT_FRAG6_CB(clone)->orig = NULL;
119741- add_frag_mem_limit(&fq->q, clone->truesize);
119742+ add_frag_mem_limit(fq->q.net, clone->truesize);
119743 }
119744
119745 /* We have to remove fragment header from datagram and to relocate
119746@@ -454,7 +452,7 @@ nf_ct_frag6_reasm(struct frag_queue *fq, struct net_device *dev)
119747 head->csum = csum_add(head->csum, fp->csum);
119748 head->truesize += fp->truesize;
119749 }
119750- sub_frag_mem_limit(&fq->q, head->truesize);
119751+ sub_frag_mem_limit(fq->q.net, head->truesize);
119752
119753 head->ignore_df = 1;
119754 head->next = NULL;
119755diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
119756index 263a516..692f738 100644
119757--- a/net/ipv6/ping.c
119758+++ b/net/ipv6/ping.c
119759@@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
119760 };
119761 #endif
119762
119763+static struct pingv6_ops real_pingv6_ops = {
119764+ .ipv6_recv_error = ipv6_recv_error,
119765+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
119766+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
119767+ .icmpv6_err_convert = icmpv6_err_convert,
119768+ .ipv6_icmp_error = ipv6_icmp_error,
119769+ .ipv6_chk_addr = ipv6_chk_addr,
119770+};
119771+
119772+static struct pingv6_ops dummy_pingv6_ops = {
119773+ .ipv6_recv_error = dummy_ipv6_recv_error,
119774+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
119775+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
119776+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
119777+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
119778+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
119779+};
119780+
119781 int __init pingv6_init(void)
119782 {
119783 #ifdef CONFIG_PROC_FS
119784@@ -247,13 +265,7 @@ int __init pingv6_init(void)
119785 if (ret)
119786 return ret;
119787 #endif
119788- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
119789- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
119790- pingv6_ops.ip6_datagram_recv_specific_ctl =
119791- ip6_datagram_recv_specific_ctl;
119792- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
119793- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
119794- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
119795+ pingv6_ops = &real_pingv6_ops;
119796 return inet6_register_protosw(&pingv6_protosw);
119797 }
119798
119799@@ -262,14 +274,9 @@ int __init pingv6_init(void)
119800 */
119801 void pingv6_exit(void)
119802 {
119803- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
119804- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
119805- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
119806- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
119807- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
119808- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
119809 #ifdef CONFIG_PROC_FS
119810 unregister_pernet_subsys(&ping_v6_net_ops);
119811 #endif
119812+ pingv6_ops = &dummy_pingv6_ops;
119813 inet6_unregister_protosw(&pingv6_protosw);
119814 }
119815diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
119816index 679253d0..70b653c 100644
119817--- a/net/ipv6/proc.c
119818+++ b/net/ipv6/proc.c
119819@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
119820 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
119821 goto proc_snmp6_fail;
119822
119823- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
119824+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
119825 if (!net->mib.proc_net_devsnmp6)
119826 goto proc_dev_snmp6_fail;
119827 return 0;
119828diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
119829index 8072bd4..1629245 100644
119830--- a/net/ipv6/raw.c
119831+++ b/net/ipv6/raw.c
119832@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
119833 {
119834 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
119835 skb_checksum_complete(skb)) {
119836- atomic_inc(&sk->sk_drops);
119837+ atomic_inc_unchecked(&sk->sk_drops);
119838 kfree_skb(skb);
119839 return NET_RX_DROP;
119840 }
119841@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
119842 struct raw6_sock *rp = raw6_sk(sk);
119843
119844 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
119845- atomic_inc(&sk->sk_drops);
119846+ atomic_inc_unchecked(&sk->sk_drops);
119847 kfree_skb(skb);
119848 return NET_RX_DROP;
119849 }
119850@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
119851
119852 if (inet->hdrincl) {
119853 if (skb_checksum_complete(skb)) {
119854- atomic_inc(&sk->sk_drops);
119855+ atomic_inc_unchecked(&sk->sk_drops);
119856 kfree_skb(skb);
119857 return NET_RX_DROP;
119858 }
119859@@ -608,7 +608,7 @@ out:
119860 return err;
119861 }
119862
119863-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
119864+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
119865 struct flowi6 *fl6, struct dst_entry **dstp,
119866 unsigned int flags)
119867 {
119868@@ -913,12 +913,15 @@ do_confirm:
119869 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
119870 char __user *optval, int optlen)
119871 {
119872+ struct icmp6_filter filter;
119873+
119874 switch (optname) {
119875 case ICMPV6_FILTER:
119876 if (optlen > sizeof(struct icmp6_filter))
119877 optlen = sizeof(struct icmp6_filter);
119878- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
119879+ if (copy_from_user(&filter, optval, optlen))
119880 return -EFAULT;
119881+ raw6_sk(sk)->filter = filter;
119882 return 0;
119883 default:
119884 return -ENOPROTOOPT;
119885@@ -931,6 +934,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
119886 char __user *optval, int __user *optlen)
119887 {
119888 int len;
119889+ struct icmp6_filter filter;
119890
119891 switch (optname) {
119892 case ICMPV6_FILTER:
119893@@ -942,7 +946,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
119894 len = sizeof(struct icmp6_filter);
119895 if (put_user(len, optlen))
119896 return -EFAULT;
119897- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
119898+ filter = raw6_sk(sk)->filter;
119899+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
119900 return -EFAULT;
119901 return 0;
119902 default:
119903diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
119904index 8ffa2c8..0db5dad 100644
119905--- a/net/ipv6/reassembly.c
119906+++ b/net/ipv6/reassembly.c
119907@@ -144,7 +144,7 @@ void ip6_expire_frag_queue(struct net *net, struct frag_queue *fq,
119908
119909 IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMFAILS);
119910
119911- if (fq->q.flags & INET_FRAG_EVICTED)
119912+ if (inet_frag_evicting(&fq->q))
119913 goto out_rcu_unlock;
119914
119915 IP6_INC_STATS_BH(net, __in6_dev_get(dev), IPSTATS_MIB_REASMTIMEOUT);
119916@@ -330,7 +330,7 @@ found:
119917 fq->q.stamp = skb->tstamp;
119918 fq->q.meat += skb->len;
119919 fq->ecn |= ecn;
119920- add_frag_mem_limit(&fq->q, skb->truesize);
119921+ add_frag_mem_limit(fq->q.net, skb->truesize);
119922
119923 /* The first fragment.
119924 * nhoffset is obtained from the first fragment, of course.
119925@@ -443,7 +443,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
119926 head->len -= clone->len;
119927 clone->csum = 0;
119928 clone->ip_summed = head->ip_summed;
119929- add_frag_mem_limit(&fq->q, clone->truesize);
119930+ add_frag_mem_limit(fq->q.net, clone->truesize);
119931 }
119932
119933 /* We have to remove fragment header from datagram and to relocate
119934@@ -481,7 +481,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
119935 }
119936 fp = next;
119937 }
119938- sub_frag_mem_limit(&fq->q, sum_truesize);
119939+ sub_frag_mem_limit(fq->q.net, sum_truesize);
119940
119941 head->next = NULL;
119942 head->dev = dev;
119943@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
119944
119945 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119946 {
119947- struct ctl_table *table;
119948+ ctl_table_no_const *table = NULL;
119949 struct ctl_table_header *hdr;
119950
119951- table = ip6_frags_ns_ctl_table;
119952 if (!net_eq(net, &init_net)) {
119953- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
119954+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
119955 if (!table)
119956 goto err_alloc;
119957
119958@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119959 /* Don't export sysctls to unprivileged users */
119960 if (net->user_ns != &init_user_ns)
119961 table[0].procname = NULL;
119962- }
119963+ hdr = register_net_sysctl(net, "net/ipv6", table);
119964+ } else
119965+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
119966
119967- hdr = register_net_sysctl(net, "net/ipv6", table);
119968 if (!hdr)
119969 goto err_reg;
119970
119971@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
119972 return 0;
119973
119974 err_reg:
119975- if (!net_eq(net, &init_net))
119976- kfree(table);
119977+ kfree(table);
119978 err_alloc:
119979 return -ENOMEM;
119980 }
119981diff --git a/net/ipv6/route.c b/net/ipv6/route.c
119982index c73ae50..aa55e00 100644
119983--- a/net/ipv6/route.c
119984+++ b/net/ipv6/route.c
119985@@ -3046,7 +3046,7 @@ struct ctl_table ipv6_route_table_template[] = {
119986
119987 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
119988 {
119989- struct ctl_table *table;
119990+ ctl_table_no_const *table;
119991
119992 table = kmemdup(ipv6_route_table_template,
119993 sizeof(ipv6_route_table_template),
119994diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
119995index ac35a28..070cc8c 100644
119996--- a/net/ipv6/sit.c
119997+++ b/net/ipv6/sit.c
119998@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
119999 static void ipip6_dev_free(struct net_device *dev);
120000 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
120001 __be32 *v4dst);
120002-static struct rtnl_link_ops sit_link_ops __read_mostly;
120003+static struct rtnl_link_ops sit_link_ops;
120004
120005 static int sit_net_id __read_mostly;
120006 struct sit_net {
120007@@ -1749,7 +1749,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
120008 unregister_netdevice_queue(dev, head);
120009 }
120010
120011-static struct rtnl_link_ops sit_link_ops __read_mostly = {
120012+static struct rtnl_link_ops sit_link_ops = {
120013 .kind = "sit",
120014 .maxtype = IFLA_IPTUN_MAX,
120015 .policy = ipip6_policy,
120016diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
120017index abcc79f..3b2d2d5 100644
120018--- a/net/ipv6/sysctl_net_ipv6.c
120019+++ b/net/ipv6/sysctl_net_ipv6.c
120020@@ -92,7 +92,7 @@ static struct ctl_table ipv6_rotable[] = {
120021
120022 static int __net_init ipv6_sysctl_net_init(struct net *net)
120023 {
120024- struct ctl_table *ipv6_table;
120025+ ctl_table_no_const *ipv6_table;
120026 struct ctl_table *ipv6_route_table;
120027 struct ctl_table *ipv6_icmp_table;
120028 int err;
120029diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
120030index 3adffb3..fe3cc78 100644
120031--- a/net/ipv6/tcp_ipv6.c
120032+++ b/net/ipv6/tcp_ipv6.c
120033@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
120034 }
120035 }
120036
120037+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
120038+extern int grsec_enable_blackhole;
120039+#endif
120040+
120041 static __u32 tcp_v6_init_sequence(const struct sk_buff *skb)
120042 {
120043 return secure_tcpv6_sequence_number(ipv6_hdr(skb)->daddr.s6_addr32,
120044@@ -946,7 +950,7 @@ static struct sock *tcp_v6_hnd_req(struct sock *sk, struct sk_buff *skb)
120045 &ipv6_hdr(skb)->daddr, tcp_v6_iif(skb));
120046 if (req) {
120047 nsk = tcp_check_req(sk, skb, req, false);
120048- if (!nsk)
120049+ if (!nsk || nsk == sk)
120050 reqsk_put(req);
120051 return nsk;
120052 }
120053@@ -1283,6 +1287,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
120054 return 0;
120055
120056 reset:
120057+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
120058+ if (!grsec_enable_blackhole)
120059+#endif
120060 tcp_v6_send_reset(sk, skb);
120061 discard:
120062 if (opt_skb)
120063@@ -1392,12 +1399,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
120064
120065 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
120066 inet6_iif(skb));
120067- if (!sk)
120068+ if (!sk) {
120069+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
120070+ ret = 1;
120071+#endif
120072 goto no_tcp_socket;
120073+ }
120074
120075 process:
120076- if (sk->sk_state == TCP_TIME_WAIT)
120077+ if (sk->sk_state == TCP_TIME_WAIT) {
120078+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
120079+ ret = 2;
120080+#endif
120081 goto do_time_wait;
120082+ }
120083
120084 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
120085 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
120086@@ -1448,6 +1463,10 @@ csum_error:
120087 bad_packet:
120088 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
120089 } else {
120090+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
120091+ if (!grsec_enable_blackhole || (ret == 1 &&
120092+ (skb->dev->flags & IFF_LOOPBACK)))
120093+#endif
120094 tcp_v6_send_reset(NULL, skb);
120095 }
120096
120097diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
120098index e51fc3e..8f04229 100644
120099--- a/net/ipv6/udp.c
120100+++ b/net/ipv6/udp.c
120101@@ -76,6 +76,10 @@ static u32 udp6_ehashfn(const struct net *net,
120102 udp_ipv6_hash_secret + net_hash_mix(net));
120103 }
120104
120105+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
120106+extern int grsec_enable_blackhole;
120107+#endif
120108+
120109 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
120110 {
120111 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
120112@@ -445,7 +449,7 @@ try_again:
120113 if (unlikely(err)) {
120114 trace_kfree_skb(skb, udpv6_recvmsg);
120115 if (!peeked) {
120116- atomic_inc(&sk->sk_drops);
120117+ atomic_inc_unchecked(&sk->sk_drops);
120118 if (is_udp4)
120119 UDP_INC_STATS_USER(sock_net(sk),
120120 UDP_MIB_INERRORS,
120121@@ -709,7 +713,7 @@ csum_error:
120122 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
120123 drop:
120124 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
120125- atomic_inc(&sk->sk_drops);
120126+ atomic_inc_unchecked(&sk->sk_drops);
120127 kfree_skb(skb);
120128 return -1;
120129 }
120130@@ -750,7 +754,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
120131 if (likely(!skb1))
120132 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
120133 if (!skb1) {
120134- atomic_inc(&sk->sk_drops);
120135+ atomic_inc_unchecked(&sk->sk_drops);
120136 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
120137 IS_UDPLITE(sk));
120138 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
120139@@ -934,6 +938,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
120140 goto csum_error;
120141
120142 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
120143+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
120144+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
120145+#endif
120146 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
120147
120148 kfree_skb(skb);
120149diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
120150index f337a90..ba0d2a0 100644
120151--- a/net/ipv6/xfrm6_policy.c
120152+++ b/net/ipv6/xfrm6_policy.c
120153@@ -185,7 +185,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
120154 return;
120155
120156 case IPPROTO_ICMPV6:
120157- if (!onlyproto && pskb_may_pull(skb, nh + offset + 2 - skb->data)) {
120158+ if (!onlyproto && (nh + offset + 2 < skb->data ||
120159+ pskb_may_pull(skb, nh + offset + 2 - skb->data))) {
120160 u8 *icmp;
120161
120162 nh = skb_network_header(skb);
120163@@ -199,7 +200,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
120164 #if IS_ENABLED(CONFIG_IPV6_MIP6)
120165 case IPPROTO_MH:
120166 offset += ipv6_optlen(exthdr);
120167- if (!onlyproto && pskb_may_pull(skb, nh + offset + 3 - skb->data)) {
120168+ if (!onlyproto && (nh + offset + 3 < skb->data ||
120169+ pskb_may_pull(skb, nh + offset + 3 - skb->data))) {
120170 struct ip6_mh *mh;
120171
120172 nh = skb_network_header(skb);
120173@@ -222,11 +224,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
120174 }
120175 }
120176
120177-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
120178+static int xfrm6_garbage_collect(struct dst_ops *ops)
120179 {
120180 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
120181
120182- xfrm6_policy_afinfo.garbage_collect(net);
120183+ xfrm_garbage_collect_deferred(net);
120184 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
120185 }
120186
120187@@ -338,19 +340,19 @@ static struct ctl_table xfrm6_policy_table[] = {
120188
120189 static int __net_init xfrm6_net_init(struct net *net)
120190 {
120191- struct ctl_table *table;
120192+ ctl_table_no_const *table = NULL;
120193 struct ctl_table_header *hdr;
120194
120195- table = xfrm6_policy_table;
120196 if (!net_eq(net, &init_net)) {
120197- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
120198+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
120199 if (!table)
120200 goto err_alloc;
120201
120202 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
120203- }
120204+ hdr = register_net_sysctl(net, "net/ipv6", table);
120205+ } else
120206+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
120207
120208- hdr = register_net_sysctl(net, "net/ipv6", table);
120209 if (!hdr)
120210 goto err_reg;
120211
120212@@ -358,8 +360,7 @@ static int __net_init xfrm6_net_init(struct net *net)
120213 return 0;
120214
120215 err_reg:
120216- if (!net_eq(net, &init_net))
120217- kfree(table);
120218+ kfree(table);
120219 err_alloc:
120220 return -ENOMEM;
120221 }
120222diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
120223index c1d247e..9e5949d 100644
120224--- a/net/ipx/ipx_proc.c
120225+++ b/net/ipx/ipx_proc.c
120226@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
120227 struct proc_dir_entry *p;
120228 int rc = -ENOMEM;
120229
120230- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
120231+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
120232
120233 if (!ipx_proc_dir)
120234 goto out;
120235diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
120236index 683346d..cb0e12d 100644
120237--- a/net/irda/ircomm/ircomm_tty.c
120238+++ b/net/irda/ircomm/ircomm_tty.c
120239@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
120240 add_wait_queue(&port->open_wait, &wait);
120241
120242 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
120243- __FILE__, __LINE__, tty->driver->name, port->count);
120244+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
120245
120246 spin_lock_irqsave(&port->lock, flags);
120247- port->count--;
120248+ atomic_dec(&port->count);
120249 port->blocked_open++;
120250 spin_unlock_irqrestore(&port->lock, flags);
120251
120252@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
120253 }
120254
120255 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
120256- __FILE__, __LINE__, tty->driver->name, port->count);
120257+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
120258
120259 schedule();
120260 }
120261@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
120262
120263 spin_lock_irqsave(&port->lock, flags);
120264 if (!tty_hung_up_p(filp))
120265- port->count++;
120266+ atomic_inc(&port->count);
120267 port->blocked_open--;
120268 spin_unlock_irqrestore(&port->lock, flags);
120269
120270 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
120271- __FILE__, __LINE__, tty->driver->name, port->count);
120272+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
120273
120274 if (!retval)
120275 port->flags |= ASYNC_NORMAL_ACTIVE;
120276@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
120277
120278 /* ++ is not atomic, so this should be protected - Jean II */
120279 spin_lock_irqsave(&self->port.lock, flags);
120280- self->port.count++;
120281+ atomic_inc(&self->port.count);
120282 spin_unlock_irqrestore(&self->port.lock, flags);
120283 tty_port_tty_set(&self->port, tty);
120284
120285 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
120286- self->line, self->port.count);
120287+ self->line, atomic_read(&self->port.count));
120288
120289 /* Not really used by us, but lets do it anyway */
120290 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
120291@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
120292 tty_kref_put(port->tty);
120293 }
120294 port->tty = NULL;
120295- port->count = 0;
120296+ atomic_set(&port->count, 0);
120297 spin_unlock_irqrestore(&port->lock, flags);
120298
120299 wake_up_interruptible(&port->open_wait);
120300@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
120301 seq_putc(m, '\n');
120302
120303 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
120304- seq_printf(m, "Open count: %d\n", self->port.count);
120305+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
120306 seq_printf(m, "Max data size: %d\n", self->max_data_size);
120307 seq_printf(m, "Max header size: %d\n", self->max_header_size);
120308
120309diff --git a/net/irda/irproc.c b/net/irda/irproc.c
120310index b9ac598..f88cc56 100644
120311--- a/net/irda/irproc.c
120312+++ b/net/irda/irproc.c
120313@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
120314 {
120315 int i;
120316
120317- proc_irda = proc_mkdir("irda", init_net.proc_net);
120318+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
120319 if (proc_irda == NULL)
120320 return;
120321
120322diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
120323index 6daa52a..786aa2b 100644
120324--- a/net/iucv/af_iucv.c
120325+++ b/net/iucv/af_iucv.c
120326@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
120327 {
120328 char name[12];
120329
120330- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
120331+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
120332 while (__iucv_get_sock_by_name(name)) {
120333 sprintf(name, "%08x",
120334- atomic_inc_return(&iucv_sk_list.autobind_name));
120335+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
120336 }
120337 memcpy(iucv->src_name, name, 8);
120338 }
120339diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
120340index 2a6a1fd..6c112b0 100644
120341--- a/net/iucv/iucv.c
120342+++ b/net/iucv/iucv.c
120343@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
120344 return NOTIFY_OK;
120345 }
120346
120347-static struct notifier_block __refdata iucv_cpu_notifier = {
120348+static struct notifier_block iucv_cpu_notifier = {
120349 .notifier_call = iucv_cpu_notify,
120350 };
120351
120352diff --git a/net/key/af_key.c b/net/key/af_key.c
120353index f0d52d7..9c9af38 100644
120354--- a/net/key/af_key.c
120355+++ b/net/key/af_key.c
120356@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
120357 static u32 get_acqseq(void)
120358 {
120359 u32 res;
120360- static atomic_t acqseq;
120361+ static atomic_unchecked_t acqseq;
120362
120363 do {
120364- res = atomic_inc_return(&acqseq);
120365+ res = atomic_inc_return_unchecked(&acqseq);
120366 } while (!res);
120367 return res;
120368 }
120369diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
120370index 4b55287..bd247f7 100644
120371--- a/net/l2tp/l2tp_eth.c
120372+++ b/net/l2tp/l2tp_eth.c
120373@@ -42,12 +42,12 @@ struct l2tp_eth {
120374 struct sock *tunnel_sock;
120375 struct l2tp_session *session;
120376 struct list_head list;
120377- atomic_long_t tx_bytes;
120378- atomic_long_t tx_packets;
120379- atomic_long_t tx_dropped;
120380- atomic_long_t rx_bytes;
120381- atomic_long_t rx_packets;
120382- atomic_long_t rx_errors;
120383+ atomic_long_unchecked_t tx_bytes;
120384+ atomic_long_unchecked_t tx_packets;
120385+ atomic_long_unchecked_t tx_dropped;
120386+ atomic_long_unchecked_t rx_bytes;
120387+ atomic_long_unchecked_t rx_packets;
120388+ atomic_long_unchecked_t rx_errors;
120389 };
120390
120391 /* via l2tp_session_priv() */
120392@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
120393 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
120394
120395 if (likely(ret == NET_XMIT_SUCCESS)) {
120396- atomic_long_add(len, &priv->tx_bytes);
120397- atomic_long_inc(&priv->tx_packets);
120398+ atomic_long_add_unchecked(len, &priv->tx_bytes);
120399+ atomic_long_inc_unchecked(&priv->tx_packets);
120400 } else {
120401- atomic_long_inc(&priv->tx_dropped);
120402+ atomic_long_inc_unchecked(&priv->tx_dropped);
120403 }
120404 return NETDEV_TX_OK;
120405 }
120406@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
120407 {
120408 struct l2tp_eth *priv = netdev_priv(dev);
120409
120410- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
120411- stats->tx_packets = atomic_long_read(&priv->tx_packets);
120412- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
120413- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
120414- stats->rx_packets = atomic_long_read(&priv->rx_packets);
120415- stats->rx_errors = atomic_long_read(&priv->rx_errors);
120416+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
120417+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
120418+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
120419+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
120420+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
120421+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
120422 return stats;
120423 }
120424
120425@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
120426 nf_reset(skb);
120427
120428 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
120429- atomic_long_inc(&priv->rx_packets);
120430- atomic_long_add(data_len, &priv->rx_bytes);
120431+ atomic_long_inc_unchecked(&priv->rx_packets);
120432+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
120433 } else {
120434- atomic_long_inc(&priv->rx_errors);
120435+ atomic_long_inc_unchecked(&priv->rx_errors);
120436 }
120437 return;
120438
120439 error:
120440- atomic_long_inc(&priv->rx_errors);
120441+ atomic_long_inc_unchecked(&priv->rx_errors);
120442 kfree_skb(skb);
120443 }
120444
120445diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
120446index 7964993..2c48a3a 100644
120447--- a/net/l2tp/l2tp_ip.c
120448+++ b/net/l2tp/l2tp_ip.c
120449@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
120450 .ops = &l2tp_ip_ops,
120451 };
120452
120453-static struct net_protocol l2tp_ip_protocol __read_mostly = {
120454+static const struct net_protocol l2tp_ip_protocol = {
120455 .handler = l2tp_ip_recv,
120456 .netns_ok = 1,
120457 };
120458diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
120459index d1ded37..c0d1e49 100644
120460--- a/net/l2tp/l2tp_ip6.c
120461+++ b/net/l2tp/l2tp_ip6.c
120462@@ -755,7 +755,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
120463 .ops = &l2tp_ip6_ops,
120464 };
120465
120466-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
120467+static const struct inet6_protocol l2tp_ip6_protocol = {
120468 .handler = l2tp_ip6_recv,
120469 };
120470
120471diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
120472index 1a3c7e0..80f8b0c 100644
120473--- a/net/llc/llc_proc.c
120474+++ b/net/llc/llc_proc.c
120475@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
120476 int rc = -ENOMEM;
120477 struct proc_dir_entry *p;
120478
120479- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
120480+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
120481 if (!llc_proc_dir)
120482 goto out;
120483
120484diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
120485index f06d422..de37d95 100644
120486--- a/net/mac80211/cfg.c
120487+++ b/net/mac80211/cfg.c
120488@@ -582,7 +582,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
120489 ret = ieee80211_vif_use_channel(sdata, chandef,
120490 IEEE80211_CHANCTX_EXCLUSIVE);
120491 }
120492- } else if (local->open_count == local->monitors) {
120493+ } else if (local_read(&local->open_count) == local->monitors) {
120494 local->_oper_chandef = *chandef;
120495 ieee80211_hw_config(local, 0);
120496 }
120497@@ -3429,7 +3429,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
120498 else
120499 local->probe_req_reg--;
120500
120501- if (!local->open_count)
120502+ if (!local_read(&local->open_count))
120503 break;
120504
120505 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
120506@@ -3564,8 +3564,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
120507 if (chanctx_conf) {
120508 *chandef = sdata->vif.bss_conf.chandef;
120509 ret = 0;
120510- } else if (local->open_count > 0 &&
120511- local->open_count == local->monitors &&
120512+ } else if (local_read(&local->open_count) > 0 &&
120513+ local_read(&local->open_count) == local->monitors &&
120514 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
120515 if (local->use_chanctx)
120516 *chandef = local->monitor_chandef;
120517diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
120518index c0a9187..2a13300 100644
120519--- a/net/mac80211/ieee80211_i.h
120520+++ b/net/mac80211/ieee80211_i.h
120521@@ -30,6 +30,7 @@
120522 #include <net/ieee80211_radiotap.h>
120523 #include <net/cfg80211.h>
120524 #include <net/mac80211.h>
120525+#include <asm/local.h>
120526 #include "key.h"
120527 #include "sta_info.h"
120528 #include "debug.h"
120529@@ -1118,7 +1119,7 @@ struct ieee80211_local {
120530 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
120531 spinlock_t queue_stop_reason_lock;
120532
120533- int open_count;
120534+ local_t open_count;
120535 int monitors, cooked_mntrs;
120536 /* number of interfaces with corresponding FIF_ flags */
120537 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
120538diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
120539index 84cef60..53ec813 100644
120540--- a/net/mac80211/iface.c
120541+++ b/net/mac80211/iface.c
120542@@ -550,7 +550,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120543 break;
120544 }
120545
120546- if (local->open_count == 0) {
120547+ if (local_read(&local->open_count) == 0) {
120548 res = drv_start(local);
120549 if (res)
120550 goto err_del_bss;
120551@@ -597,7 +597,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120552 res = drv_add_interface(local, sdata);
120553 if (res)
120554 goto err_stop;
120555- } else if (local->monitors == 0 && local->open_count == 0) {
120556+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
120557 res = ieee80211_add_virtual_monitor(local);
120558 if (res)
120559 goto err_stop;
120560@@ -707,7 +707,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120561 atomic_inc(&local->iff_promiscs);
120562
120563 if (coming_up)
120564- local->open_count++;
120565+ local_inc(&local->open_count);
120566
120567 if (hw_reconf_flags)
120568 ieee80211_hw_config(local, hw_reconf_flags);
120569@@ -745,7 +745,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
120570 err_del_interface:
120571 drv_remove_interface(local, sdata);
120572 err_stop:
120573- if (!local->open_count)
120574+ if (!local_read(&local->open_count))
120575 drv_stop(local);
120576 err_del_bss:
120577 sdata->bss = NULL;
120578@@ -915,7 +915,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120579 }
120580
120581 if (going_down)
120582- local->open_count--;
120583+ local_dec(&local->open_count);
120584
120585 switch (sdata->vif.type) {
120586 case NL80211_IFTYPE_AP_VLAN:
120587@@ -984,7 +984,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120588 atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
120589 }
120590
120591- if (local->open_count == 0)
120592+ if (local_read(&local->open_count) == 0)
120593 ieee80211_clear_tx_pending(local);
120594
120595 /*
120596@@ -1027,7 +1027,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120597 if (cancel_scan)
120598 flush_delayed_work(&local->scan_work);
120599
120600- if (local->open_count == 0) {
120601+ if (local_read(&local->open_count) == 0) {
120602 ieee80211_stop_device(local);
120603
120604 /* no reconfiguring after stop! */
120605@@ -1038,7 +1038,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
120606 ieee80211_configure_filter(local);
120607 ieee80211_hw_config(local, hw_reconf_flags);
120608
120609- if (local->monitors == local->open_count)
120610+ if (local->monitors == local_read(&local->open_count))
120611 ieee80211_add_virtual_monitor(local);
120612 }
120613
120614diff --git a/net/mac80211/main.c b/net/mac80211/main.c
120615index e86daed..9cbf3f4 100644
120616--- a/net/mac80211/main.c
120617+++ b/net/mac80211/main.c
120618@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
120619 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
120620 IEEE80211_CONF_CHANGE_POWER);
120621
120622- if (changed && local->open_count) {
120623+ if (changed && local_read(&local->open_count)) {
120624 ret = drv_config(local, changed);
120625 /*
120626 * Goal:
120627diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
120628index ac6ad62..77dbac5 100644
120629--- a/net/mac80211/pm.c
120630+++ b/net/mac80211/pm.c
120631@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
120632 struct ieee80211_sub_if_data *sdata;
120633 struct sta_info *sta;
120634
120635- if (!local->open_count)
120636+ if (!local_read(&local->open_count))
120637 goto suspend;
120638
120639 ieee80211_scan_cancel(local);
120640@@ -150,7 +150,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
120641 WARN_ON(!list_empty(&local->chanctx_list));
120642
120643 /* stop hardware - this must stop RX */
120644- if (local->open_count)
120645+ if (local_read(&local->open_count))
120646 ieee80211_stop_device(local);
120647
120648 suspend:
120649diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
120650index d53355b..21f583a 100644
120651--- a/net/mac80211/rate.c
120652+++ b/net/mac80211/rate.c
120653@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
120654
120655 ASSERT_RTNL();
120656
120657- if (local->open_count)
120658+ if (local_read(&local->open_count))
120659 return -EBUSY;
120660
120661 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
120662diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
120663index 2880f2a..3085cec 100644
120664--- a/net/mac80211/sta_info.c
120665+++ b/net/mac80211/sta_info.c
120666@@ -339,7 +339,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
120667 int size = sizeof(struct txq_info) +
120668 ALIGN(hw->txq_data_size, sizeof(void *));
120669
120670- txq_data = kcalloc(ARRAY_SIZE(sta->sta.txq), size, gfp);
120671+ txq_data = kcalloc(size, ARRAY_SIZE(sta->sta.txq), gfp);
120672 if (!txq_data)
120673 goto free;
120674
120675diff --git a/net/mac80211/util.c b/net/mac80211/util.c
120676index b864ebc..17326ff 100644
120677--- a/net/mac80211/util.c
120678+++ b/net/mac80211/util.c
120679@@ -1761,7 +1761,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120680 bool sched_scan_stopped = false;
120681
120682 /* nothing to do if HW shouldn't run */
120683- if (!local->open_count)
120684+ if (!local_read(&local->open_count))
120685 goto wake_up;
120686
120687 #ifdef CONFIG_PM
120688@@ -2033,7 +2033,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120689 local->in_reconfig = false;
120690 barrier();
120691
120692- if (local->monitors == local->open_count && local->monitors > 0)
120693+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
120694 ieee80211_add_virtual_monitor(local);
120695
120696 /*
120697@@ -2088,7 +2088,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120698 * If this is for hw restart things are still running.
120699 * We may want to change that later, however.
120700 */
120701- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
120702+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
120703 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
120704
120705 if (!local->suspended)
120706@@ -2112,7 +2112,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
120707 flush_delayed_work(&local->scan_work);
120708 }
120709
120710- if (local->open_count && !reconfig_due_to_wowlan)
120711+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
120712 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
120713
120714 list_for_each_entry(sdata, &local->interfaces, list) {
120715diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
120716index 1f93a59..96faa29 100644
120717--- a/net/mpls/af_mpls.c
120718+++ b/net/mpls/af_mpls.c
120719@@ -456,7 +456,7 @@ static int mpls_dev_sysctl_register(struct net_device *dev,
120720 struct mpls_dev *mdev)
120721 {
120722 char path[sizeof("net/mpls/conf/") + IFNAMSIZ];
120723- struct ctl_table *table;
120724+ ctl_table_no_const *table;
120725 int i;
120726
120727 table = kmemdup(&mpls_dev_table, sizeof(mpls_dev_table), GFP_KERNEL);
120728@@ -1025,7 +1025,7 @@ static int mpls_platform_labels(struct ctl_table *table, int write,
120729 struct net *net = table->data;
120730 int platform_labels = net->mpls.platform_labels;
120731 int ret;
120732- struct ctl_table tmp = {
120733+ ctl_table_no_const tmp = {
120734 .procname = table->procname,
120735 .data = &platform_labels,
120736 .maxlen = sizeof(int),
120737@@ -1055,7 +1055,7 @@ static const struct ctl_table mpls_table[] = {
120738
120739 static int mpls_net_init(struct net *net)
120740 {
120741- struct ctl_table *table;
120742+ ctl_table_no_const *table;
120743
120744 net->mpls.platform_labels = 0;
120745 net->mpls.platform_label = NULL;
120746diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
120747index a0f3e6a3..b026fe2 100644
120748--- a/net/netfilter/Kconfig
120749+++ b/net/netfilter/Kconfig
120750@@ -1112,6 +1112,16 @@ config NETFILTER_XT_MATCH_ESP
120751
120752 To compile it as a module, choose M here. If unsure, say N.
120753
120754+config NETFILTER_XT_MATCH_GRADM
120755+ tristate '"gradm" match support'
120756+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
120757+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
120758+ ---help---
120759+ The gradm match allows to match on grsecurity RBAC being enabled.
120760+ It is useful when iptables rules are applied early on bootup to
120761+ prevent connections to the machine (except from a trusted host)
120762+ while the RBAC system is disabled.
120763+
120764 config NETFILTER_XT_MATCH_HASHLIMIT
120765 tristate '"hashlimit" match support'
120766 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
120767diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
120768index a87d8b8..d43183c 100644
120769--- a/net/netfilter/Makefile
120770+++ b/net/netfilter/Makefile
120771@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
120772 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
120773 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
120774 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
120775+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
120776 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
120777 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
120778 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
120779diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
120780index d259da3..6a32b2c 100644
120781--- a/net/netfilter/ipset/ip_set_core.c
120782+++ b/net/netfilter/ipset/ip_set_core.c
120783@@ -1952,7 +1952,7 @@ done:
120784 return ret;
120785 }
120786
120787-static struct nf_sockopt_ops so_set __read_mostly = {
120788+static struct nf_sockopt_ops so_set = {
120789 .pf = PF_INET,
120790 .get_optmin = SO_IP_SET,
120791 .get_optmax = SO_IP_SET + 1,
120792diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
120793index b0f7b62..0541842 100644
120794--- a/net/netfilter/ipvs/ip_vs_conn.c
120795+++ b/net/netfilter/ipvs/ip_vs_conn.c
120796@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
120797 /* Increase the refcnt counter of the dest */
120798 ip_vs_dest_hold(dest);
120799
120800- conn_flags = atomic_read(&dest->conn_flags);
120801+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
120802 if (cp->protocol != IPPROTO_UDP)
120803 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
120804 flags = cp->flags;
120805@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
120806
120807 cp->control = NULL;
120808 atomic_set(&cp->n_control, 0);
120809- atomic_set(&cp->in_pkts, 0);
120810+ atomic_set_unchecked(&cp->in_pkts, 0);
120811
120812 cp->packet_xmit = NULL;
120813 cp->app = NULL;
120814@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
120815
120816 /* Don't drop the entry if its number of incoming packets is not
120817 located in [0, 8] */
120818- i = atomic_read(&cp->in_pkts);
120819+ i = atomic_read_unchecked(&cp->in_pkts);
120820 if (i > 8 || i < 0) return 0;
120821
120822 if (!todrop_rate[i]) return 0;
120823diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
120824index 5d2b806..9005b29 100644
120825--- a/net/netfilter/ipvs/ip_vs_core.c
120826+++ b/net/netfilter/ipvs/ip_vs_core.c
120827@@ -574,7 +574,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
120828 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
120829 /* do not touch skb anymore */
120830
120831- atomic_inc(&cp->in_pkts);
120832+ atomic_inc_unchecked(&cp->in_pkts);
120833 ip_vs_conn_put(cp);
120834 return ret;
120835 }
120836@@ -1750,7 +1750,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
120837 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
120838 pkts = sysctl_sync_threshold(ipvs);
120839 else
120840- pkts = atomic_add_return(1, &cp->in_pkts);
120841+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120842
120843 if (ipvs->sync_state & IP_VS_STATE_MASTER)
120844 ip_vs_sync_conn(net, cp, pkts);
120845diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
120846index 285eae3..226f4a7 100644
120847--- a/net/netfilter/ipvs/ip_vs_ctl.c
120848+++ b/net/netfilter/ipvs/ip_vs_ctl.c
120849@@ -814,7 +814,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
120850 */
120851 ip_vs_rs_hash(ipvs, dest);
120852 }
120853- atomic_set(&dest->conn_flags, conn_flags);
120854+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
120855
120856 /* bind the service */
120857 old_svc = rcu_dereference_protected(dest->svc, 1);
120858@@ -1679,7 +1679,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
120859 * align with netns init in ip_vs_control_net_init()
120860 */
120861
120862-static struct ctl_table vs_vars[] = {
120863+static ctl_table_no_const vs_vars[] __read_only = {
120864 {
120865 .procname = "amemthresh",
120866 .maxlen = sizeof(int),
120867@@ -2020,7 +2020,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
120868 " %-7s %-6d %-10d %-10d\n",
120869 &dest->addr.in6,
120870 ntohs(dest->port),
120871- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
120872+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
120873 atomic_read(&dest->weight),
120874 atomic_read(&dest->activeconns),
120875 atomic_read(&dest->inactconns));
120876@@ -2031,7 +2031,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
120877 "%-7s %-6d %-10d %-10d\n",
120878 ntohl(dest->addr.ip),
120879 ntohs(dest->port),
120880- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
120881+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
120882 atomic_read(&dest->weight),
120883 atomic_read(&dest->activeconns),
120884 atomic_read(&dest->inactconns));
120885@@ -2528,7 +2528,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
120886
120887 entry.addr = dest->addr.ip;
120888 entry.port = dest->port;
120889- entry.conn_flags = atomic_read(&dest->conn_flags);
120890+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
120891 entry.weight = atomic_read(&dest->weight);
120892 entry.u_threshold = dest->u_threshold;
120893 entry.l_threshold = dest->l_threshold;
120894@@ -3101,7 +3101,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
120895 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
120896 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
120897 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
120898- (atomic_read(&dest->conn_flags) &
120899+ (atomic_read_unchecked(&dest->conn_flags) &
120900 IP_VS_CONN_F_FWD_MASK)) ||
120901 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
120902 atomic_read(&dest->weight)) ||
120903@@ -3739,7 +3739,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
120904 {
120905 int idx;
120906 struct netns_ipvs *ipvs = net_ipvs(net);
120907- struct ctl_table *tbl;
120908+ ctl_table_no_const *tbl;
120909
120910 atomic_set(&ipvs->dropentry, 0);
120911 spin_lock_init(&ipvs->dropentry_lock);
120912diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
120913index 127f140..553d652 100644
120914--- a/net/netfilter/ipvs/ip_vs_lblc.c
120915+++ b/net/netfilter/ipvs/ip_vs_lblc.c
120916@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
120917 * IPVS LBLC sysctl table
120918 */
120919 #ifdef CONFIG_SYSCTL
120920-static struct ctl_table vs_vars_table[] = {
120921+static ctl_table_no_const vs_vars_table[] __read_only = {
120922 {
120923 .procname = "lblc_expiration",
120924 .data = NULL,
120925diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
120926index 2229d2d..b32b785 100644
120927--- a/net/netfilter/ipvs/ip_vs_lblcr.c
120928+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
120929@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
120930 * IPVS LBLCR sysctl table
120931 */
120932
120933-static struct ctl_table vs_vars_table[] = {
120934+static ctl_table_no_const vs_vars_table[] __read_only = {
120935 {
120936 .procname = "lblcr_expiration",
120937 .data = NULL,
120938diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
120939index 19b9cce..e4f3112 100644
120940--- a/net/netfilter/ipvs/ip_vs_sync.c
120941+++ b/net/netfilter/ipvs/ip_vs_sync.c
120942@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
120943 cp = cp->control;
120944 if (cp) {
120945 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
120946- pkts = atomic_add_return(1, &cp->in_pkts);
120947+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120948 else
120949 pkts = sysctl_sync_threshold(ipvs);
120950 ip_vs_sync_conn(net, cp->control, pkts);
120951@@ -771,7 +771,7 @@ control:
120952 if (!cp)
120953 return;
120954 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
120955- pkts = atomic_add_return(1, &cp->in_pkts);
120956+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
120957 else
120958 pkts = sysctl_sync_threshold(ipvs);
120959 goto sloop;
120960@@ -919,7 +919,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
120961
120962 if (opt)
120963 memcpy(&cp->in_seq, opt, sizeof(*opt));
120964- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
120965+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
120966 cp->state = state;
120967 cp->old_state = cp->state;
120968 /*
120969diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
120970index 19986ec..416dbc5 100644
120971--- a/net/netfilter/ipvs/ip_vs_xmit.c
120972+++ b/net/netfilter/ipvs/ip_vs_xmit.c
120973@@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
120974 else
120975 rc = NF_ACCEPT;
120976 /* do not touch skb anymore */
120977- atomic_inc(&cp->in_pkts);
120978+ atomic_inc_unchecked(&cp->in_pkts);
120979 goto out;
120980 }
120981
120982@@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
120983 else
120984 rc = NF_ACCEPT;
120985 /* do not touch skb anymore */
120986- atomic_inc(&cp->in_pkts);
120987+ atomic_inc_unchecked(&cp->in_pkts);
120988 goto out;
120989 }
120990
120991diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
120992index 45da11a..ef3e5dc 100644
120993--- a/net/netfilter/nf_conntrack_acct.c
120994+++ b/net/netfilter/nf_conntrack_acct.c
120995@@ -64,7 +64,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
120996 #ifdef CONFIG_SYSCTL
120997 static int nf_conntrack_acct_init_sysctl(struct net *net)
120998 {
120999- struct ctl_table *table;
121000+ ctl_table_no_const *table;
121001
121002 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
121003 GFP_KERNEL);
121004diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
121005index 13fad86..18c984c 100644
121006--- a/net/netfilter/nf_conntrack_core.c
121007+++ b/net/netfilter/nf_conntrack_core.c
121008@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
121009 #define DYING_NULLS_VAL ((1<<30)+1)
121010 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
121011
121012+#ifdef CONFIG_GRKERNSEC_HIDESYM
121013+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
121014+#endif
121015+
121016 int nf_conntrack_init_net(struct net *net)
121017 {
121018 int ret = -ENOMEM;
121019@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
121020 if (!net->ct.stat)
121021 goto err_pcpu_lists;
121022
121023+#ifdef CONFIG_GRKERNSEC_HIDESYM
121024+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
121025+#else
121026 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
121027+#endif
121028 if (!net->ct.slabname)
121029 goto err_slabname;
121030
121031diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
121032index 4e78c57..ec8fb74 100644
121033--- a/net/netfilter/nf_conntrack_ecache.c
121034+++ b/net/netfilter/nf_conntrack_ecache.c
121035@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
121036 #ifdef CONFIG_SYSCTL
121037 static int nf_conntrack_event_init_sysctl(struct net *net)
121038 {
121039- struct ctl_table *table;
121040+ ctl_table_no_const *table;
121041
121042 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
121043 GFP_KERNEL);
121044diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
121045index bd9d315..989947e 100644
121046--- a/net/netfilter/nf_conntrack_helper.c
121047+++ b/net/netfilter/nf_conntrack_helper.c
121048@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
121049
121050 static int nf_conntrack_helper_init_sysctl(struct net *net)
121051 {
121052- struct ctl_table *table;
121053+ ctl_table_no_const *table;
121054
121055 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
121056 GFP_KERNEL);
121057diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
121058index b65d586..beec902 100644
121059--- a/net/netfilter/nf_conntrack_proto.c
121060+++ b/net/netfilter/nf_conntrack_proto.c
121061@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
121062
121063 static void
121064 nf_ct_unregister_sysctl(struct ctl_table_header **header,
121065- struct ctl_table **table,
121066+ ctl_table_no_const **table,
121067 unsigned int users)
121068 {
121069 if (users > 0)
121070diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
121071index fc823fa..8311af3 100644
121072--- a/net/netfilter/nf_conntrack_standalone.c
121073+++ b/net/netfilter/nf_conntrack_standalone.c
121074@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
121075
121076 static int nf_conntrack_standalone_init_sysctl(struct net *net)
121077 {
121078- struct ctl_table *table;
121079+ ctl_table_no_const *table;
121080
121081 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
121082 GFP_KERNEL);
121083diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
121084index 7a394df..bd91a8a 100644
121085--- a/net/netfilter/nf_conntrack_timestamp.c
121086+++ b/net/netfilter/nf_conntrack_timestamp.c
121087@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
121088 #ifdef CONFIG_SYSCTL
121089 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
121090 {
121091- struct ctl_table *table;
121092+ ctl_table_no_const *table;
121093
121094 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
121095 GFP_KERNEL);
121096diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
121097index 675d12c..b36e825 100644
121098--- a/net/netfilter/nf_log.c
121099+++ b/net/netfilter/nf_log.c
121100@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
121101
121102 #ifdef CONFIG_SYSCTL
121103 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
121104-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
121105+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
121106
121107 static int nf_log_proc_dostring(struct ctl_table *table, int write,
121108 void __user *buffer, size_t *lenp, loff_t *ppos)
121109@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
121110 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
121111 mutex_unlock(&nf_log_mutex);
121112 } else {
121113+ ctl_table_no_const nf_log_table = *table;
121114+
121115 mutex_lock(&nf_log_mutex);
121116 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
121117 if (!logger)
121118- table->data = "NONE";
121119+ nf_log_table.data = "NONE";
121120 else
121121- table->data = logger->name;
121122- r = proc_dostring(table, write, buffer, lenp, ppos);
121123+ nf_log_table.data = logger->name;
121124+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
121125 mutex_unlock(&nf_log_mutex);
121126 }
121127
121128diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
121129index c68c1e5..8b5d670 100644
121130--- a/net/netfilter/nf_sockopt.c
121131+++ b/net/netfilter/nf_sockopt.c
121132@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
121133 }
121134 }
121135
121136- list_add(&reg->list, &nf_sockopts);
121137+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
121138 out:
121139 mutex_unlock(&nf_sockopt_mutex);
121140 return ret;
121141@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
121142 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
121143 {
121144 mutex_lock(&nf_sockopt_mutex);
121145- list_del(&reg->list);
121146+ pax_list_del((struct list_head *)&reg->list);
121147 mutex_unlock(&nf_sockopt_mutex);
121148 }
121149 EXPORT_SYMBOL(nf_unregister_sockopt);
121150diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
121151index 4ef1fae..f72f08b 100644
121152--- a/net/netfilter/nfnetlink_log.c
121153+++ b/net/netfilter/nfnetlink_log.c
121154@@ -84,7 +84,7 @@ static int nfnl_log_net_id __read_mostly;
121155 struct nfnl_log_net {
121156 spinlock_t instances_lock;
121157 struct hlist_head instance_table[INSTANCE_BUCKETS];
121158- atomic_t global_seq;
121159+ atomic_unchecked_t global_seq;
121160 };
121161
121162 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
121163@@ -572,7 +572,7 @@ __build_packet_message(struct nfnl_log_net *log,
121164 /* global sequence number */
121165 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
121166 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
121167- htonl(atomic_inc_return(&log->global_seq))))
121168+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
121169 goto nla_put_failure;
121170
121171 if (data_len) {
121172diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
121173index 7f29cfc..917ef5f 100644
121174--- a/net/netfilter/nft_compat.c
121175+++ b/net/netfilter/nft_compat.c
121176@@ -321,14 +321,7 @@ static void nft_match_eval(const struct nft_expr *expr,
121177 return;
121178 }
121179
121180- switch (ret ? 1 : 0) {
121181- case 1:
121182- regs->verdict.code = NFT_CONTINUE;
121183- break;
121184- case 0:
121185- regs->verdict.code = NFT_BREAK;
121186- break;
121187- }
121188+ regs->verdict.code = ret ? NFT_CONTINUE : NFT_BREAK;
121189 }
121190
121191 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
121192diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
121193new file mode 100644
121194index 0000000..c566332
121195--- /dev/null
121196+++ b/net/netfilter/xt_gradm.c
121197@@ -0,0 +1,51 @@
121198+/*
121199+ * gradm match for netfilter
121200